Deprecate the procedural API of ext/zip

Closes GH-5746

diff --git a/UPGRADING b/UPGRADING
index 223abc46a58ac2f54a5700afa9b1fbd50e34a99b..b18ff4afd6f8b91f3645e7dac2f8b452f912ca83 100644 (file)
--- a/UPGRADING
+++ b/UPGRADING
@@ -624,6 +624,7 @@ PHP 8.0 UPGRADE NOTES
   . Using empty file as ZipArchive is deprecated. Libzip 1.6.0
     do not accept empty files as valid zip archives any longer.
     Existing workaround will be removed in next version.
+  . The procedural API of Zip is deprecated. Use ZipArchive instead.
 
 - Reflection:
   . ReflectionFunction::isDisabled() is deprecated, as it is no longer possible

diff --git a/ext/zip/php_zip.stub.php b/ext/zip/php_zip.stub.php
index f85464abe167f372c0c131c132ec07fdb5e79946..4d9ba27f866d92098b6c62e6b0897bafbb9ab17b 100644 (file)
--- a/ext/zip/php_zip.stub.php
+++ b/ext/zip/php_zip.stub.php
@@ -2,44 +2,66 @@
 
 /** @generate-function-entries */
 
-/** @return resource|int|false */
+/**
+ * @return resource|int|false
+ * @deprecated
+ */
 function zip_open(string $filename) {}
 
 /**
  * @param resource $zip
+ * @deprecated
  */
 function zip_close($zip): void {}
 
 /**
  * @param resource $zip
  * @return resource|false
+ * @deprecated
  */
 function zip_read($zip) {}
 
 /**
  * @param resource $zip_dp
  * @param resource $zip_entry
+ * @deprecated
  */
 function zip_entry_open($zip_dp, $zip_entry, string $mode = 'rb'): bool {}
 
 /**
  * @param resource $zip_ent
+ * @deprecated
  */
 function zip_entry_close($zip_ent): bool {}
 
-/** @param resource $zip_entry */
+/**
+ * @param resource $zip_entry
+ * @deprecated
+ */
 function zip_entry_read($zip_entry, int $len = 1024): string|false {}
 
-/** @param resource $zip_entry */
+/**
+ * @param resource $zip_entry
+ * @deprecated
+ */
 function zip_entry_name($zip_entry): string|false {}
 
-/** @param resource $zip_entry */
+/**
+ * @param resource $zip_entry
+ * @deprecated
+ */
 function zip_entry_compressedsize($zip_entry): int|false {}
 
-/** @param resource $zip_entry */
+/**
+ * @param resource $zip_entry
+ * @deprecated
+ */
 function zip_entry_filesize($zip_entry): int|false {}
 
-/** @param resource $zip_entry */
+/**
+ * @param resource $zip_entry
+ * @deprecated
+ */
 function zip_entry_compressionmethod($zip_entry): string|false {}
 
 class ZipArchive

diff --git a/ext/zip/php_zip_arginfo.h b/ext/zip/php_zip_arginfo.h
index 5f150b9eb2975e7513da5215770b1fb6af056089..c25bd97759de06609bd65b5eb9b72874a6a74d40 100644 (file)
--- a/ext/zip/php_zip_arginfo.h
+++ b/ext/zip/php_zip_arginfo.h
@@ -366,16 +366,16 @@ ZEND_METHOD(ZipArchive, isEncryptionMethodSupported);
 
 
 static const zend_function_entry ext_functions[] = {
-       ZEND_FE(zip_open, arginfo_zip_open)
-       ZEND_FE(zip_close, arginfo_zip_close)
-       ZEND_FE(zip_read, arginfo_zip_read)
-       ZEND_FE(zip_entry_open, arginfo_zip_entry_open)
-       ZEND_FE(zip_entry_close, arginfo_zip_entry_close)
-       ZEND_FE(zip_entry_read, arginfo_zip_entry_read)
-       ZEND_FE(zip_entry_name, arginfo_zip_entry_name)
-       ZEND_FE(zip_entry_compressedsize, arginfo_zip_entry_compressedsize)
-       ZEND_FE(zip_entry_filesize, arginfo_zip_entry_filesize)
-       ZEND_FE(zip_entry_compressionmethod, arginfo_zip_entry_compressionmethod)
+       ZEND_DEP_FE(zip_open, arginfo_zip_open)
+       ZEND_DEP_FE(zip_close, arginfo_zip_close)
+       ZEND_DEP_FE(zip_read, arginfo_zip_read)
+       ZEND_DEP_FE(zip_entry_open, arginfo_zip_entry_open)
+       ZEND_DEP_FE(zip_entry_close, arginfo_zip_entry_close)
+       ZEND_DEP_FE(zip_entry_read, arginfo_zip_entry_read)
+       ZEND_DEP_FE(zip_entry_name, arginfo_zip_entry_name)
+       ZEND_DEP_FE(zip_entry_compressedsize, arginfo_zip_entry_compressedsize)
+       ZEND_DEP_FE(zip_entry_filesize, arginfo_zip_entry_filesize)
+       ZEND_DEP_FE(zip_entry_compressionmethod, arginfo_zip_entry_compressionmethod)
        ZEND_FE_END
 };
 

