From 23c6ca52364b549afda78a42f21cbf9a0e1405c2 Mon Sep 17 00:00:00 2001
From: Kay0u <pierre@kayou.io>
Date: Sun, 12 Apr 2020 23:43:39 +0200
Subject: [PATCH] Remove APPS_DEFAULT_PHP_VERSION from the core

---
 src/yunohost/app.py    | 9 ---------
 src/yunohost/backup.py | 4 ----
 2 files changed, 13 deletions(-)

diff --git a/src/yunohost/app.py b/src/yunohost/app.py
index 5a0403af2..39793ec1a 100644
--- a/src/yunohost/app.py
+++ b/src/yunohost/app.py
@@ -59,7 +59,6 @@ APPS_CATALOG_CONF = '/etc/yunohost/apps_catalog.yml'
 APPS_CATALOG_CRON_PATH = "/etc/cron.daily/yunohost-fetch-apps-catalog"
 APPS_CATALOG_API_VERSION = 2
 APPS_CATALOG_DEFAULT_URL = "https://app.yunohost.org/default"
-APPS_DEFAULT_PHP_VERSION = "7.0"
 
 re_github_repo = re.compile(
     r'^(http[s]?://|git@)github.com[/:]'
@@ -348,7 +347,6 @@ def app_change_url(operation_logger, app, domain, path):
     env_dict["YNH_APP_ID"] = app_id
     env_dict["YNH_APP_INSTANCE_NAME"] = app
     env_dict["YNH_APP_INSTANCE_NUMBER"] = str(app_instance_nb)
-    env_dict["YNH_DEFAULT_PHP_VERSION"] = APPS_DEFAULT_PHP_VERSION
 
     env_dict["YNH_APP_OLD_DOMAIN"] = old_domain
     env_dict["YNH_APP_OLD_PATH"] = old_path
@@ -485,7 +483,6 @@ def app_upgrade(app=[], url=None, file=None):
         env_dict["YNH_APP_ID"] = app_id
         env_dict["YNH_APP_INSTANCE_NAME"] = app_instance_name
         env_dict["YNH_APP_INSTANCE_NUMBER"] = str(app_instance_nb)
-        env_dict["YNH_DEFAULT_PHP_VERSION"] = APPS_DEFAULT_PHP_VERSION
 
         # Start register change on system
         related_to = [('app', app_instance_name)]
@@ -698,7 +695,6 @@ def app_install(operation_logger, app, label=None, args=None, no_remove_on_failu
     env_dict["YNH_APP_ID"] = app_id
     env_dict["YNH_APP_INSTANCE_NAME"] = app_instance_name
     env_dict["YNH_APP_INSTANCE_NUMBER"] = str(instance_number)
-    env_dict["YNH_DEFAULT_PHP_VERSION"] = APPS_DEFAULT_PHP_VERSION
 
     # Start register change on system
     operation_logger.extra.update({'env': env_dict})
@@ -807,7 +803,6 @@ def app_install(operation_logger, app, label=None, args=None, no_remove_on_failu
             env_dict_remove["YNH_APP_ID"] = app_id
             env_dict_remove["YNH_APP_INSTANCE_NAME"] = app_instance_name
             env_dict_remove["YNH_APP_INSTANCE_NUMBER"] = str(instance_number)
-            env_dict_remove["YNH_DEFAULT_PHP_VERSION"] = APPS_DEFAULT_PHP_VERSION
 
             # Execute remove script
             operation_logger_remove = OperationLogger('remove_on_failed_install',
@@ -985,7 +980,6 @@ def app_remove(operation_logger, app):
     env_dict["YNH_APP_ID"] = app_id
     env_dict["YNH_APP_INSTANCE_NAME"] = app
     env_dict["YNH_APP_INSTANCE_NUMBER"] = str(app_instance_nb)
-    env_dict["YNH_DEFAULT_PHP_VERSION"] = APPS_DEFAULT_PHP_VERSION
     operation_logger.extra.update({'env': env_dict})
     operation_logger.flush()
 
@@ -1410,7 +1404,6 @@ def app_action_run(operation_logger, app, action, args=None):
     env_dict["YNH_APP_ID"] = app_id
     env_dict["YNH_APP_INSTANCE_NAME"] = app
     env_dict["YNH_APP_INSTANCE_NUMBER"] = str(app_instance_nb)
-    env_dict["YNH_DEFAULT_PHP_VERSION"] = APPS_DEFAULT_PHP_VERSION
     env_dict["YNH_ACTION"] = action
 
     _, path = tempfile.mkstemp()
@@ -1474,7 +1467,6 @@ def app_config_show_panel(operation_logger, app):
         "YNH_APP_ID": app_id,
         "YNH_APP_INSTANCE_NAME": app,
         "YNH_APP_INSTANCE_NUMBER": str(app_instance_nb),
-        "YNH_DEFAULT_PHP_VERSION": APPS_DEFAULT_PHP_VERSION,
     }
 
     return_code, parsed_values = hook_exec(config_script,
@@ -1548,7 +1540,6 @@ def app_config_apply(operation_logger, app, args):
         "YNH_APP_ID": app_id,
         "YNH_APP_INSTANCE_NAME": app,
         "YNH_APP_INSTANCE_NUMBER": str(app_instance_nb),
-        "YNH_DEFAULT_PHP_VERSION": APPS_DEFAULT_PHP_VERSION,
     }
     args = dict(urlparse.parse_qsl(args, keep_blank_values=True)) if args else {}
 
diff --git a/src/yunohost/backup.py b/src/yunohost/backup.py
index 7ae6069e3..8408e7fa3 100644
--- a/src/yunohost/backup.py
+++ b/src/yunohost/backup.py
@@ -51,7 +51,6 @@ from yunohost.hook import (
 from yunohost.tools import tools_postinstall
 from yunohost.regenconf import regen_conf
 from yunohost.log import OperationLogger
-from yunohost.app import APPS_DEFAULT_PHP_VERSION
 from functools import reduce
 
 BACKUP_PATH = '/home/yunohost.backup'
@@ -562,7 +561,6 @@ class BackupManager():
             env_var["YNH_APP_ID"] = app_id
             env_var["YNH_APP_INSTANCE_NAME"] = app
             env_var["YNH_APP_INSTANCE_NUMBER"] = str(app_instance_nb)
-            env_var["YNH_DEFAULT_PHP_VERSION"] = APPS_DEFAULT_PHP_VERSION
             tmp_app_dir = os.path.join('apps/', app)
             tmp_app_bkp_dir = os.path.join(self.work_dir, tmp_app_dir, 'backup')
             env_var["YNH_APP_BACKUP_DIR"] = tmp_app_bkp_dir
@@ -1413,7 +1411,6 @@ class RestoreManager():
             env_dict_remove["YNH_APP_ID"] = app_id
             env_dict_remove["YNH_APP_INSTANCE_NAME"] = app_instance_name
             env_dict_remove["YNH_APP_INSTANCE_NUMBER"] = str(app_instance_nb)
-            env_dict_remove["YNH_DEFAULT_PHP_VERSION"] = APPS_DEFAULT_PHP_VERSION
 
             operation_logger = OperationLogger('remove_on_failed_restore',
                                                [('app', app_instance_name)],
@@ -1461,7 +1458,6 @@ class RestoreManager():
             env_var["YNH_APP_ID"] = app_id
             env_var["YNH_APP_INSTANCE_NAME"] = app
             env_var["YNH_APP_INSTANCE_NUMBER"] = str(app_instance_nb)
-            env_var["YNH_DEFAULT_PHP_VERSION"] = APPS_DEFAULT_PHP_VERSION
             env_var["YNH_APP_BACKUP_DIR"] = app_backup_in_archive
 
         return env_var