From 7754167bdf543e75d88153360bab0bfa34fb7fe5 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C3=89ric=20Gaspar?=
 <46165813+ericgaspar@users.noreply.github.com>
Date: Thu, 19 Jan 2023 12:16:08 +0100
Subject: [PATCH] Fix linter

---
 conf/{php-fpm.conf => extra_php-fpm.conf} | 0
 conf/nginx.conf                           | 2 +-
 manifest.json                             | 4 ++--
 scripts/_common.sh                        | 9 +++++----
 scripts/install                           | 2 +-
 scripts/restore                           | 2 +-
 scripts/upgrade                           | 2 +-
 7 files changed, 11 insertions(+), 10 deletions(-)
 rename conf/{php-fpm.conf => extra_php-fpm.conf} (100%)

diff --git a/conf/php-fpm.conf b/conf/extra_php-fpm.conf
similarity index 100%
rename from conf/php-fpm.conf
rename to conf/extra_php-fpm.conf
diff --git a/conf/nginx.conf b/conf/nginx.conf
index 764a13a..518aacb 100644
--- a/conf/nginx.conf
+++ b/conf/nginx.conf
@@ -2,7 +2,7 @@
 location /Microsoft-Server-ActiveSync/ {
 
   # Path to source
-  alias __FINALPATH__/ ;
+  alias __FINALPATH__/;
 
   index index.php;
 
diff --git a/manifest.json b/manifest.json
index d241bbb..2d0c8d3 100644
--- a/manifest.json
+++ b/manifest.json
@@ -27,12 +27,12 @@
         }
     ],
     "requirements": {
-        "yunohost": ">= 4.3.0"
+        "yunohost": ">= 11.0.9"
     },
     "multi_instance": true,
     "services": [
         "nginx",
-        "php7.3-fpm"
+        "php7.4-fpm"
     ],
     "arguments": {
         "install": [
diff --git a/scripts/_common.sh b/scripts/_common.sh
index 93609c9..1c72e28 100644
--- a/scripts/_common.sh
+++ b/scripts/_common.sh
@@ -4,12 +4,13 @@
 # COMMON VARIABLES
 #=================================================
 
-# dependencies used by the app
-pkg_dependencies="libawl-php"
+YNH_PHP_VERSION="7.4"
 
-YNH_PHP_VERSION="7.3"
+php_dependencies="php${YNH_PHP_VERSION}-soap php${YNH_PHP_VERSION}-imap php${YNH_PHP_VERSION}-xsl php${YNH_PHP_VERSION}-curl php${YNH_PHP_VERSION}-xml php${YNH_PHP_VERSION}-ldap php${YNH_PHP_VERSION}-cli php${YNH_PHP_VERSION}-mbstring php${YNH_PHP_VERSION}-memcached"
+
+# dependencies used by the app (must be on a single line)
+pkg_dependencies="libawl-php $php_dependencies"
 
-extra_php_dependencies="php${YNH_PHP_VERSION}-soap php${YNH_PHP_VERSION}-imap php${YNH_PHP_VERSION}-xsl php${YNH_PHP_VERSION}-curl php${YNH_PHP_VERSION}-xml php${YNH_PHP_VERSION}-ldap php${YNH_PHP_VERSION}-cli php${YNH_PHP_VERSION}-mbstring php${YNH_PHP_VERSION}-memcached"
 
 #=================================================
 # PERSONAL HELPERS
diff --git a/scripts/install b/scripts/install
index 7447786..5f095d0 100755
--- a/scripts/install
+++ b/scripts/install
@@ -94,7 +94,7 @@ ynh_add_nginx_config
 ynh_script_progression --message="Configuring PHP-FPM..."
 
 # Create a dedicated PHP-FPM config
-ynh_add_fpm_config --usage=low --footprint=low --package="$extra_php_dependencies"
+ynh_add_fpm_config --usage=low --footprint=low
 phpversion=$(ynh_app_setting_get --app=$app --key=phpversion)
 
 #=================================================
diff --git a/scripts/restore b/scripts/restore
index e7f0c49..6e4c4ce 100755
--- a/scripts/restore
+++ b/scripts/restore
@@ -91,7 +91,7 @@ ynh_script_progression --message="Restoring the PHP-FPM configuration..."
 ynh_restore_file --origin_path="/etc/php/$phpversion/fpm/pool.d/$app.conf"
 
 # Recreate a dedicated php-fpm config
-ynh_add_fpm_config --usage=low --footprint=low --package="$extra_php_dependencies"
+ynh_add_fpm_config --usage=low --footprint=low
 phpversion=$(ynh_app_setting_get --app=$app --key=phpversion)
 
 #=================================================
diff --git a/scripts/upgrade b/scripts/upgrade
index 42ff8da..7acaf25 100755
--- a/scripts/upgrade
+++ b/scripts/upgrade
@@ -120,7 +120,7 @@ ynh_install_app_dependencies $pkg_dependencies
 ynh_script_progression --message="Upgrading PHP-FPM configuration..."
 
 # Create a dedicated PHP-FPM config
-ynh_add_fpm_config --usage=low --footprint=low --package="$extra_php_dependencies"
+ynh_add_fpm_config --usage=low --footprint=low
 phpversion=$(ynh_app_setting_get --app=$app --key=phpversion)
 
 #=================================================