Update PHP version to 8.5 and adjust related documentation

Author: sireeshajonnalagadda

src/php-mariadb/.devcontainer/Dockerfile

@@ -1,4 +1,4 @@
-FROM mcr.microsoft.com/devcontainers/php:1-${templateOption:imageVariant}
+FROM mcr.microsoft.com/devcontainers/php:3-${templateOption:imageVariant}
 
 # Install MariaDB client
 RUN apt-get update && export DEBIAN_FRONTEND=noninteractive \

src/php-mariadb/README.md

@@ -7,7 +7,7 @@ Develop PHP applications with MariaDB (MySQL Compatible).
 
 | Options Id | Description | Type | Default Value |
 |-----|-----|-----|-----|
-| imageVariant | PHP version (use -bookworm, -bullseye variants on local arm64/Apple Silicon): | string | 8.4-bookworm |
+| imageVariant | PHP version (use -bookworm, -bullseye variants on local arm64/Apple Silicon): | string | 8.5-trixie |
 
 This template references an image that was [pre-built](https://containers.dev/implementors/reference/#prebuilding) to automatically include needed devcontainer.json metadata.
 

src/php-mariadb/devcontainer-template.json

@@ -1,6 +1,6 @@
 {
     "id": "php-mariadb",
-    "version": "4.2.0",
+    "version": "4.3.0",
     "name": "PHP & MariaDB",
     "description": "Develop PHP applications with MariaDB (MySQL Compatible).",
     "documentationURL": "https://github.com/devcontainers/templates/tree/main/src/php-mariadb",
@@ -9,18 +9,21 @@
     "options": {
         "imageVariant": {
             "type": "string",
-            "description": "PHP version (use -bookworm, -bullseye variants on local arm64/Apple Silicon):",
+            "description": "PHP version (use -trixie, -bookworm, -bullseye variants on local arm64/Apple Silicon):",
             "proposals": [
-                "8-bookworm",
-                "8.2-bookworm",
-                "8.3-bookworm",
+                "8.5-trixie",
+                "8.5-bookworm",
+                "8.5-bullseye",
+                "8.4-trixie",
                 "8.4-bookworm",				
-                "8-bullseye",
-                "8.2-bullseye",
+                "8.4-bullseye",
+                "8.3-trixie",
+                "8.3-bookworm",
                 "8.3-bullseye",
-                "8.4-bullseye"				
+                 "8-bullseye",
+                  "8-trixie"		
             ],
-            "default": "8.2-bookworm"
+            "default": "8.5-trixie"
         }
     },
     "platforms": [

src/php/README.md

@@ -7,7 +7,7 @@ Develop PHP based applications. Includes needed tools, extensions, and dependenc
 
 | Options Id | Description | Type | Default Value |
 |-----|-----|-----|-----|
-| imageVariant | PHP version (use -bookworm, -bullseye variants on local arm64/Apple Silicon): | string | 8.4-bookworm |
+| imageVariant | PHP version (use -bookworm, -bullseye variants on local arm64/Apple Silicon): | string | 8.5-trixie|
 
 This template references an image that was [pre-built](https://containers.dev/implementors/reference/#prebuilding) to automatically include needed devcontainer.json metadata.
 

src/php/devcontainer-template.json

@@ -1,6 +1,6 @@
 {
     "id": "php",
-    "version": "4.2.0",
+    "version": "4.3.0",
     "name": "PHP",
     "description": "Develop PHP based applications. Includes needed tools, extensions, and dependencies.",
     "documentationURL": "https://github.com/devcontainers/templates/tree/main/src/php",
@@ -9,18 +9,19 @@
     "options": {
         "imageVariant": {
             "type": "string",
-            "description": "PHP version (use -bookworm, -bullseye variants on local arm64/Apple Silicon):",
+            "description": "PHP version (use -trixie, -bookworm, -bullseye variants on local arm64/Apple Silicon):",
             "proposals": [
+                "8.5-trixie",
+                "8.5-bookworm",
+                "8.5-bullseye",
                 "8-bookworm",
-                "8.2-bookworm",
                 "8.3-bookworm",
                 "8.4-bookworm",				
                 "8-bullseye",
-                "8.2-bullseye",
                 "8.3-bullseye",
                 "8.4-bullseye"				
             ],
-            "default": "8.2-bullseye"
+            "default": "8.5-trixie"
         }
     },
     "platforms": ["PHP"],