Merge branch 'PHP-8.4'

Author: petk

.github/workflows/ci.yaml

@@ -28,8 +28,8 @@ jobs:
         os:
           - { label: ubuntu-latest }
         compiler:
-          - { name: GNU13,  CC: gcc-13,   CXX: g++-13,     packages: gcc-13 g++-13 }
-          - { name: LLVM15, CC: clang-15, CXX: clang++-15, packages: clang-15 libomp-15-dev llvm-15-dev libc++-15-dev libc++abi1-15 lld-15 clang-tools-15 mlir-15-tools libmlir-15-dev }
+          - { name: GNU, CC: gcc, CXX: g++, packages: gcc g++ }
+          - { name: Clang, CC: clang, CXX: clang++, packages: clang llvm-dev }
         build_type:
           - Release
         generator:
@@ -43,19 +43,17 @@ jobs:
     steps:
       - name: Install compiler ${{ matrix.compiler.name }}
         run: |
-          # Remove azure mirror because it is unreliable and sometimes unpredictably leads to failed CI
-          sudo sed -i 's/azure\.//' /etc/apt/sources.list
-          sudo add-apt-repository ppa:ubuntu-toolchain-r/test
-          sudo add-apt-repository -y universe
-          sudo add-apt-repository -y multiverse
           sudo apt-get update
-          sudo apt-get -y install \
-            ${{ matrix.compiler.packages }}
+          sudo apt-get -y install ${{ matrix.compiler.packages }}
 
       - name: Install base dependencies
         run: |
+          sudo apt-get update
           sudo apt-get -y install \
             build-essential \
+            re2c \
+            bison \
+            libxml2-dev \
             libssl-dev \
             libpcre2-dev \
             libsqlite3-dev \

cmake/cmake/checks/CheckFopencookie.cmake

@@ -58,6 +58,7 @@ message(CHECK_START "Checking whether fopencookie seeker uses off64_t")
 
 cmake_push_check_state(RESET)
   set(CMAKE_REQUIRED_DEFINITIONS -D_GNU_SOURCE)
+  set(CMAKE_REQUIRED_QUIET TRUE)
 
   check_source_compiles(C [[
     #include <stdio.h>

cmake/cmake/platforms/Windows.cmake

@@ -115,7 +115,6 @@ if(CMAKE_SYSTEM_NAME STREQUAL "Windows")
   set(HAVE_POSIX_SPAWN_FILE_ACTIONS_ADDCHDIR_NP FALSE)
   set(HAVE_PRCTL FALSE)
   set(HAVE_PROCCTL FALSE)
-  set(HAVE_PS_STRINGS FALSE)
   set(HAVE_PTHREAD_ATTR_GET_NP FALSE)
   set(HAVE_PTHREAD_ATTR_GETSTACK FALSE)
   set(HAVE_PTHREAD_GET_STACKADDR_NP FALSE)
@@ -263,6 +262,7 @@ if(CMAKE_SYSTEM_NAME STREQUAL "Windows")
   set(PHP_HAS_WNO_UNUSED_PARAMETER_C FALSE)
   set(PHP_HAS_WNO_UNUSED_PARAMETER_CXX FALSE)
   set(PHP_HAS_WSTRICT_PROTOTYPES_C FALSE)
+  set(PHP_SAPI_CLI_HAVE_PS_STRINGS FALSE)
   set(PHP_SAPI_PHPDBG_HAS_UFFDIO_WRITEPROTECT_MODE_WP FALSE)
   set(PHP_ZEND_HAS_PGRAB FALSE)
 

cmake/ext/opcache/cmake/CheckSHM.cmake

@@ -244,6 +244,8 @@ function(_php_ext_opcache_check_shm_open result)
       set(CMAKE_REQUIRED_LIBRARIES ${PHP_EXT_OPCACHE_HAS_SHM_OPEN_LIBRARY})
     endif()
 
+    set(CMAKE_REQUIRED_QUIET TRUE)
+
     check_source_runs(C [[
       #include <sys/types.h>
       #include <sys/wait.h>

cmake/ext/zip/CMakeLists.txt

@@ -91,7 +91,8 @@ if(libzip_VERSION VERSION_EQUAL 1.3.1 OR libzip_VERSION VERSION_EQUAL 1.7.0)
   )
 endif()
 
-target_link_libraries(php_ext_zip PRIVATE libzip::zip)
+# Link publicly for internal_functions files.
+target_link_libraries(php_ext_zip PUBLIC libzip::zip)
 
 # Note: ZIP_STATIC needs to be defined when using static libzip on Windows only
 # since version 1.0 to 1.3.2

cmake/sapi/cli/CMakeLists.txt

@@ -26,6 +26,7 @@ include(CheckIncludeFiles)
 include(CheckSourceCompiles)
 include(CheckSymbolExists)
 include(CMakeDependentOption)
+include(CMakePushCheckState)
 include(FeatureSummary)
 
 option(PHP_SAPI_CLI "Enable the CLI SAPI module" ON)
@@ -59,24 +60,30 @@ endif()
 check_symbol_exists(setproctitle "unistd.h;stdlib.h" HAVE_SETPROCTITLE)
 check_include_files(sys/pstat.h HAVE_SYS_PSTAT_H)
 
+# For some BSD-based systems.
 message(CHECK_START "Checking for PS_STRINGS")
-check_source_compiles(C [[
-  #include <machine/vmparam.h>
-  #include <sys/exec.h>
-
-  int main(void)
-  {
-    PS_STRINGS->ps_nargvstr = 1;
-    PS_STRINGS->ps_argvstr = "foo";
-
-    return 0;
-  }
-]] HAVE_PS_STRINGS)
-if(HAVE_PS_STRINGS)
+cmake_push_check_state(RESET)
+  set(CMAKE_REQUIRED_QUIET TRUE)
+
+  check_source_compiles(C [[
+    #include <machine/vmparam.h> // For old BSD.
+    #include <sys/exec.h>
+
+    int main(void)
+    {
+      PS_STRINGS->ps_nargvstr = 1;
+      PS_STRINGS->ps_argvstr = "foo";
+
+      return 0;
+    }
+  ]] PHP_SAPI_CLI_HAVE_PS_STRINGS)
+cmake_pop_check_state()
+if(PHP_SAPI_CLI_HAVE_PS_STRINGS)
   message(CHECK_PASS "yes")
 else()
   message(CHECK_FAIL "no")
 endif()
+set(HAVE_PS_STRINGS ${PHP_SAPI_CLI_HAVE_PS_STRINGS})
 
 ################################################################################
 # The cli SAPI.