Fix CS: Rename zend (Zend::Zend) target to php_zend (PHP::Zend)

Author: petk

cmake/Zend/CMakeLists.txt

@@ -3,12 +3,12 @@ Zend Engine.
 
 Targets:
 
-* OBJECT library 'zend' (ALIAS Zend::Zend) holds all Zend Engine objects and
+* OBJECT library 'php_zend' (ALIAS PHP::Zend) holds all Zend Engine objects and
   compile properties.
 
 Target properties:
 
-CMake target properties for the Zend::Zend target:
+CMake target properties for the PHP::Zend target:
 
 * VERSION
   Zend Engine version as defined in the Zend/zend.h file.
@@ -110,11 +110,11 @@ mark_as_advanced(PHP_ZEND_SIGNALS)
 # Add library.
 ################################################################################
 
-add_library(zend OBJECT)
-add_library(Zend::Zend ALIAS zend)
+add_library(php_zend OBJECT)
+add_library(PHP::Zend ALIAS php_zend)
 
 target_sources(
-  zend
+  php_zend
   PRIVATE
     Optimizer/block_pass.c
     Optimizer/compact_literals.c
@@ -321,25 +321,25 @@ target_sources(
         $<$<NOT:$<PLATFORM_ID:Windows>>:${CMAKE_CURRENT_BINARY_DIR}/zend_config.h>
 )
 
-target_link_libraries(zend PRIVATE PHP::config)
+target_link_libraries(php_zend PRIVATE PHP::config)
 
 target_include_directories(
-  zend
+  php_zend
   INTERFACE
     ${CMAKE_CURRENT_BINARY_DIR}
     ${CMAKE_CURRENT_SOURCE_DIR}
 )
 
 target_compile_definitions(
-  zend
+  php_zend
   PRIVATE
     ZEND_ENABLE_STATIC_TSRMLS_CACHE
   PUBLIC
     $<$<PLATFORM_ID:Windows>:LIBZEND_EXPORTS>
 )
 
 set_target_properties(
-  zend
+  php_zend
   PROPERTIES
     VERSION ${PHP_ZEND_VERSION}
     ZEND_EXTENSION_API_NO ${PHP_ZEND_VERSION_EXTENSION_API_NO}
@@ -350,9 +350,9 @@ set_target_properties(
 # Add usage requirements to PHP interface targets.
 ################################################################################
 
-target_link_libraries(php_config INTERFACE $<COMPILE_ONLY:Zend::Zend>)
-target_link_libraries(php_sapi INTERFACE Zend::Zend)
-target_sources(php_sapi INTERFACE $<TARGET_OBJECTS:Zend::Zend>)
+target_link_libraries(php_config INTERFACE $<COMPILE_ONLY:PHP::Zend>)
+target_link_libraries(php_sapi INTERFACE PHP::Zend)
+target_sources(php_sapi INTERFACE $<TARGET_OBJECTS:PHP::Zend>)
 
 ################################################################################
 # TSRM (Thread Safe Resource Manager) is a separate directory in php-src as it
@@ -361,7 +361,7 @@ target_sources(php_sapi INTERFACE $<TARGET_OBJECTS:Zend::Zend>)
 ################################################################################
 
 target_sources(
-  zend
+  php_zend
   PRIVATE
     $<$<PLATFORM_ID:Windows>:${CMAKE_CURRENT_SOURCE_DIR}/../TSRM/tsrm_win32.c>
     ${CMAKE_CURRENT_SOURCE_DIR}/../TSRM/TSRM.c
@@ -375,16 +375,19 @@ target_sources(
 )
 
 target_include_directories(
-  zend
+  php_zend
   INTERFACE
     $<BUILD_INTERFACE:${CMAKE_CURRENT_SOURCE_DIR}/../TSRM>
     $<INSTALL_INTERFACE:${CMAKE_INSTALL_INCLUDEDIR}/${PHP_INCLUDE_PREFIX}/TSRM>
 )
 
-target_compile_definitions(zend PUBLIC $<$<PLATFORM_ID:Windows>:TSRM_EXPORTS>)
+target_compile_definitions(
+  php_zend
+  PUBLIC $<$<PLATFORM_ID:Windows>:TSRM_EXPORTS>
+)
 
 install(
-  TARGETS zend
+  TARGETS php_zend
   FILE_SET tsrm
     DESTINATION ${CMAKE_INSTALL_INCLUDEDIR}/${PHP_INCLUDE_PREFIX}/TSRM
 )
@@ -528,7 +531,7 @@ if(NOT CMAKE_SYSTEM_NAME STREQUAL "Windows")
 endif()
 
 install(
-  TARGETS zend
+  TARGETS php_zend
   ARCHIVE EXCLUDE_FROM_ALL
   FILE_SET HEADERS
     DESTINATION ${CMAKE_INSTALL_INCLUDEDIR}/${PHP_INCLUDE_PREFIX}/Zend

cmake/Zend/cmake/Fibers.cmake

@@ -14,9 +14,9 @@ include(CMakePushCheckState)
 
 # Create interface library for using Boost fiber assembly files and compile
 # options if available.
-add_library(zend_fibers INTERFACE)
-add_library(Zend::Fibers ALIAS zend_fibers)
-target_link_libraries(zend PRIVATE Zend::Fibers)
+add_library(php_zend_fibers INTERFACE)
+add_library(PHP::Zend::Fibers ALIAS php_zend_fibers)
+target_link_libraries(php_zend PRIVATE PHP::Zend::Fibers)
 
 ################################################################################
 # Check shadow stack.
@@ -59,7 +59,7 @@ function(_php_zend_fibers_shadow_stack_syscall)
   # Use compile definitions because ASM files can't see macro definitions from
   # the PHP configuration header (php_config.h/config.w32.h).
   target_compile_definitions(
-    zend_fibers
+    php_zend_fibers
     INTERFACE
       $<IF:$<BOOL:${PHP_ZEND_SHADOW_STACK_SYSCALL}>,SHADOW_STACK_SYSCALL=1,SHADOW_STACK_SYSCALL=0>
   )
@@ -158,7 +158,7 @@ block()
   if(PHP_ZEND_FIBER_ASM AND asm_file)
     message(CHECK_PASS "yes, Zend/asm/*.${asm_file}")
 
-    target_sources(zend_fibers INTERFACE ${asm_sources})
+    target_sources(php_zend_fibers INTERFACE ${asm_sources})
 
     _php_zend_fibers_shadow_stack_syscall()
   else()

cmake/Zend/cmake/GenerateGrammar.cmake

@@ -13,7 +13,7 @@ else()
 endif()
 
 php_bison(
-  zend_ini_parser
+  php_zend_ini_parser
   zend_ini_parser.y
   ${CMAKE_CURRENT_SOURCE_DIR}/zend_ini_parser.c
   HEADER
@@ -23,7 +23,7 @@ php_bison(
 )
 
 php_bison(
-  zend_language_parser
+  php_zend_language_parser
   zend_language_parser.y
   ${CMAKE_CURRENT_SOURCE_DIR}/zend_language_parser.c
   HEADER
@@ -75,19 +75,19 @@ block()
       CONTENT "${patch}"
     )
     add_custom_target(
-      zend_language_parser_patch
+      php_zend_language_parser_patch
       COMMAND ${CMAKE_COMMAND} -P CMakeFiles/Zend/PatchLanguageParser.cmake
-      DEPENDS zend_language_parser
+      DEPENDS php_zend_language_parser
       VERBATIM
     )
-    add_dependencies(zend zend_language_parser_patch)
+    add_dependencies(php_zend php_zend_language_parser_patch)
   endif()
 endblock()
 
 include(PHP/Re2c)
 
 php_re2c(
-  zend_ini_scanner
+  php_zend_ini_scanner
   zend_ini_scanner.l
   ${CMAKE_CURRENT_SOURCE_DIR}/zend_ini_scanner.c
   HEADER ${CMAKE_CURRENT_SOURCE_DIR}/zend_ini_scanner_defs.h
@@ -102,7 +102,7 @@ php_re2c(
 )
 
 php_re2c(
-  zend_language_scanner
+  php_zend_language_scanner
   zend_language_scanner.l
   ${CMAKE_CURRENT_SOURCE_DIR}/zend_language_scanner.c
   HEADER ${CMAKE_CURRENT_SOURCE_DIR}/zend_language_scanner_defs.h

cmake/Zend/cmake/MaxExecutionTimers.cmake

@@ -49,12 +49,12 @@ endif()
 
 if(ZEND_MAX_EXECUTION_TIMERS)
   if(PHP_ZEND_HAVE_TIMER_CREATE_LIBRARY)
-    target_link_libraries(zend PUBLIC ${PHP_ZEND_HAVE_TIMER_CREATE_LIBRARY})
+    target_link_libraries(php_zend PUBLIC ${PHP_ZEND_HAVE_TIMER_CREATE_LIBRARY})
   endif()
 
   # zend_config.h (or its parent php_config.h) isn't included in some files,
   # therefore also compilation definition is added.
-  target_compile_definitions(zend PUBLIC ZEND_MAX_EXECUTION_TIMERS)
+  target_compile_definitions(php_zend PUBLIC ZEND_MAX_EXECUTION_TIMERS)
 
   message(CHECK_PASS "yes")
 else()

cmake/Zend/cmake/Signals.cmake

@@ -22,7 +22,7 @@ if(PHP_HAVE_SIGACTION AND PHP_ZEND_SIGNALS)
 
   # zend_config.h (or its wrapper php_config.h) isn't included in some zend_*
   # files, therefore also compilation definition is added.
-  target_compile_definitions(zend PUBLIC ZEND_SIGNALS)
+  target_compile_definitions(php_zend PUBLIC ZEND_SIGNALS)
 else()
   message(CHECK_FAIL "no")
   set(ZEND_SIGNALS FALSE)

cmake/Zend/cmake/Version.cmake

@@ -24,7 +24,7 @@ block(PROPAGATE PHP_ZEND_VERSION PHP_ZEND_VERSION_LABEL)
 endblock()
 
 # This is automatically executed with the project(Zend...) invocation.
-function(_zend_version_post_project)
+function(_php_zend_version_post_project)
   if(DEFINED PHP_ZEND_VERSION_MODULE_API_NO)
     return()
   endif()
@@ -58,4 +58,4 @@ function(_zend_version_post_project)
       PHP_ZEND_VERSION_MODULE_API_NO
   )
 endfunction()
-variable_watch(PHP_ZEND_DESCRIPTION _zend_version_post_project)
+variable_watch(PHP_ZEND_DESCRIPTION _php_zend_version_post_project)

cmake/cmake/Configuration.cmake

@@ -229,13 +229,13 @@ if(NOT PHP_EXTENSION_DIR)
     CACHE PHP_EXTENSION_DIR
     PROPERTY
       VALUE
-        "${CMAKE_INSTALL_LIBDIR}/php/$<TARGET_PROPERTY:Zend::Zend,ZEND_MODULE_API_NO>$<$<BOOL:$<TARGET_PROPERTY:PHP::config,PHP_THREAD_SAFETY>>:-zts>$<$<BOOL:$<CONFIG>>:-$<CONFIG>>"
+        "${CMAKE_INSTALL_LIBDIR}/php/$<TARGET_PROPERTY:PHP::Zend,ZEND_MODULE_API_NO>$<$<BOOL:$<TARGET_PROPERTY:PHP::config,PHP_THREAD_SAFETY>>:-zts>$<$<BOOL:$<CONFIG>>:-$<CONFIG>>"
   )
 
   # This would resemble the PHP Autotools --with-layout=GNU:
-  #set(extension_dir "${CMAKE_INSTALL_LIBDIR}/php/$<TARGET_PROPERTY:Zend::Zend,ZEND_MODULE_API_NO>$<$<BOOL:$<TARGET_PROPERTY:PHP::config,PHP_THREAD_SAFETY>>:-zts>$<$<CONFIG:Debug,DebugAssertions>:-debug>")
+  #set(extension_dir "${CMAKE_INSTALL_LIBDIR}/php/$<TARGET_PROPERTY:PHP::Zend,ZEND_MODULE_API_NO>$<$<BOOL:$<TARGET_PROPERTY:PHP::config,PHP_THREAD_SAFETY>>:-zts>$<$<CONFIG:Debug,DebugAssertions>:-debug>")
   # This would resemble the PHP Autotools --with-layout=PHP (default):
-  #set(extension_dir "${CMAKE_INSTALL_LIBDIR}/php/extensions/$<IF:$<CONFIG:Debug,DebugAssertions>,debug,no-debug>$<IF:$<BOOL:$<TARGET_PROPERTY:PHP::config,PHP_THREAD_SAFETY>>,-zts,-non-zts>-$<TARGET_PROPERTY:Zend::Zend,ZEND_MODULE_API_NO>")
+  #set(extension_dir "${CMAKE_INSTALL_LIBDIR}/php/extensions/$<IF:$<CONFIG:Debug,DebugAssertions>,debug,no-debug>$<IF:$<BOOL:$<TARGET_PROPERTY:PHP::config,PHP_THREAD_SAFETY>>,-zts,-non-zts>-$<TARGET_PROPERTY:PHP::Zend,ZEND_MODULE_API_NO>")
 endif()
 
 ################################################################################

cmake/cmake/Summary.cmake

@@ -51,10 +51,10 @@ function(_php_summary_preamble result)
     preamble
   )
 
-  if(TARGET Zend::Zend)
-    get_target_property(zend_version Zend::Zend VERSION)
-    get_target_property(zend_extension_api Zend::Zend ZEND_EXTENSION_API_NO)
-    get_target_property(zend_module_api Zend::Zend ZEND_MODULE_API_NO)
+  if(TARGET PHP::Zend)
+    get_target_property(zend_version PHP::Zend VERSION)
+    get_target_property(zend_extension_api PHP::Zend ZEND_EXTENSION_API_NO)
+    get_target_property(zend_module_api PHP::Zend ZEND_MODULE_API_NO)
     _php_summary_preamble_add_item(
       "Zend Engine version"
       "${zend_version}"

cmake/ext/CMakeLists.txt

@@ -70,7 +70,7 @@ foreach(extension IN LISTS extensions)
 
   set_property(GLOBAL APPEND PROPERTY PHP_EXTENSIONS ${extension})
 
-  add_dependencies(php_ext_${extension} Zend::Zend)
+  add_dependencies(php_ext_${extension} PHP::Zend)
 
   # Add usage requirements to PHP interface targets.
   # TODO: Should PHP_CLI extensions pass properties only to PHP_CLI SAPIs?

cmake/ext/standard/CMakeLists.txt

@@ -219,7 +219,7 @@ target_include_directories(
 target_compile_definitions(php_ext_standard PRIVATE ZEND_ENABLE_STATIC_TSRMLS_CACHE)
 
 # The standard extension depends on the generated Zend language parser.
-add_dependencies(php_ext_standard Zend::Zend)
+add_dependencies(php_ext_standard PHP::Zend)
 
 target_link_libraries(
   php_ext_standard