From 1484d8a7739f7b03178487cab550108c1eb6db69 Mon Sep 17 00:00:00 2001
From: ericgaspar <junk.eg@free.fr>
Date: Sat, 21 May 2022 08:59:22 +0200
Subject: [PATCH] php8

---
 manifest.json      |  2 +-
 scripts/_common.sh |  3 ++-
 scripts/restore    | 14 +++++++-------
 3 files changed, 10 insertions(+), 9 deletions(-)

diff --git a/manifest.json b/manifest.json
index 8ff4c3c..082ebe0 100755
--- a/manifest.json
+++ b/manifest.json
@@ -26,7 +26,7 @@
     "multi_instance": true,
     "services": [
         "nginx",
-        "php7.4-fpm",
+        "php8.0-fpm",
         "mysql"
     ],
     "arguments": {
diff --git a/scripts/_common.sh b/scripts/_common.sh
index f727bb8..5d4be2c 100755
--- a/scripts/_common.sh
+++ b/scripts/_common.sh
@@ -4,9 +4,10 @@
 # COMMON VARIABLES
 #=================================================
 
-YNH_PHP_VERSION="7.4"
+YNH_PHP_VERSION="8.0"
 
 pkg_dependencies="php${YNH_PHP_VERSION}-imap php${YNH_PHP_VERSION}-gmp php${YNH_PHP_VERSION}-curl php${YNH_PHP_VERSION}-intl php${YNH_PHP_VERSION}-mbstring php${YNH_PHP_VERSION}-xmlrpc php${YNH_PHP_VERSION}-mysql php${YNH_PHP_VERSION}-bcmath php${YNH_PHP_VERSION}-gd php${YNH_PHP_VERSION}-xml php${YNH_PHP_VERSION}-cli php${YNH_PHP_VERSION}-zip"
+
 #=================================================
 # PERSONAL HELPERS
 #=================================================
diff --git a/scripts/restore b/scripts/restore
index 13b144f..284da64 100755
--- a/scripts/restore
+++ b/scripts/restore
@@ -74,13 +74,6 @@ chmod -R g+w $final_path/media/files/
 chmod -R g+w $final_path/media/images/
 chmod -R g+w $final_path/translations/
 
-#=================================================
-# RESTORE THE PHP-FPM CONFIGURATION
-#=================================================
-ynh_script_progression --message="Restoring the PHP-FPM configuration..." --weight=1
-
-ynh_restore_file --origin_path="/etc/php/$phpversion/fpm/pool.d/$app.conf"
-
 #=================================================
 # REINSTALL DEPENDENCIES
 #=================================================
@@ -89,6 +82,13 @@ ynh_script_progression --message="Reinstalling dependencies..." --weight=1
 # Define and install dependencies
 ynh_install_app_dependencies $pkg_dependencies
 
+#=================================================
+# RESTORE THE PHP-FPM CONFIGURATION
+#=================================================
+ynh_script_progression --message="Restoring the PHP-FPM configuration..." --weight=1
+
+ynh_restore_file --origin_path="/etc/php/$phpversion/fpm/pool.d/$app.conf"
+
 #=================================================
 # RESTORE THE MYSQL DATABASE
 #=================================================