Fix consecutive configuration phases for Bison and re2c modules

Author: petk

cmake/cmake/modules/PHP/Bison.cmake

@@ -75,7 +75,7 @@ example, in command-line scripts.
   cmake --build <dir> --target codegen
   ```
 
-* `WORKING_DIRECTORY <directory>` - The path where the `re2c` is executed.
+* `WORKING_DIRECTORY <directory>` - The path where the `bison` is executed.
   Relative `<directory>` path is interpreted as being relative to the current
   binary directory. If not set, `bison` is by default executed in the
   `PHP_SOURCE_DIR` when building the php-src repository. Otherwise it is
@@ -288,8 +288,15 @@ function(php_bison name input output)
 
   _php_bison_config()
 
-  # Skip consecutive calls if downloading or outer find_package() was called.
-  if(NOT TARGET Bison::Bison AND NOT DEFINED BISON_FOUND)
+  if(
+    # Skip consecutive find_package() calls when:
+    # - project calls php_bison() multiple times and Bison will be downloaded:
+    NOT TARGET Bison::Bison
+    # - the outer find_package() was called prior to php_bison():
+    AND NOT DEFINED BISON_FOUND
+    # - running consecutive configuration phases:
+    AND NOT BISON_EXECUTABLE
+  )
     find_package(BISON ${PHP_BISON_VERSION} ${quiet})
   endif()
 

cmake/cmake/modules/PHP/Re2c.cmake

@@ -296,8 +296,15 @@ function(php_re2c name input output)
 
   _php_re2c_config()
 
-  # Skip consecutive calls if downloading or outer find_package() was called.
-  if(NOT TARGET RE2C::RE2C AND NOT DEFINED RE2C_FOUND)
+  if(
+    # Skip consecutive find_package() calls when:
+    # - project calls php_re2c() multiple times and re2c will be downloaded:
+    NOT TARGET RE2C::RE2C
+    # - the outer find_package() was called prior to php_re2c():
+    AND NOT DEFINED RE2C_FOUND
+    # - running consecutive configuration phases:
+    AND NOT RE2C_EXECUTABLE
+  )
     find_package(RE2C ${PHP_RE2C_VERSION} ${quiet})
   endif()