From 4098613012afbe6deacf7ea9ee9631ae76a5a040 Mon Sep 17 00:00:00 2001
From: Niels Dossche <7771979+ndossche@users.noreply.github.com>
Date: Thu, 30 Oct 2025 19:11:57 +0100
Subject: [PATCH 1/2] [ci skip] Fix CODEOWNERS name

---
 .github/CODEOWNERS | 18 +++++++++---------
 1 file changed, 9 insertions(+), 9 deletions(-)

diff --git a/.github/CODEOWNERS b/.github/CODEOWNERS
index ba67073c6afb3..af90ff295b1ee 100644
--- a/.github/CODEOWNERS
+++ b/.github/CODEOWNERS
@@ -16,11 +16,11 @@
 
 /.github @TimWolla
 /build/gen_stub.php @kocsismate
-/ext/bcmath @Girgias @nielsdos @SakiTakamachi
+/ext/bcmath @Girgias @ndossche @SakiTakamachi
 /ext/curl @adoy
 /ext/date @derickr
 /ext/dba @Girgias
-/ext/dom @nielsdos
+/ext/dom @ndossche
 /ext/ffi @dstogov
 /ext/gd @devnexen
 /ext/gettext @devnexen
@@ -28,7 +28,7 @@
 /ext/imap @Girgias
 /ext/intl @devnexen
 /ext/json @bukka
-/ext/libxml @nielsdos
+/ext/libxml @ndossche
 /ext/mbstring @alexdowad @youkidearitai
 /ext/mysqli @bukka @kamil-tekiela
 /ext/mysqlnd @bukka @kamil-tekiela @SakiTakamachi
@@ -46,15 +46,15 @@
 /ext/pgsql @devnexen
 /ext/random @TimWolla @zeriyoshi
 /ext/session @Girgias
-/ext/simplexml @nielsdos
-/ext/soap @nielsdos
+/ext/simplexml @ndossche
+/ext/soap @ndossche
 /ext/sockets @devnexen
 /ext/spl @Girgias
 /ext/standard @bukka
-/ext/xml @nielsdos
-/ext/xmlreader @nielsdos
-/ext/xmlwriter @nielsdos
-/ext/xsl @nielsdos
+/ext/xml @ndossche
+/ext/xmlreader @ndossche
+/ext/xmlwriter @ndossche
+/ext/xsl @ndossche
 /main @bukka
 /sapi/fpm @bukka
 /Zend/Optimizer @dstogov

From 425b97e0b643da1dd7cbb7aba392e36b82243bc3 Mon Sep 17 00:00:00 2001
From: Niels Dossche <7771979+ndossche@users.noreply.github.com>
Date: Thu, 30 Oct 2025 22:45:52 +0100
Subject: [PATCH 2/2] phar: Remove unused macro (#20343)

---
 ext/phar/phar.c | 7 -------
 1 file changed, 7 deletions(-)

diff --git a/ext/phar/phar.c b/ext/phar/phar.c
index b7bd61b86019f..c5bfb1b34c24f 100644
--- a/ext/phar/phar.c
+++ b/ext/phar/phar.c
@@ -464,17 +464,10 @@ ZEND_ATTRIBUTE_NONNULL void phar_entry_remove(phar_entry_data *idata, char **err
 		| ((uint32_t)(((unsigned char*)(buffer))[1]) <<  8) \
 		| ((uint32_t)((unsigned char*)(buffer))[0]); \
 	(buffer) += 4
-# define PHAR_GET_16(buffer, var) \
-	var = ((uint16_t)(((unsigned char*)(buffer))[1]) <<  8) \
-		| ((uint16_t)((unsigned char*)(buffer))[0]); \
-	(buffer) += 2
 #else
 # define PHAR_GET_32(buffer, var) \
 	memcpy(&var, buffer, sizeof(var)); \
 	buffer += 4
-# define PHAR_GET_16(buffer, var) \
-	var = *(uint16_t*)(buffer); \
-	buffer += 2
 #endif
 #define PHAR_ZIP_16(var) ((uint16_t)((((uint16_t)var[0]) & 0xff) | \
 	(((uint16_t)var[1]) & 0xff) << 8))