From 996a69e34227440cd1f434c1172677c438d32cab Mon Sep 17 00:00:00 2001
From: Salman Chishti <13schishti@gmail.com>
Date: Sat, 14 Dec 2024 17:13:52 +0200
Subject: [PATCH] Upgrade to php version 8.4

---
 images/macos/macos-12-Readme.md           | 3 +--
 images/macos/toolsets/toolset-12.json     | 2 +-
 images/ubuntu/Ubuntu2004-Readme.md        | 3 +--
 images/ubuntu/Ubuntu2404-Readme.md        | 3 +--
 images/ubuntu/toolsets/toolset-2004.json  | 3 ++-
 images/windows/Windows2019-Readme.md      | 3 +--
 images/windows/Windows2022-Readme.md      | 3 +--
 images/windows/toolsets/toolset-2022.json | 2 +-
 8 files changed, 9 insertions(+), 13 deletions(-)

diff --git a/images/macos/macos-12-Readme.md b/images/macos/macos-12-Readme.md
index 86e0b715aa57..adf838e16474 100644
--- a/images/macos/macos-12-Readme.md
+++ b/images/macos/macos-12-Readme.md
@@ -31,7 +31,7 @@
 - NVM 0.39.7
 - NVM - Cached node versions: 16.20.2, 18.20.4, 20.17.0
 - Perl 5.38.2
-- PHP 8.3.11
+- PHP 8.4.1
 - Python 2.7.18
 - Python3 3.12.6
 - R 4.4.1
@@ -375,4 +375,3 @@ mv "/Applications/Visual Studio 2019.app" "/Applications/Visual Studio.app"
 If you want to use Parallels Desktop you should download a package from URL stored in
 PARALLELS_DMG_URL environment variable. A system extension is allowed for this version.
 ```
-
diff --git a/images/macos/toolsets/toolset-12.json b/images/macos/toolsets/toolset-12.json
index e63383d7af01..12c9c41124e0 100644
--- a/images/macos/toolsets/toolset-12.json
+++ b/images/macos/toolsets/toolset-12.json
@@ -354,7 +354,7 @@
         "version": "15"
     },
     "php": {
-        "version": "8.3"
+        "version": "8.4"
     },
     "mongodb": {
         "version": "5.0"
diff --git a/images/ubuntu/Ubuntu2004-Readme.md b/images/ubuntu/Ubuntu2004-Readme.md
index 00d0b726c512..e8b46c55e1f2 100644
--- a/images/ubuntu/Ubuntu2004-Readme.md
+++ b/images/ubuntu/Ubuntu2004-Readme.md
@@ -138,7 +138,7 @@ to accomplish this.
 | 21.0.5+11           | JAVA_HOME_21_X64     |
 
 ### PHP Tools
-- PHP: 7.4.33, 8.0.30, 8.1.31, 8.2.26, 8.3.14
+- PHP: 7.4.33, 8.0.30, 8.1.31, 8.2.26, 8.3.14, 8.4.1
 - Composer 2.8.3
 - PHPUnit 8.5.41
 ```
@@ -395,4 +395,3 @@ Use the following command as a part of your job to start the service: 'sudo syst
 | xz-utils               | 5.2.4-1ubuntu1.1                  |
 | zip                    | 3.0-11build1                      |
 | zsync                  | 0.6.2-3ubuntu1                    |
-
diff --git a/images/ubuntu/Ubuntu2404-Readme.md b/images/ubuntu/Ubuntu2404-Readme.md
index 77257c0f901a..cf44513865c3 100644
--- a/images/ubuntu/Ubuntu2404-Readme.md
+++ b/images/ubuntu/Ubuntu2404-Readme.md
@@ -118,7 +118,7 @@ to accomplish this.
 | 21.0.5+11            | JAVA_HOME_21_X64     |
 
 ### PHP Tools
