[ci skip] fix for #72374 is no more a BC break

diff --git a/NEWS b/NEWS
index fa0a8cdc905fa68375acfe94d82ad78c0bd2c3a6..43de837425fd8624b602e3a1439b0f54f545cd8a 100644 (file)
--- a/NEWS
+++ b/NEWS
@@ -131,7 +131,7 @@ PHP                                                                        NEWS
     (cmb)
 
 - Zip:
-  . Fixed bug #72374 (remove_path strips first char of filename). (tyage)
+  . Fixed bug #72374 (remove_path strips first char of filename). (tyage, Remi)
   . Add ZipArchive::setMtimeName and ZipArchive::setMtimeIndex methods. (Remi)
   . Add ZipArchive::setProgressCallback method (since libzip 1.3.0). (Remi)
   . Add ZipArchive::setCancelCallback method (since libzip 1.6.0). (Remi)

diff --git a/UPGRADING b/UPGRADING
index f99344ac0c3595290721908630f51c3348ef1f2b..4eebd4e49efd285b081a00ee1b9b443f41c4507e 100644 (file)
--- a/UPGRADING
+++ b/UPGRADING
@@ -363,11 +363,6 @@ PHP 8.0 UPGRADE NOTES
     objects instead of resources.
 
 - Zip:
-  . The remove_path option of ZipArchive::addGlob() and ::addPattern() is now
-    treated as arbitrary string prefix (for consistency with the add_path
-    option), whereas formerly it was treated as directory name. This means that
-    if no trailing directory separator is given, the following character is
-    no longer stripped from the filename.
   . ZipArchive::OPSYS_Z_CPM have been removed, should use ZipArchive::OPSYS_CPM
     (this name was a typo).
 
@@ -428,6 +423,9 @@ PHP 8.0 UPGRADE NOTES
   . New ZipArchive::lastId property to get index value of last added entry.
   . Error can be checked after an archive is closed using ZipArchive::status,
     ZipArchive::statusSys properties or ZipArchive::getStatusString() method.
+  . The remove_path option of ZipArchive::addGlob() and ::addPattern() is now
+    treated as arbitrary string prefix (for consistency with the add_path
+    option), whereas formerly it was treated as directory name.
 
 ========================================
 3. Changes in SAPI modules