Merge branch 'PHP-8.4'

Author: petk

cmake/cmake/modules/Findlibzip.cmake

@@ -26,9 +26,9 @@ This module defines the following imported targets:
 
 * `libzip_INCLUDE_DIR` - Directory containing package library headers.
 * `libzip_LIBRARY` - The path to the package library.
-* `HAVE_SET_MTIME`
-* `HAVE_ENCRYPTION`
-* `HAVE_LIBZIP_VERSION`
+* `libzip_HAVE_ENCRYPTION`
+* `libzip_HAVE_LIBZIP_VERSION`
+* `libzip_HAVE_SET_MTIME`
 
 ## Examples
 
@@ -110,25 +110,25 @@ block(PROPAGATE libzip_VERSION)
       set(CMAKE_REQUIRED_QUIET TRUE)
 
       # zip_file_set_mtime is available with libzip 1.0.0.
-      check_symbol_exists(zip_file_set_mtime zip.h HAVE_SET_MTIME)
+      check_symbol_exists(zip_file_set_mtime zip.h libzip_HAVE_SET_MTIME)
 
-      if(NOT HAVE_SET_MTIME)
+      if(NOT libzip_HAVE_SET_MTIME)
         set(libzip_VERSION 0.11)
       else()
         set(libzip_VERSION 1.0)
       endif()
 
       # zip_file_set_encryption is available in libzip 1.2.0.
-      check_symbol_exists(zip_file_set_encryption zip.h HAVE_ENCRYPTION)
+      check_symbol_exists(zip_file_set_encryption zip.h libzip_HAVE_ENCRYPTION)
 
-      if(HAVE_ENCRYPTION)
+      if(libzip_HAVE_ENCRYPTION)
         set(libzip_VERSION 1.2.0)
       endif()
 
       # zip_libzip_version is available in libzip 1.3.1.
-      check_symbol_exists(zip_libzip_version zip.h HAVE_LIBZIP_VERSION)
+      check_symbol_exists(zip_libzip_version zip.h libzip_HAVE_LIBZIP_VERSION)
 
-      if(HAVE_LIBZIP_VERSION)
+      if(libzip_HAVE_LIBZIP_VERSION)
         set(libzip_VERSION 1.3.1)
       endif()
     cmake_pop_check_state()

cmake/ext/zip/CMakeLists.txt

@@ -27,9 +27,7 @@ project(
   LANGUAGES C
 )
 
-include(CheckSymbolExists)
 include(CMakeDependentOption)
-include(CMakePushCheckState)
 include(FeatureSummary)
 
 option(PHP_EXT_ZIP "Enable the zip extension")
@@ -111,54 +109,42 @@ endif()
 # TODO: When downloading and building libzip from source additional deps are
 # required.
 
