From ddb6cadb4c00c303aa2ec6f03dcaeb77e57f0b2e Mon Sep 17 00:00:00 2001
From: Remi Collet <remi@php.net>
Date: Mon, 26 Jun 2023 16:43:59 +0200
Subject: [PATCH] NEWS and UPGRADING for zip 1.22.0

---
 NEWS      |  8 ++++++++
 UPGRADING | 11 +++++++++++
 2 files changed, 19 insertions(+)

diff --git a/NEWS b/NEWS
index ae1d2c2caca..8c080920a07 100644
--- a/NEWS
+++ b/NEWS
@@ -15,6 +15,14 @@ PHP                                                                        NEWS
   . Fixed bug GH-11514 (PHP 8.3 build fails with --enable-mbstring enabled).
     (nielsdos)
 
+- zip:
+  . zip extension version 1.22.0 for libzip 1.10.0. (Remi)
+  . add new error macros (ER_DATA_LENGTH and ER_NOT_ALLOWED). (Remi)
+  . add new archive global flags (ER_AFL_*). (Remi)
+  . add ZipArchive::setArchiveFlag and ZipArchive::getArchiveFlag methods.
+    (Remi)
+
+
 22 Jun 2023, PHP 8.3.0alpha2
 
 - Core:
diff --git a/UPGRADING b/UPGRADING
index 12189958faa..ea337d62149 100644
--- a/UPGRADING
+++ b/UPGRADING
@@ -240,6 +240,9 @@ PHP 8.3 UPGRADE NOTES
 - Sockets:
   . Added socket_atmark to checks if the socket is OOB marked.
 
+- Zip:
+  . Added ZipArchive::setArchiveFlag and ZipArchive::getArchiveFlag methods.
+
 ========================================
 7. New Classes and Interfaces
 ========================================
@@ -300,6 +303,14 @@ PHP 8.3 UPGRADE NOTES
   . SO_REUSEPORT_LB (FreeBSD only).
   . IP_BIND_ADDRESS_NO_PORT (Linux only).
 
+- Zip:
+  . ZipArchive::ER_DATA_LENGTH (libzip >= 1.10)
+  . ZipArchive::ER_NOT_ALLOWED (libzip >= 1.10)
+  . ZipArchive::AFL_RDONLY (libzip >= 1.10)
+  . ZipArchive::AFL_IS_TORRENTZIP (libzip >= 1.10)
+  . ZipArchive::AFL_WANT_TORRENTZIP (libzip >= 1.10)
+  . ZipArchive::AFL_CREATE_OR_KEEP_FILE_FOR_EMPTY_ARCHIVE (libzip >= 1.10)
+
 ========================================
 11. Changes to INI File Handling
 ========================================