From 9d6670952e5579e1f67912309d47964e8ecc9292 Mon Sep 17 00:00:00 2001
From: Kaniska <kaniska244@github.com>
Date: Tue, 31 Dec 2024 07:42:46 +0000
Subject: [PATCH] Upgraded PHP latest version to 8.4 in the php and universal
 images.

---
 src/php/.devcontainer/Dockerfile              |  2 +-
 src/php/README.md                             |  3 +-
 src/php/manifest.json                         | 29 +++++++++++++++----
 src/universal/.devcontainer/devcontainer.json |  4 +--
 4 files changed, 28 insertions(+), 10 deletions(-)

diff --git a/src/php/.devcontainer/Dockerfile b/src/php/.devcontainer/Dockerfile
index 649680640..da3a3bc7d 100644
--- a/src/php/.devcontainer/Dockerfile
+++ b/src/php/.devcontainer/Dockerfile
@@ -1,4 +1,4 @@
-ARG VARIANT=8.3-apache-bookworm
+ARG VARIANT=8.4-apache-bookworm
 FROM php:${VARIANT}
 
 # Install xdebug
diff --git a/src/php/README.md b/src/php/README.md
index 789dadabf..ddf8716cf 100644
--- a/src/php/README.md
+++ b/src/php/README.md
@@ -9,7 +9,7 @@
 | *Categories* | Languages |
 | *Image type* | Dockerfile |
 | *Published images* | mcr.microsoft.com/devcontainers/php |
-| *Available image variants* | 8 / 8-bookworm, 8.3 / 8.3-bookworm, 8.2 / 8.2-bookworm, 8-bullseye, 8.3-bullseye, 8.2-bullseye ([full list](https://mcr.microsoft.com/v2/devcontainers/php/tags/list)) |
+| *Available image variants* | 8 / 8-bookworm, 8.4 / 8.4-bookworm, 8.3 / 8.3-bookworm, 8.2 / 8.2-bookworm, 8-bullseye, 8.4-bullseye,,8.3-bullseye, 8.2-bullseye ([full list](https://mcr.microsoft.com/v2/devcontainers/php/tags/list)) |
 | *Published image architecture(s)* | x86-64, arm64/aarch64 for `bookworm`, and `bullseye` variants |
 | *Container host OS support* | Linux, macOS, Windows |
 | *Container OS* | Debian |
@@ -23,6 +23,7 @@ You can directly reference pre-built versions of `Dockerfile` by using the `imag
 
 - `mcr.microsoft.com/devcontainers/php` (latest)
 - `mcr.microsoft.com/devcontainers/php:8` (or `8-bookworm`, `8-bullseye` to pin to an OS version)
+- `mcr.microsoft.com/devcontainers/php:8.4` (or `8.4-bookworm`, `8.4-bullseye` to pin to an OS version)
 - `mcr.microsoft.com/devcontainers/php:8.3` (or `8.3-bookworm`, `8.3-bullseye` to pin to an OS version)
 - `mcr.microsoft.com/devcontainers/php:8.2` (or `8.2-bookworm`, `8.2-bullseye` to pin to an OS version)
 
diff --git a/src/php/manifest.json b/src/php/manifest.json
index b962355d6..f759ccd28 100644
--- a/src/php/manifest.json
+++ b/src/php/manifest.json
@@ -1,15 +1,21 @@
 {
 	"version": "1.2.12",
 	"variants": [
+		"8.4-apache-bookworm",
 		"8.3-apache-bookworm",
 		"8.2-apache-bookworm",
+		"8.4-apache-bullseye",
 		"8.3-apache-bullseye",
 		"8.2-apache-bullseye"
 	],
 	"build": {
-		"latest": "8.3-apache-bookworm",
+		"latest": "8.4-apache-bookworm",
 		"rootDistro": "debian",
 		"architectures": {
+			"8.4-apache-bookworm": [
+				"linux/amd64",
+				"linux/arm64"
+			],			
 			"8.3-apache-bookworm": [
 				"linux/amd64",
 				"linux/arm64"
@@ -18,6 +24,10 @@
 				"linux/amd64",
 				"linux/arm64"
 			],
+			"8.4-apache-bullseye": [
+				"linux/amd64",
+				"linux/arm64"
+			],			
 			"8.3-apache-bullseye": [
 				"linux/amd64",
 				"linux/arm64"
@@ -31,22 +41,29 @@
 			"php:${VERSION}-${VARIANT}"
 		],
 		"variantTags": {
-			"8.3-apache-bookworm": [
+			"8.4-apache-bookworm": [
 				"php:${VERSION}-8",
-				"php:${VERSION}-8.3",
+				"php:${VERSION}-8.4",
 				"php:${VERSION}-8-bookworm",
-				"php:${VERSION}-8.3-bookworm",
+				"php:${VERSION}-8.4-bookworm",
 				"php:${VERSION}-bookworm"
 			],
+			"8.3-apache-bookworm": [
+				"php:${VERSION}-8.3",
+				"php:${VERSION}-8.3-bookworm"
+			],			
 			"8.2-apache-bookworm": [
 				"php:${VERSION}-8.2",
 				"php:${VERSION}-8.2-bookworm"
 			],
-			"8.3-apache-bullseye": [
+			"8.4-apache-bullseye": [
 				"php:${VERSION}-8-bullseye",
-				"php:${VERSION}-8.3-bullseye",
+				"php:${VERSION}-8.4-bullseye",
 				"php:${VERSION}-bullseye"
 			],
+			"8.3-apache-bullseye": [
+				"php:${VERSION}-8.3-bullseye"
+			],			
 			"8.2-apache-bullseye": [
 				"php:${VERSION}-8.2-bullseye"
 			]
diff --git a/src/universal/.devcontainer/devcontainer.json b/src/universal/.devcontainer/devcontainer.json
index f9f170875..728dfb8f9 100644
--- a/src/universal/.devcontainer/devcontainer.json
+++ b/src/universal/.devcontainer/devcontainer.json
@@ -31,8 +31,8 @@
         },
         "./local-features/machine-learning-packages": "latest",
         "ghcr.io/devcontainers/features/php:1": {
-            "version": "8.3.0",
-            "additionalVersions": "8.2.13",
+            "version": "8.4.2",
+            "additionalVersions": "8.3.14",
             "installComposer": "true"
         },
         "ghcr.io/devcontainers/features/conda:1": {