-- PHP: 8.3.6
+- PHP: 8.4.1
 - Composer 2.8.3
 - PHPUnit 8.5.40
 ```
@@ -313,4 +313,3 @@ Use the following command as a part of your job to start the service: 'sudo syst
 | xz-utils               | 5.6.1+really5.4.5-1build0.1 |
 | zip                    | 3.0-13build1                |
 | zsync                  | 0.6.2-5build1               |
-
diff --git a/images/ubuntu/toolsets/toolset-2004.json b/images/ubuntu/toolsets/toolset-2004.json
index 13d83e5513c2..6ab4b2546171 100644
--- a/images/ubuntu/toolsets/toolset-2004.json
+++ b/images/ubuntu/toolsets/toolset-2004.json
@@ -307,7 +307,8 @@
             "8.0",
             "8.1",
             "8.2",
-            "8.3"
+            "8.3",
+            "8.4"
         ]
     },
     "rubygems": [
diff --git a/images/windows/Windows2019-Readme.md b/images/windows/Windows2019-Readme.md
index 61a68428e55c..eb44c96fb5a2 100644
--- a/images/windows/Windows2019-Readme.md
+++ b/images/windows/Windows2019-Readme.md
@@ -22,7 +22,7 @@
 - LLVM 18.1.8
 - Node 18.20.5
 - Perl 5.32.1
-- PHP 8.3.14
+- PHP 8.4.1
 - Python 3.7.9
 - Ruby 3.0.7p220
 
@@ -561,4 +561,3 @@ All other versions are saved but not installed.
 | mcr.microsoft.com/dotnet/framework/sdk:4.8-windowsservercore-ltsc2019     | sha256:f1a2e331287782ecc403dfd56717fbd32fdae9486ffaacaab8cb1798ee214e6d  | 2024-12-10 |
 | mcr.microsoft.com/windows/nanoserver:1809                                 | sha256:579994616649b876dd2e4009dae4af92f6e53561045230b8cdd53b3baf2f99d0  | 2024-12-05 |
 | mcr.microsoft.com/windows/servercore:ltsc2019                             | sha256:0cb5fd75c08e7246afc6cc16bfe769d91af54fdb72ca58df150ebf5e3a2972ad  | 2024-12-05 |
-
diff --git a/images/windows/Windows2022-Readme.md b/images/windows/Windows2022-Readme.md
index 84010c0314ad..383165d1b9aa 100644
--- a/images/windows/Windows2022-Readme.md
+++ b/images/windows/Windows2022-Readme.md
@@ -22,7 +22,7 @@
 - LLVM 18.1.8
 - Node 18.20.5
 - Perl 5.32.1
-- PHP 8.3.14
+- PHP 8.4.1
 - Python 3.9.13
 - Ruby 3.0.7p220
 
@@ -558,4 +558,3 @@ All other versions are saved but not installed.
 | mcr.microsoft.com/dotnet/framework/sdk:4.8-windowsservercore-ltsc2022     | sha256:5dfdecd584d2f7c6852e4e807b6bb308da8f8350a0131ddef3cb0a0e6237523c  | 2024-12-10 |
 | mcr.microsoft.com/windows/nanoserver:ltsc2022                             | sha256:eb59dfa1056e41b65cb12b679280e29f10d64e2b569b877710e227a77fef223f  | 2024-12-05 |
 | mcr.microsoft.com/windows/servercore:ltsc2022                             | sha256:cd409960f9b87fcc02e1c236fea3852e1323ffb16d9522bf693330ebf878f5c0  | 2024-12-05 |
-
diff --git a/images/windows/toolsets/toolset-2022.json b/images/windows/toolsets/toolset-2022.json
index 46c9261bc1e7..fc8803b282b2 100644
--- a/images/windows/toolsets/toolset-2022.json
+++ b/images/windows/toolsets/toolset-2022.json
@@ -379,7 +379,7 @@
         "version": "18"
     },
     "php": {
-        "version": "8.3"
+        "version": "8.4"
     },
     "postgresql": {
         "version": "14.12.1",