Merge branch 'PHP-8.3' into PHP-8.4

Author: petk

.github/workflows/check-cmake.yaml

@@ -17,7 +17,7 @@ jobs:
           fetch-depth: 2
 
       - name: Setup Python
-        uses: actions/setup-python@v4
+        uses: actions/setup-python@v5
 
       - name: Setup PHP
         uses: shivammathur/setup-php@v2

cmake/cmake/modules/PHP/CheckFopencookie.cmake

@@ -30,10 +30,10 @@ include(CMakePushCheckState)
 
 cmake_push_check_state(RESET)
   set(CMAKE_REQUIRED_DEFINITIONS -D_GNU_SOURCE)
-  check_symbol_exists(fopencookie "stdio.h" _have_fopencookie)
+  check_symbol_exists(fopencookie "stdio.h" _HAVE_FOPENCOOKIE)
 cmake_pop_check_state()
 
-if(NOT _have_fopencookie)
+if(NOT _HAVE_FOPENCOOKIE)
   return()
 endif()
 

cmake/cmake/modules/PHP/CheckGetaddrinfo.cmake

@@ -18,7 +18,6 @@ IMPORTED target:
 
 include_guard(GLOBAL)
 
-include(CheckSourceCompiles)
 include(CheckSourceRuns)
 include(CMakePushCheckState)
 include(PHP/SearchLibraries)
@@ -60,72 +59,57 @@ cmake_push_check_state(RESET)
     set(CMAKE_REQUIRED_LIBRARIES PHP::CheckGetaddrinfoLibrary)
   endif()
 
