From 41eef9b94f6b704e6227ade12fb097f4f36d8767 Mon Sep 17 00:00:00 2001
From: Florent <florent.git@zeteo.me>
Date: Sat, 7 Oct 2023 21:21:55 +0200
Subject: [PATCH 1/2] Allow specifying PHP version #223

---
 manifest.toml | 13 ++++++++++++-
 1 file changed, 12 insertions(+), 1 deletion(-)

diff --git a/manifest.toml b/manifest.toml
index 91c564f..9d46733 100644
--- a/manifest.toml
+++ b/manifest.toml
@@ -40,6 +40,13 @@ ram.runtime = "50M"
     type = "group"
     default = "visitors"
 
+    [install.phpversion]
+    ask.en = "Choose a PHP version you want to use for your app"
+    ask.fr = "Choisissez une version PHP que vous souhaitez utiliser pour votre application"
+    type = "select"
+    choices = ["8.0", "8.1", "8.2"]
+    default = "8.2"
+
     [install.language]
     ask.en = "Choose the application language"
     ask.fr = "Choisissez la langue de l'application"
@@ -73,7 +80,11 @@ ram.runtime = "50M"
     admin.show_tile = false
 
     [resources.apt]
-    packages = "mariadb-server, php8.2-mysql, php8.2-curl, php8.2-mbstring, php8.2-xml, php8.2-zip, php8.2-gd, php8.2-soap, php8.2-ssh2, php8.2-tokenizer, php8.2-ldap"
+    packages = "mariadb-server"
+    packages_from_raw_bash = """
+      echo "php${phpversion}-mysql php${phpversion}-curl php${phpversion}-mbstring php${phpversion}-xml php${phpversion}-zip php${phpversion}-gd php${phpversion}-soap"
+      echo "php${phpversion}-ssh2 php${phpversion}-tokenizer php${phpversion}-ldap"
+    """
 
     [resources.database]
     type = "mysql"

From adbd57cbaf58b2d324edc89f108313df7ce214a5 Mon Sep 17 00:00:00 2001
From: Florent <florent.git@zeteo.me>
Date: Wed, 11 Oct 2023 23:10:48 +0200
Subject: [PATCH 2/2] Additional tests for PHP versions

---
 tests.toml | 14 ++++++++++++++
 1 file changed, 14 insertions(+)

diff --git a/tests.toml b/tests.toml
index 9fc5a83..490b2d9 100644
--- a/tests.toml
+++ b/tests.toml
@@ -29,3 +29,17 @@ test_format = 1.0
 
     args.language = "en_US"
     args.multisite = 1
+
+[with_php8.0]
+
+    only = ["install.subdir"]
+
+    args.language = "en_US"
+    args.phpversion = "8.0"
+
+[with_php8.1]
+
+    only = ["install.subdir"]
+
+    args.language = "en_US"
+    args.phpversion = "8.1"