From 2652fae156a7d5e05aa1e71ccc0284a9ede49d41 Mon Sep 17 00:00:00 2001
From: Maximilian Bosch <maximilian@mbosch.me>
Date: Mon, 29 Dec 2025 19:15:56 +0100
Subject: [PATCH 1/3] php84: 8.4.15 -> 8.4.16, fixes CVE-2025-14177,
 CVE-2025-14178, CVE-2025-14180, GHSA-www2-q4fc-65wf

ChangeLog: https://www.php.net/ChangeLog-8.php#8.4.16
---
 pkgs/development/interpreters/php/8.4.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/interpreters/php/8.4.nix b/pkgs/development/interpreters/php/8.4.nix
index 4aaa4f3e02b4..6e5c02fcfceb 100644
--- a/pkgs/development/interpreters/php/8.4.nix
+++ b/pkgs/development/interpreters/php/8.4.nix
@@ -4,8 +4,8 @@ let
   base = callPackage ./generic.nix (
     _args
     // {
-      version = "8.4.15";
-      hash = "sha256-txVb3UmNYNY+S8Mg3CJIY5dtMbW9kzlplybJYSVaMZc=";
+      version = "8.4.16";
+      hash = "sha256-bEjGXrpqL3oQKSXQh3Ijmx9FEQrtIYf92BuTPtQ5xpI=";
     }
   );
 in

From 865f2e83588d9c455a4933b28067f507aacbbde4 Mon Sep 17 00:00:00 2001
From: Maximilian Bosch <maximilian@mbosch.me>
Date: Mon, 29 Dec 2025 19:24:16 +0100
Subject: [PATCH 2/3] php83: 8.3.28 -> 8.3.29, fixes CVE-2025-14177,
 CVE-2025-14178, CVE-2025-14180, GHSA-www2-q4fc-65wf

ChangeLog: https://www.php.net/ChangeLog-8.php#8.3.29
---
 pkgs/development/interpreters/php/8.3.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/interpreters/php/8.3.nix b/pkgs/development/interpreters/php/8.3.nix
index c1155c1eadef..1d72efb4be84 100644
--- a/pkgs/development/interpreters/php/8.3.nix
+++ b/pkgs/development/interpreters/php/8.3.nix
@@ -4,8 +4,8 @@ let
   base = callPackage ./generic.nix (
     _args
     // {
-      version = "8.3.28";
-      hash = "sha256-1bOF7jUexGPIXUfutTtRFW80g+rz/0OnrVCAwrbUxVc=";
+      version = "8.3.29";
+      hash = "sha256-xzNyEuZVMl1JnqgQj6dvad3eL/98sPrTaqY+7VQMuKU=";
     }
   );
 in

From 9960abcf8fa651a48a1d4f43fd2a5ea7a4dffa46 Mon Sep 17 00:00:00 2001
From: Maximilian Bosch <maximilian@mbosch.me>
Date: Mon, 29 Dec 2025 19:25:00 +0100
Subject: [PATCH 3/3] php82: 8.2.29 -> 8.2.30, fixes CVE-2025-14177,
 CVE-2025-14178, CVE-2025-14180, GHSA-www2-q4fc-65wf

ChangeLog: https://www.php.net/ChangeLog-8.php#8.2.30
---
 pkgs/development/interpreters/php/8.2.nix |  4 ++--
 pkgs/top-level/php-packages.nix           | 10 ----------
 2 files changed, 2 insertions(+), 12 deletions(-)

diff --git a/pkgs/development/interpreters/php/8.2.nix b/pkgs/development/interpreters/php/8.2.nix
index 6e33b3ba3c60..ecf54354a8b7 100644
--- a/pkgs/development/interpreters/php/8.2.nix
+++ b/pkgs/development/interpreters/php/8.2.nix
@@ -4,8 +4,8 @@ let
   base = callPackage ./generic.nix (
     _args
     // {
-      version = "8.2.29";
-      hash = "sha256-UZeejRmMut4qrU/+n1PdPwT5YC0wieWXmYXgWK3kJnw=";
+      version = "8.2.30";
+      hash = "sha256-EEggtsj8lZ3eSzNCE19CvavyRuhpGKFjgaF9hEfIZvo=";
     }
   );
 in
diff --git a/pkgs/top-level/php-packages.nix b/pkgs/top-level/php-packages.nix
index 5a2781659262..bd805eef0f1b 100644
--- a/pkgs/top-level/php-packages.nix
+++ b/pkgs/top-level/php-packages.nix
@@ -447,16 +447,6 @@ lib.makeScope pkgs.newScope (
               configureFlags = [
                 "--enable-dom"
               ];
-              patches = lib.optionals (lib.versionOlder php.version "8.3") [
-                # Fix gh10234 test with libxml 2.15.0
-                (fetchpatch {
-                  url = "https://github.com/php/php-src/commit/d6e70e705323a50b616ffee9402245ab97de3e4e.patch";
-                  hash = "sha256-Axu09l3uQ83qe30aDsR+Bt29cJiF4mLknwDyQf94vic=";
-                  includes = [
-                    "ext/dom/tests/gh10234.phpt"
-                  ];
-                })
-              ];
             }
             {
               name = "enchant";