diff --git a/ext/zip/tests/bug7214.phpt b/ext/zip/tests/bug7214.phpt
index b36bb2759f4f3060a048770632315da8e227a904..83cd9201059c822891a7b2f31a7ae72e051293a1 100644 (file)
--- a/ext/zip/tests/bug7214.phpt
+++ b/ext/zip/tests/bug7214.phpt
@@ -18,5 +18,14 @@ if (strlen($contents) == zip_entry_filesize($entry)) {
 }
 
 ?>
---EXPECT--
+--EXPECTF--
+Deprecated: Function zip_open() is deprecated in %s on line %d
+
+Deprecated: Function zip_read() is deprecated in %s on line %d
+
+Deprecated: Function zip_entry_filesize() is deprecated in %s on line %d
+
+Deprecated: Function zip_entry_read() is deprecated in %s on line %d
+
+Deprecated: Function zip_entry_filesize() is deprecated in %s on line %d
 Ok

diff --git a/ext/zip/tests/doubleclose.phpt b/ext/zip/tests/doubleclose.phpt
index 905dc60f0c0cb27b3bdfd9c95a0f5a34d9a139dc..cc12a2a71b680bce4aac8cd3b3029400ca045036 100644 (file)
--- a/ext/zip/tests/doubleclose.phpt
+++ b/ext/zip/tests/doubleclose.phpt
@@ -39,7 +39,13 @@ if ($zip->status == ZIPARCHIVE::ER_OK) {
 Done
 --EXPECTF--
 Procedural
+
+Deprecated: Function zip_open() is deprecated in %s on line %d
+
+Deprecated: Function zip_close() is deprecated in %s on line %d
 NULL
+
+Deprecated: Function zip_close() is deprecated in %s on line %d
 zip_close(): supplied resource is not a valid Zip Directory resource
 Object
 bool(true)

diff --git a/ext/zip/tests/oo_setcompression.phpt b/ext/zip/tests/oo_setcompression.phpt
index b8519b68349b2f9c6812643844c3c42b9ed4692f..e09609c5d43896757d1649dff6caabf33e2f0998 100644 (file)
--- a/ext/zip/tests/oo_setcompression.phpt
+++ b/ext/zip/tests/oo_setcompression.phpt
@@ -55,17 +55,65 @@ zip_close($zip);
 $tmpfile = __DIR__ . '/oo_setcompression.zip';
 unlink($tmpfile);
 ?>
---EXPECT--
+--EXPECTF--
 bool(true)
 bool(true)
 bool(true)
 bool(true)
 bool(true)
 bool(true)
+
+Deprecated: Function zip_open() is deprecated in %s on line %d
+
+Deprecated: Function zip_read() is deprecated in %s on line %d
+
+Deprecated: Function zip_entry_name() is deprecated in %s on line %d
+
+Deprecated: Function zip_entry_compressionmethod() is deprecated in %s on line %d
 entry1.txt: deflated
+
+Deprecated: Function zip_read() is deprecated in %s on line %d
+
+Deprecated: Function zip_entry_name() is deprecated in %s on line %d
+
+Deprecated: Function zip_entry_compressionmethod() is deprecated in %s on line %d
 entry2.txt: deflated
+
+Deprecated: Function zip_read() is deprecated in %s on line %d
+
+Deprecated: Function zip_entry_name() is deprecated in %s on line %d
+
+Deprecated: Function zip_entry_compressionmethod() is deprecated in %s on line %d
 dir/entry3.txt: stored
+
+Deprecated: Function zip_read() is deprecated in %s on line %d
+
+Deprecated: Function zip_entry_name() is deprecated in %s on line %d
+
+Deprecated: Function zip_entry_compressionmethod() is deprecated in %s on line %d
 entry4.txt: deflated
+
+Deprecated: Function zip_read() is deprecated in %s on line %d
+
+Deprecated: Function zip_entry_name() is deprecated in %s on line %d
+
+Deprecated: Function zip_entry_compressionmethod() is deprecated in %s on line %d
 entry5.txt: stored
+
+Deprecated: Function zip_read() is deprecated in %s on line %d
+
+Deprecated: Function zip_entry_name() is deprecated in %s on line %d
+
+Deprecated: Function zip_entry_compressionmethod() is deprecated in %s on line %d
 entry6.txt: deflated
+
+Deprecated: Function zip_read() is deprecated in %s on line %d
+
+Deprecated: Function zip_entry_name() is deprecated in %s on line %d
+
+Deprecated: Function zip_entry_compressionmethod() is deprecated in %s on line %d
 entry7.txt: deflated
+
+Deprecated: Function zip_read() is deprecated in %s on line %d
+
+Deprecated: Function zip_close() is deprecated in %s on line %d

diff --git a/ext/zip/tests/zip_close.phpt b/ext/zip/tests/zip_close.phpt
index 5df226e0eea506c7139710d42300416e7c12b719..ce93117d28cf8472116cf31a12ab6a40af87b811 100644 (file)
--- a/ext/zip/tests/zip_close.phpt
+++ b/ext/zip/tests/zip_close.phpt
@@ -12,5 +12,8 @@ zip_close($zip);
 echo "OK";
 
 ?>
---EXPECT--
+--EXPECTF--
+Deprecated: Function zip_open() is deprecated in %s on line %d
+
+Deprecated: Function zip_close() is deprecated in %s on line %d
 OK

diff --git a/ext/zip/tests/zip_entry_close.phpt b/ext/zip/tests/zip_entry_close.phpt
index f11f3112a93218d5f2e2ccab2d0930010503183f..249192b6211fc0674304dfdd1801506537af67f6 100644 (file)
--- a/ext/zip/tests/zip_entry_close.phpt
+++ b/ext/zip/tests/zip_entry_close.phpt
@@ -18,8 +18,19 @@ try {
 zip_close($zip);
 ?>
 Done
---EXPECT--
-entry_open:  bool(true)
-entry_close: bool(true)
-entry_close: zip_entry_close(): supplied resource is not a valid Zip Entry resource
+--EXPECTF--
+Deprecated: Function zip_open() is deprecated in %s on line %d
+
+Deprecated: Function zip_read() is deprecated in %s on line %d
+entry_open:  
+Deprecated: Function zip_entry_open() is deprecated in %s on line %d
+bool(true)
+entry_close: 
+Deprecated: Function zip_entry_close() is deprecated in %s on line %d
+bool(true)
+entry_close: 
+Deprecated: Function zip_entry_close() is deprecated in %s on line %d
+zip_entry_close(): supplied resource is not a valid Zip Entry resource
+
+Deprecated: Function zip_close() is deprecated in %s on line %d
 Done

diff --git a/ext/zip/tests/zip_entry_compressedsize.phpt b/ext/zip/tests/zip_entry_compressedsize.phpt
index 1356bac3432afd3659e30d607ad861ddfe9389c9..807ea16f30869e9c781a9096506e302042209c0a 100644 (file)
--- a/ext/zip/tests/zip_entry_compressedsize.phpt
+++ b/ext/zip/tests/zip_entry_compressedsize.phpt
@@ -15,8 +15,29 @@ while ($entry = zip_read($zip)) {
 zip_close($zip);
 
 ?>
---EXPECT--
+--EXPECTF--
+Deprecated: Function zip_open() is deprecated in %s on line %d
+
+Deprecated: Function zip_read() is deprecated in %s on line %d
+
+Deprecated: Function zip_entry_compressedsize() is deprecated in %s on line %d
 5
+
+Deprecated: Function zip_read() is deprecated in %s on line %d
+
+Deprecated: Function zip_entry_compressedsize() is deprecated in %s on line %d
 4
+
+Deprecated: Function zip_read() is deprecated in %s on line %d
+
+Deprecated: Function zip_entry_compressedsize() is deprecated in %s on line %d
 0
+
+Deprecated: Function zip_read() is deprecated in %s on line %d
+
+Deprecated: Function zip_entry_compressedsize() is deprecated in %s on line %d
 24
+
+Deprecated: Function zip_read() is deprecated in %s on line %d
+
+Deprecated: Function zip_close() is deprecated in %s on line %d

diff --git a/ext/zip/tests/zip_entry_compressionmethod.phpt b/ext/zip/tests/zip_entry_compressionmethod.phpt
index f8b48637162287260eaa9cb7539b11669a7f6b3c..ed59ae845abb689cbd4155e06431ec268e23c7c3 100644 (file)
--- a/ext/zip/tests/zip_entry_compressionmethod.phpt
+++ b/ext/zip/tests/zip_entry_compressionmethod.phpt
@@ -15,8 +15,29 @@ while ($entry = zip_read($zip)) {
 zip_close($zip);
 
 ?>
---EXPECT--
+--EXPECTF--
+Deprecated: Function zip_open() is deprecated in %s on line %d
+
+Deprecated: Function zip_read() is deprecated in %s on line %d
+
+Deprecated: Function zip_entry_compressionmethod() is deprecated in %s on line %d
 stored
+
+Deprecated: Function zip_read() is deprecated in %s on line %d
+
+Deprecated: Function zip_entry_compressionmethod() is deprecated in %s on line %d
 stored
+
+Deprecated: Function zip_read() is deprecated in %s on line %d
+
+Deprecated: Function zip_entry_compressionmethod() is deprecated in %s on line %d
 stored
+
+Deprecated: Function zip_read() is deprecated in %s on line %d
+
+Deprecated: Function zip_entry_compressionmethod() is deprecated in %s on line %d
 deflated
+
+Deprecated: Function zip_read() is deprecated in %s on line %d
+
+Deprecated: Function zip_close() is deprecated in %s on line %d

diff --git a/ext/zip/tests/zip_entry_filesize.phpt b/ext/zip/tests/zip_entry_filesize.phpt
index 1498682215929a8fea5da8e01705503912109e83..aaee29ec93ec2af4c7d43601cc69eeed8f601222 100644 (file)
--- a/ext/zip/tests/zip_entry_filesize.phpt
+++ b/ext/zip/tests/zip_entry_filesize.phpt
@@ -15,8 +15,29 @@ while ($entry = zip_read($zip)) {
 zip_close($zip);
 
 ?>
---EXPECT--
+--EXPECTF--
+Deprecated: Function zip_open() is deprecated in %s on line %d
+
+Deprecated: Function zip_read() is deprecated in %s on line %d
+
+Deprecated: Function zip_entry_filesize() is deprecated in %s on line %d
 5
+
+Deprecated: Function zip_read() is deprecated in %s on line %d
+
+Deprecated: Function zip_entry_filesize() is deprecated in %s on line %d
 4
+
+Deprecated: Function zip_read() is deprecated in %s on line %d
+
+Deprecated: Function zip_entry_filesize() is deprecated in %s on line %d
 0
+
+Deprecated: Function zip_read() is deprecated in %s on line %d
+
+Deprecated: Function zip_entry_filesize() is deprecated in %s on line %d
 27
+
+Deprecated: Function zip_read() is deprecated in %s on line %d
+
+Deprecated: Function zip_close() is deprecated in %s on line %d

diff --git a/ext/zip/tests/zip_entry_name.phpt b/ext/zip/tests/zip_entry_name.phpt
index 486777a0b11b8a28ef8352548f7aa1fa718d0454..5dfc285a071614a19982fa3aa688469c5dfcbc41 100644 (file)
--- a/ext/zip/tests/zip_entry_name.phpt
+++ b/ext/zip/tests/zip_entry_name.phpt
@@ -15,8 +15,29 @@ while ($entry = zip_read($zip)) {
 zip_close($zip);
 
 ?>
---EXPECT--
+--EXPECTF--
+Deprecated: Function zip_open() is deprecated in %s on line %d
+
+Deprecated: Function zip_read() is deprecated in %s on line %d
+
+Deprecated: Function zip_entry_name() is deprecated in %s on line %d
 foo
+
+Deprecated: Function zip_read() is deprecated in %s on line %d
+
+Deprecated: Function zip_entry_name() is deprecated in %s on line %d
 bar
+
+Deprecated: Function zip_read() is deprecated in %s on line %d
+
+Deprecated: Function zip_entry_name() is deprecated in %s on line %d
 foobar/
+
+Deprecated: Function zip_read() is deprecated in %s on line %d
+
+Deprecated: Function zip_entry_name() is deprecated in %s on line %d
 foobar/baz
+
+Deprecated: Function zip_read() is deprecated in %s on line %d
+
+Deprecated: Function zip_close() is deprecated in %s on line %d

diff --git a/ext/zip/tests/zip_entry_open.phpt b/ext/zip/tests/zip_entry_open.phpt
index 3c7fa287141cbb2ffbcd1ee9ac8e8c6e63b202ce..329f5ca276a09806de2a4a7f439b39f8a672ff61 100644 (file)
--- a/ext/zip/tests/zip_entry_open.phpt
+++ b/ext/zip/tests/zip_entry_open.phpt
@@ -13,5 +13,13 @@ zip_entry_close($entry);
 zip_close($zip);
 
 ?>
---EXPECT--
+--EXPECTF--
+Deprecated: Function zip_open() is deprecated in %s on line %d
+
+Deprecated: Function zip_read() is deprecated in %s on line %d
+
+Deprecated: Function zip_entry_open() is deprecated in %s on line %d
 OK
+Deprecated: Function zip_entry_close() is deprecated in %s on line %d
+
+Deprecated: Function zip_close() is deprecated in %s on line %d

diff --git a/ext/zip/tests/zip_entry_read.phpt b/ext/zip/tests/zip_entry_read.phpt
index a9800b5cc4c34beb7e60d9ec911d3b02c9b98df0..6184de2589cb235245176af3cdc677cf9cc82294 100644 (file)
--- a/ext/zip/tests/zip_entry_read.phpt
+++ b/ext/zip/tests/zip_entry_read.phpt
@@ -14,5 +14,17 @@ zip_entry_close($entry);
 zip_close($zip);
 
 ?>
---EXPECT--
+--EXPECTF--
+Deprecated: Function zip_open() is deprecated in %s on line %d
+
+Deprecated: Function zip_read() is deprecated in %s on line %d
+
+Deprecated: Function zip_entry_open() is deprecated in %s on line %d
+
+Deprecated: Function zip_entry_read() is deprecated in %s on line %d
 foo
+
+
+Deprecated: Function zip_entry_close() is deprecated in %s on line %d
+
+Deprecated: Function zip_close() is deprecated in %s on line %d

diff --git a/ext/zip/tests/zip_open.phpt b/ext/zip/tests/zip_open.phpt
index 8cd714da0c7bc39fdfbb2b6fcfa369ec3d9b0fbe..f4dc22433d770659b00b1b70ade119572f841d46 100644 (file)
--- a/ext/zip/tests/zip_open.phpt
+++ b/ext/zip/tests/zip_open.phpt
@@ -11,5 +11,6 @@ $zip = zip_open(__DIR__."/test_procedural.zip");
 echo is_resource($zip) ? "OK" : "Failure";
 
 ?>
---EXPECT--
+--EXPECTF--
+Deprecated: Function zip_open() is deprecated in %s on line %d
 OK

diff --git a/ext/zip/tests/zip_open_error.phpt b/ext/zip/tests/zip_open_error.phpt
index 068956b81f6667402d51e157484349793f807e89..ae52873f43036c3522edd5b2d615a704d9036e6b 100644 (file)
--- a/ext/zip/tests/zip_open_error.phpt
+++ b/ext/zip/tests/zip_open_error.phpt
@@ -18,6 +18,10 @@ echo is_resource($zip) ? "OK" : "Failure";
 ?>
 --EXPECTF--
 Test case 1:
+Deprecated: Function zip_open() is deprecated in %s on line %d
+
 Warning: zip_open(): Empty string as source in %s on line %d
 Test case 2:
+
+Deprecated: Function zip_open() is deprecated in %s on line %d
 Failure

diff --git a/ext/zip/tests/zip_read.phpt b/ext/zip/tests/zip_read.phpt
index 5cd2e9755af6e1e0554b587ff9d28a3801a579f8..624e02ec1c45ec29df8a6948f5301fee56d23d41 100644 (file)
--- a/ext/zip/tests/zip_read.phpt
+++ b/ext/zip/tests/zip_read.phpt
@@ -16,5 +16,18 @@ zip_close($zip);
 echo "$entries entries";
 
 ?>
---EXPECT--
+--EXPECTF--
+Deprecated: Function zip_open() is deprecated in %s on line %d
+
+Deprecated: Function zip_read() is deprecated in %s on line %d
+
+Deprecated: Function zip_read() is deprecated in %s on line %d
+
+Deprecated: Function zip_read() is deprecated in %s on line %d
+
+Deprecated: Function zip_read() is deprecated in %s on line %d
+
+Deprecated: Function zip_read() is deprecated in %s on line %d
+
+Deprecated: Function zip_close() is deprecated in %s on line %d
 4 entries