diff --git a/dev-lang/php/files/php-8.4-musl126-tests.patch b/dev-lang/php/files/php-8.4-musl126-tests.patch deleted file mode 100644 index 06e6d6d4534a1..0000000000000 --- a/dev-lang/php/files/php-8.4-musl126-tests.patch +++ /dev/null @@ -1,63 +0,0 @@ -From 520a8e82757118e3a5ccb34b60d3e72f9347b78a Mon Sep 17 00:00:00 2001 -From: Michael Orlitzky -Date: Wed, 12 Aug 2026 10:07:28 -0400 -Subject: [PATCH] ext/gettext/tests: updates for musl-1.2.6 - -As of v1.2.6, musl's bind_textdomain_codeset() no longer returns NULL -to indicate that the codeset is UTF-8 "by default." Instead you get -"UTF-8". Two tests require minor updates for this. ---- - ext/gettext/tests/bug53251.phpt | 12 +++++++++--- - .../gettext_bind_textdomain_codeset-retval.phpt | 3 ++- - 2 files changed, 11 insertions(+), 4 deletions(-) - -diff --git a/ext/gettext/tests/bug53251.phpt b/ext/gettext/tests/bug53251.phpt -index d568be6bc07..b04abe9f1fa 100644 ---- a/ext/gettext/tests/bug53251.phpt -+++ b/ext/gettext/tests/bug53251.phpt -@@ -21,15 +21,21 @@ - // "foo" is unbound, so in the first call, you will get false instead - // of a string. - // --// bind_textdomain_codeset() always returns false on musl --// because musl only supports UTF-8. For more information: -+// Prior to v1.2.6, bind_textdomain_codeset() always returns false on -+// musl because musl only supports UTF-8. For more information: - // - // * https://github.com/php/doc-en/issues/4311, - // * https://github.com/php/php-src/issues/17163 - // - $expected_musl = [false, true, false, false, false]; - --var_dump($results === $expected || $results === $expected_musl); -+// As of v1.2.6, bind_textdomain_codeset() returns "UTF-8" in all -+// three cases on musl because UTF-8 is the only supported codeset. -+$expected_musl126 = [false, true, "UTF-8", "UTF-8", "UTF-8"]; -+ -+var_dump($results === $expected -+ || $results === $expected_musl -+ || $results === $expected_musl126); - ?> - --EXPECT-- - bool(true) -diff --git a/ext/gettext/tests/gettext_bind_textdomain_codeset-retval.phpt b/ext/gettext/tests/gettext_bind_textdomain_codeset-retval.phpt -index 44957ad8d70..bba70c9848e 100644 ---- a/ext/gettext/tests/gettext_bind_textdomain_codeset-retval.phpt -+++ b/ext/gettext/tests/gettext_bind_textdomain_codeset-retval.phpt -@@ -17,11 +17,12 @@ - } - - // bind_textdomain_codeset() always returns false on musl -- // because musl only supports UTF-8. For more information: -+ // prior to v1.2.6. For more information: - // - // * https://github.com/php/doc-en/issues/4311, - // * https://github.com/php/php-src/issues/17163 - // -+ // As of v1.2.6, it returns "UTF-8" as well. - $result = bind_textdomain_codeset('messages', "UTF-8"); - var_dump($result === false || $result === "UTF-8"); - --- -2.55.0 - diff --git a/dev-lang/php/files/php-8.4.25-gh23043.patch b/dev-lang/php/files/php-8.4.25-gh23043.patch deleted file mode 100644 index 4e0fe5101430a..0000000000000 --- a/dev-lang/php/files/php-8.4.25-gh23043.patch +++ /dev/null @@ -1,32 +0,0 @@ -From 33b13ae5deae701d858f0d588c06e2a224efdc9e Mon Sep 17 00:00:00 2001 -From: Michael Orlitzky -Date: Tue, 1 Sep 2026 17:58:13 -0400 -Subject: [PATCH] ext/session/.../gh23043.phpt: session.save_path can be - nonempty - -Allow session.save_path to be nonempty in this test, as the test -itself does not empty it, and in automated setups it is common to -force all "temporary stuff" to a dedicated location. ---- - ext/session/tests/user_session_module/gh23043.phpt | 4 ++-- - 1 file changed, 2 insertions(+), 2 deletions(-) - -diff --git a/ext/session/tests/user_session_module/gh23043.phpt b/ext/session/tests/user_session_module/gh23043.phpt -index e3528884a79..caf98ac9385 100644 ---- a/ext/session/tests/user_session_module/gh23043.phpt -+++ b/ext/session/tests/user_session_module/gh23043.phpt -@@ -27,9 +27,9 @@ function create_sid(): string { - - Warning: SessionHandler::write(): Session ID is too long or contains illegal characters. Only the A-Z, a-z, 0-9, "-", and "," characters are allowed in %s on line %d - --Warning: session_write_close(): Failed to write session data using user defined save handler. (session.save_path: , handler: a::write) in %s on line %d -+Warning: session_write_close(): Failed to write session data using user defined save handler. (session.save_path: %S, handler: a::write) in %s on line %d - string(0) "" - - Warning: SessionHandler::write(): Session ID is too long or contains illegal characters. Only the A-Z, a-z, 0-9, "-", and "," characters are allowed in Unknown on line 0 - --Warning: session_write_close(): Failed to write session data using user defined save handler. (session.save_path: , handler: a::write) in Unknown on line 0 -+Warning: session_write_close(): Failed to write session data using user defined save handler. (session.save_path: %S, handler: a::write) in Unknown on line 0 --- -2.55.0 -