From ff0df8fe7aee65add6c1019aad7cfb25a412a1a4 Mon Sep 17 00:00:00 2001
From: Maximilian Bosch <maximilian@mbosch.me>
Date: Sat, 9 Nov 2024 13:20:50 +0100
Subject: [PATCH] php: 8.4.0RC3 -> 8.4.0RC4, 8.3.12 -> 8.3.13 (#354562)

* php84: 8.4.0RC3 -> 8.4.0RC4

* php83: 8.3.12 -> 8.3.13

ChangeLog: https://www.php.net/ChangeLog-8.php#PHP_8_3
---
 pkgs/development/interpreters/php/8.3.nix | 4 ++--
 pkgs/development/interpreters/php/8.4.nix | 6 +++---
 pkgs/top-level/php-packages.nix           | 7 +++++++
 3 files changed, 12 insertions(+), 5 deletions(-)

diff --git a/pkgs/development/interpreters/php/8.3.nix b/pkgs/development/interpreters/php/8.3.nix
index cc7d87038a7d..43dbc2ce033d 100644
--- a/pkgs/development/interpreters/php/8.3.nix
+++ b/pkgs/development/interpreters/php/8.3.nix
@@ -2,8 +2,8 @@
 
 let
   base = callPackage ./generic.nix (_args // {
-    version = "8.3.12";
-    hash = "sha256-gHYzSWzNs3CokFRY24K9ZzZumKbVlyiRS3l7h+nK7L8=";
+    version = "8.3.13";
+    hash = "sha256-x3kcguGlVMyvhKQLpxzBQXupr2f7Wzl4CDf9fH628SQ=";
   });
 in
 base.withExtensions ({ all, ... }: with all; ([
diff --git a/pkgs/development/interpreters/php/8.4.nix b/pkgs/development/interpreters/php/8.4.nix
index c794e3963700..e5abb6760978 100644
--- a/pkgs/development/interpreters/php/8.4.nix
+++ b/pkgs/development/interpreters/php/8.4.nix
@@ -4,10 +4,10 @@ let
   base = callPackage ./generic.nix (
     _args
     // {
-      version = "8.4.0RC3";
+      version = "8.4.0RC4";
       phpSrc = fetchurl {
-        url = "https://downloads.php.net/~saki/php-8.4.0RC3.tar.xz";
-        hash = "sha256-6eA5w7NRfH5k+AyoIvuSEY9JgjtQqYwyZXTRSuKHBvY=";
+        url = "https://downloads.php.net/~calvinb/php-8.4.0RC4.tar.xz";
+        hash = "sha256-s/ihnYRfSqVlAV/4YZZAfrUzKE60NlrFlT9edK5h3LA=";
       };
     }
   );
diff --git a/pkgs/top-level/php-packages.nix b/pkgs/top-level/php-packages.nix
index 95772c0afc1c..c02e9f8ed068 100644
--- a/pkgs/top-level/php-packages.nix
+++ b/pkgs/top-level/php-packages.nix
@@ -682,6 +682,13 @@ in {
               url = "https://github.com/php/php-src/commit/4fe821311cafb18ca8bdf20b9d796c48a13ba552.patch";
               hash = "sha256-YC3I0BQi3o3+VmRu/UqpqPpaSC+ekPqzbORTHftbPvY=";
             })
+          ]
+          ++ lib.optionals (lib.versionAtLeast php.version "8.3") [
+            # https://github.com/php/php-src/pull/16733 (fix soap test)
+            (fetchpatch {
+              url = "https://github.com/php/php-src/commit/5c308d61db104854e4ff84ab123e3ea56e1b4046.patch";
+              hash = "sha256-xQ4Sg4kL0cgHYauRW2AzGgFXfcqtxeRVhI9zNh7CsoM=";
+            })
           ];
         }
         {