-if(TARGET libzip::zip)
-  cmake_push_check_state(RESET)
-    set(CMAKE_REQUIRED_LIBRARIES libzip::zip)
-
-    check_symbol_exists(zip_file_set_mtime zip.h HAVE_SET_MTIME)
-
-    if(NOT HAVE_SET_MTIME)
-      message(
-        WARNING
-        "ext/zip will not have support for setting mtime "
-        "(Libzip >= 1.0.0 is needed for setting mtime)"
-      )
-    endif()
-
-    check_symbol_exists(zip_file_set_encryption zip.h HAVE_ENCRYPTION)
-
-    if(NOT HAVE_ENCRYPTION)
-      message(
-        WARNING
-        "ext/zip will not have encryption support "
-        "(Libzip >= 1.2.0 is needed for encryption support)"
-      )
-    endif()
-
-    check_symbol_exists(
-      zip_libzip_version
-      zip.h
-      HAVE_LIBZIP_VERSION
+if(libzip_FOUND)
+  if(libzip_VERSION VERSION_GREATER_EQUAL 1.0.0)
+    set(HAVE_SET_MTIME TRUE)
+  else()
+    message(
+      WARNING
+      "ext/zip will not have support for setting mtime "
+      "(Libzip >= 1.0.0 is needed for setting mtime)"
     )
+  endif()
 
-    check_symbol_exists(
-      zip_register_progress_callback_with_state
-      zip.h
-      HAVE_PROGRESS_CALLBACK
+  if(libzip_VERSION VERSION_GREATER_EQUAL 1.2.0)
+    set(HAVE_ENCRYPTION TRUE)
+  else()
+    message(
+      WARNING
+      "ext/zip will not have encryption support "
+      "(Libzip >= 1.2.0 is needed for encryption support)"
     )
+  endif()
 
-    check_symbol_exists(
-      zip_register_cancel_callback_with_state
-      zip.h
-      HAVE_CANCEL_CALLBACK
-    )
+  if(libzip_VERSION VERSION_GREATER_EQUAL 1.3.0)
+    set(HAVE_PROGRESS_CALLBACK TRUE)
+  endif()
 
-    check_symbol_exists(
-      zip_compression_method_supported
-      zip.h
-      HAVE_METHOD_SUPPORTED
-    )
-  cmake_pop_check_state()
+  if(libzip_VERSION VERSION_GREATER_EQUAL 1.3.1)
+    set(HAVE_LIBZIP_VERSION TRUE)
+  endif()
+
+  if(libzip_VERSION VERSION_GREATER_EQUAL 1.6.0)
+    set(HAVE_CANCEL_CALLBACK TRUE)
+  endif()
+
+  if(libzip_VERSION VERSION_GREATER_EQUAL 1.7.0)
+    set(HAVE_METHOD_SUPPORTED TRUE)
+  endif()
 endif()
 
 set(HAVE_ZIP TRUE)

patches/8.3/tests.patch

@@ -2,14 +2,32 @@ From: Peter Kokot <[email protected]>
 Subject: Fix tests
 
 - ext/zip
-  When PHP is compiled and built agains libzip that doesn't have AES
+  When PHP is compiled and built against libzip that doesn't have AES
   support enabled (if all encryption options are set to OFF in CMake),
   ZipArchive::EM_AES_256 and ZipArchive::EM_AES_192 aren't supported.
+  ZipArchive::registerProgressCallback() is only available when using
+  libzip 1.3.0 or newer.
 ---
+ ext/zip/tests/gh18431.phpt       | 4 ++++
  ext/zip/tests/oo_addglob2.phpt   | 6 ++++++
  ext/zip/tests/oo_encryption.phpt | 6 ++++++
- 2 files changed, 12 insertions(+)
+ 3 files changed, 16 insertions(+)
 
+diff --git a/ext/zip/tests/gh18431.phpt b/ext/zip/tests/gh18431.phpt
+index d4eb89c36c6..dcd7db6f400 100644
+--- a/ext/zip/tests/gh18431.phpt
++++ b/ext/zip/tests/gh18431.phpt
+@@ -2,6 +2,10 @@
+ GH-18431 (Registering ZIP progress callback twice doesn't work)
+ --EXTENSIONS--
+ zip
++--SKIPIF--
++<?php
++if (!method_exists('ZipArchive', 'registerProgressCallback')) die('skip libzip too old');
++?>
+ --FILE--
+ <?php
+ $file = __DIR__ . '/gh18431.zip';
 diff --git a/ext/zip/tests/oo_addglob2.phpt b/ext/zip/tests/oo_addglob2.phpt
 index 517c0b7fd7f..1432d704de5 100644
 --- a/ext/zip/tests/oo_addglob2.phpt

patches/8.4/tests.patch

@@ -6,14 +6,17 @@ Subject: Fix tests
   example, php-src/php-build relative paths need to be adjusted.
 
 - ext/zip
-  When PHP is compiled and built agains libzip that doesn't have AES
+  When PHP is compiled and built against libzip that doesn't have AES
   support enabled (if all encryption options are set to OFF in CMake),
   ZipArchive::EM_AES_256 and ZipArchive::EM_AES_192 aren't supported.
+  ZipArchive::registerProgressCallback() is only available when using
+  libzip 1.3.0 or newer.
 ---
  ext/dom/tests/dom_xinclude.phpt  | 4 ++--
+ ext/zip/tests/gh18431.phpt       | 4 ++++
  ext/zip/tests/oo_addglob2.phpt   | 6 ++++++
  ext/zip/tests/oo_encryption.phpt | 6 ++++++
- 3 files changed, 14 insertions(+), 2 deletions(-)
+ 4 files changed, 18 insertions(+), 2 deletions(-)
 
 diff --git a/ext/dom/tests/dom_xinclude.phpt b/ext/dom/tests/dom_xinclude.phpt
 index 0dfeb2dfb4a..410431de877 100644
@@ -32,6 +35,21 @@ index 0dfeb2dfb4a..410431de877 100644
    <title>The Pearl</title>
    <author>John Steinbeck</author>
   </book>
+diff --git a/ext/zip/tests/gh18431.phpt b/ext/zip/tests/gh18431.phpt
+index d4eb89c36c6..dcd7db6f400 100644
+--- a/ext/zip/tests/gh18431.phpt
++++ b/ext/zip/tests/gh18431.phpt
+@@ -2,6 +2,10 @@
+ GH-18431 (Registering ZIP progress callback twice doesn't work)
+ --EXTENSIONS--
+ zip
++--SKIPIF--
++<?php
++if (!method_exists('ZipArchive', 'registerProgressCallback')) die('skip libzip too old');
++?>
+ --FILE--
+ <?php
+ $file = __DIR__ . '/gh18431.zip';
 diff --git a/ext/zip/tests/oo_addglob2.phpt b/ext/zip/tests/oo_addglob2.phpt
 index 517c0b7fd7f..1432d704de5 100644
 --- a/ext/zip/tests/oo_addglob2.phpt

patches/8.5/tests.patch

@@ -6,14 +6,17 @@ Subject: Fix tests
   example, php-src/php-build relative paths need to be adjusted.
 
 - ext/zip
-  When PHP is compiled and built agains libzip that doesn't have AES
+  When PHP is compiled and built against libzip that doesn't have AES
   support enabled (if all encryption options are set to OFF in CMake),
   ZipArchive::EM_AES_256 and ZipArchive::EM_AES_192 aren't supported.
+  ZipArchive::registerProgressCallback() is only available when using
+  libzip 1.3.0 or newer.
 ---
  ext/dom/tests/dom_xinclude.phpt  | 4 ++--
+ ext/zip/tests/gh18431.phpt       | 4 ++++
  ext/zip/tests/oo_addglob2.phpt   | 6 ++++++
  ext/zip/tests/oo_encryption.phpt | 6 ++++++
- 3 files changed, 14 insertions(+), 2 deletions(-)
+ 4 files changed, 18 insertions(+), 2 deletions(-)
 
 diff --git a/ext/dom/tests/dom_xinclude.phpt b/ext/dom/tests/dom_xinclude.phpt
 index 0dfeb2dfb4a..410431de877 100644
@@ -32,6 +35,21 @@ index 0dfeb2dfb4a..410431de877 100644
    <title>The Pearl</title>
    <author>John Steinbeck</author>
   </book>
+diff --git a/ext/zip/tests/gh18431.phpt b/ext/zip/tests/gh18431.phpt
+index d4eb89c36c6..dcd7db6f400 100644
+--- a/ext/zip/tests/gh18431.phpt
++++ b/ext/zip/tests/gh18431.phpt
+@@ -2,6 +2,10 @@
+ GH-18431 (Registering ZIP progress callback twice doesn't work)
+ --EXTENSIONS--
+ zip
++--SKIPIF--
++<?php
++if (!method_exists('ZipArchive', 'registerProgressCallback')) die('skip libzip too old');
++?>
+ --FILE--
+ <?php
+ $file = __DIR__ . '/gh18431.zip';
 diff --git a/ext/zip/tests/oo_addglob2.phpt b/ext/zip/tests/oo_addglob2.phpt
 index 517c0b7fd7f..1432d704de5 100644
 --- a/ext/zip/tests/oo_addglob2.phpt