Merge branch 'PHP-8.4' into PHP-8.5

Author: petk

cmake/CMakeLists.txt

@@ -164,7 +164,7 @@ block()
 endblock()
 
 # Rebuild all targets as needed.
-if(NOT PHPSystem_EXECUTABLE)
+if(NOT PHPSystem_FOUND)
   include(cmake/Rebuild.cmake)
 endif()
 

cmake/Zend/CMakeLists.txt

@@ -541,7 +541,7 @@ include(cmake/Signals.cmake)
 # See: https://github.com/php/php-src/issues/15899
 if(NOT CMAKE_SIZEOF_VOID_P EQUAL 4)
   php_add_custom_command(
-    zend_generate_vm
+    php_zend_generate_vm
     OUTPUT
       ${CMAKE_CURRENT_SOURCE_DIR}/zend_vm_execute.h
       ${CMAKE_CURRENT_SOURCE_DIR}/zend_vm_handlers.h

cmake/cmake/modules/PHP/AddCustomCommand.cmake

@@ -82,7 +82,7 @@ function(php_add_custom_command)
     set(verbatim "")
   endif()
 
-  if(PHPSystem_EXECUTABLE)
+  if(PHPSystem_FOUND)
     add_custom_command(
       OUTPUT ${parsed_OUTPUT}
       COMMAND ${PHPSystem_EXECUTABLE} ${parsed_PHP_COMMAND}

cmake/cmake/modules/PHP/Stubs.cmake

@@ -22,7 +22,7 @@ function(_php_stubs_get_php_command result)
   # If PHP is not found on the system, the PHP cli SAPI will be used with the
   # tokenizer extension.
   if(
-    NOT PHPSystem_EXECUTABLE
+    NOT PHPSystem_FOUND
     AND (
       NOT TARGET PHP::sapi::cli
       OR (TARGET PHP::sapi::cli AND NOT TARGET PHP::ext::tokenizer)
@@ -32,7 +32,7 @@ function(_php_stubs_get_php_command result)
   endif()
 
   # If external PHP is available, check for the required tokenizer extension.
-  if(PHPSystem_EXECUTABLE)
+  if(PHPSystem_FOUND)
     execute_process(
       COMMAND ${PHPSystem_EXECUTABLE} --ri tokenizer
       RESULT_VARIABLE code
@@ -120,7 +120,7 @@ block()
       $<PATH:ABSOLUTE_PATH,NORMALIZE,$<LIST:FILTER,$<TARGET_PROPERTY:${target},SOURCES>,INCLUDE,\.stub\.php$>,$<TARGET_PROPERTY:${target},SOURCE_DIR>>
     )
 
-    if(PHPSystem_EXECUTABLE)
+    if(PHPSystem_FOUND)
       add_dependencies(${target} php_stubs)
     endif()
   endforeach()
@@ -135,7 +135,7 @@ block()
   )
 
   set(target_options "")
-  if(NOT PHPSystem_EXECUTABLE)
+  if(NOT PHPSystem_FOUND)
     set(target_options ALL DEPENDS ${targets})
   endif()