-  check_source_compiles(C [[
+  if(
+    NOT DEFINED HAVE_GETADDRINFO_EXITCODE
+    AND CMAKE_CROSSCOMPILING
+    AND NOT CMAKE_CROSSCOMPILING_EMULATOR
+    AND CMAKE_SYSTEM_NAME MATCHES "^(Linux|Midipix)$"
+  )
+    set(HAVE_GETADDRINFO_EXITCODE 0)
+  endif()
+
+  check_source_runs(C [[
     #include <netdb.h>
+    #include <sys/types.h>
+    #include <string.h>
+    #include <stdlib.h>
+    #ifndef AF_INET
+    # include <sys/socket.h>
+    #endif
 
     int main(void)
     {
-      struct addrinfo *g,h;
-      g = &h;
-      getaddrinfo("", "", g, &g);
+      struct addrinfo *ai, *pai, hints;
 
-      return 0;
-    }
-  ]] _have_getaddrinfo)
-
-  if(_have_getaddrinfo)
-    if(
-      NOT DEFINED HAVE_GETADDRINFO_EXITCODE
-      AND CMAKE_CROSSCOMPILING
-      AND NOT CMAKE_CROSSCOMPILING_EMULATOR
-      AND CMAKE_SYSTEM_NAME MATCHES "^(Linux|Midipix)$"
-    )
-      set(HAVE_GETADDRINFO_EXITCODE 0)
-    endif()
-
-    check_source_runs(C [[
-      #include <netdb.h>
-      #include <sys/types.h>
-      #include <string.h>
-      #include <stdlib.h>
-      #ifndef AF_INET
-      # include <sys/socket.h>
-      #endif
-
-      int main(void)
-      {
-        struct addrinfo *ai, *pai, hints;
-
-        memset(&hints, 0, sizeof(hints));
-        hints.ai_flags = AI_NUMERICHOST;
-
-        if (getaddrinfo("127.0.0.1", 0, &hints, &ai) < 0) {
-          return 1;
-        }
+      memset(&hints, 0, sizeof(hints));
+      hints.ai_flags = AI_NUMERICHOST;
 
-        if (ai == 0) {
+      if (getaddrinfo("127.0.0.1", 0, &hints, &ai) < 0) {
+        return 1;
+      }
+
+      if (ai == 0) {
+        return 1;
+      }
+
+      pai = ai;
+
+      while (pai) {
+        if (pai->ai_family != AF_INET) {
+          /* 127.0.0.1/NUMERICHOST should only resolve ONE way */
           return 1;
         }
-
-        pai = ai;
-
-        while (pai) {
-          if (pai->ai_family != AF_INET) {
-            /* 127.0.0.1/NUMERICHOST should only resolve ONE way */
-            return 1;
-          }
-          if (pai->ai_addr->sa_family != AF_INET) {
-            /* 127.0.0.1/NUMERICHOST should only resolve ONE way */
-            return 1;
-          }
-          pai = pai->ai_next;
+        if (pai->ai_addr->sa_family != AF_INET) {
+          /* 127.0.0.1/NUMERICHOST should only resolve ONE way */
+          return 1;
         }
-        freeaddrinfo(ai);
-
-        return 0;
+        pai = pai->ai_next;
       }
-    ]] HAVE_GETADDRINFO)
-  endif()
+      freeaddrinfo(ai);
+
+      return 0;
+    }
+  ]] HAVE_GETADDRINFO)
 cmake_pop_check_state()
 
 if(HAVE_GETADDRINFO)

cmake/cmake/modules/PHP/SearchLibraries.cmake

@@ -28,7 +28,7 @@ php_search_libraries(
   [LIBRARIES <library>...]
   [VARIABLE <variable>]
   [LIBRARY_VARIABLE <library_variable>]
-  [TARGET <target> <PRIVATE|PUBLIC|INTERFACE>]
+  [TARGET <target> [<PRIVATE|PUBLIC|INTERFACE>]]
   [RECHECK_HEADERS]
 )
 ```
@@ -68,11 +68,11 @@ If `<variable>` is given, check result is stored in an internal cache variable.
 * `TARGET`
 
   If the `TARGET` is given, the resulting library is linked to a given
-  `<target>` with the scope of `PRIVATE`, `PUBLIC`, or `INTERFACE`. It is
+  `<target>` with the scope of `PRIVATE`, `PUBLIC`, or `INTERFACE`. Behavior is
   homogeneous to:
 
   ```cmake
-  target_link_libraries(<target> PRIVATE|PUBLIC|INTERFACE <library>)
+  target_link_libraries(<target> [PRIVATE|PUBLIC|INTERFACE] <library>)
   ```
 
 * `RECHECK_HEADERS`
@@ -85,11 +85,21 @@ If `<variable>` is given, check result is stored in an internal cache variable.
   checked elsewhere in the application using the `check_header_include()`. In
   most cases this won't be needed.
 
-For example:
+## Basic usage
+
+In the following example, the library containing `dlopen` is linked to
+`php_configuration` target with the `INTERFACE` scope when needed to use the
+`dlopen` symbol. Cache variable `HAVE_LIBDL` is set if `dlopen` is found either
+in the default system libraries or in one of the libraries set in the
+`CMAKE_DL_LIBS` variable.
 
 ```cmake
+# CMakeLists.txt
+
+# Include the module
 include(PHP/SearchLibraries)
 
+# Search and link library containing dlopen and dlclose .
 php_search_libraries(
   dlopen
   HEADERS dlfcn.h
@@ -108,9 +118,10 @@ https://cmake.org/cmake/help/latest/module/CheckSymbolExists.html
 * `CMAKE_REQUIRED_INCLUDES`
 * `CMAKE_REQUIRED_LINK_OPTIONS`
 * `CMAKE_REQUIRED_LIBRARIES`
+* `CMAKE_REQUIRED_LINK_DIRECTORIES`
 * `CMAKE_REQUIRED_QUIET`
 
-Caveats:
+## Caveats
 
 * If symbol declaration is missing in its belonging headers, it won't be found
   with this module. There are still rare cases of such functions on some systems
@@ -207,20 +218,18 @@ function(php_search_libraries)
   # Validate optional TARGET.
   if(parsed_TARGET)
     list(GET parsed_TARGET 0 target)
-    list(GET parsed_TARGET 1 targetScope)
 
     if(NOT TARGET ${target})
       message(FATAL_ERROR "Bad TARGET arguments: ${target} is not a target")
     endif()
 
-    if(NOT targetScope)
-      message(
-        FATAL_ERROR
-        "Bad TARGET arguments: Target scope PRIVATE|PUBLIC|INTERFACE is missing"
-      )
+    list(LENGTH parsed_TARGET length)
+    set(targetScope)
+    if(length GREATER 1)
+      list(GET parsed_TARGET 1 targetScope)
     endif()
 
-    if(NOT targetScope MATCHES "^(PRIVATE|PUBLIC|INTERFACE)$")
+    if(targetScope AND NOT targetScope MATCHES "^(PRIVATE|PUBLIC|INTERFACE)$")
       message(
         FATAL_ERROR
         "Bad TARGET arguments: ${targetScope} is not a target scope. Use one "

cmake/cmake/modules/PHP/Set.cmake

@@ -103,7 +103,7 @@ php_set(
   include(PHP/Set)
   php_set(
     VAR
-    CHOICES auto on off
+    CHOICES auto ON OFF
     DOC "Variable with default value set to the first list item"
   )
   message(STATUS "VAR=${VAR}")
@@ -124,7 +124,7 @@ php_set(
   ```cmake
   php_set(
     VAR
-    CHOICES auto on off
+    CHOICES auto ON OFF
     CHOICES_OPTIONAL
     DOC
       "Variable with optional predefined choices where its value can be also "

cmake/cmake/modules/PHP/Stubs.cmake

@@ -123,6 +123,7 @@ block()
     CONTENT "${content}"
   )
 
+  set(targetOptions)
   if(NOT PHPSystem_EXECUTABLE)
     set(targetOptions ALL DEPENDS ${targets})
   endif()

cmake/ext/date/CMakeLists.txt

@@ -18,7 +18,7 @@ include(FeatureSummary)
 
 add_feature_info(
   "ext/date"
-  ON
+  TRUE
   "date and time"
 )
 

cmake/ext/hash/CMakeLists.txt

@@ -26,7 +26,7 @@ include(PHP/CheckCompilerFlag)
 
 add_feature_info(
   "ext/hash"
-  ON
+  TRUE
   "HASH message digest framework"
 )
 

cmake/ext/json/CMakeLists.txt

@@ -16,7 +16,7 @@ include(FeatureSummary)
 
 add_feature_info(
   "ext/json"
-  ON
+  TRUE
   "JavaScript Object Notation"
 )
 

cmake/ext/pcre/CMakeLists.txt

@@ -37,7 +37,7 @@ include(PHP/CheckCompilerFlag)
 
 add_feature_info(
   "ext/pcre"
-  ON
+  TRUE
   "Perl-compatible regular expressions"
 )