From 238323ab95c8a789643e0dc457a5f5e4eabfade1 Mon Sep 17 00:00:00 2001
From: Alexandre Aubin <alex.aubin@mailoo.org>
Date: Sun, 14 Nov 2021 09:56:29 +0100
Subject: [PATCH] Testing (#116)

* Fix ynh_composer_exec syntax

* Bump yunohost requirement to 4.3

* Bump package version

* Auto-update README

* Fix linter warnings

* Auto-update README

Co-authored-by: Yunohost-Bot <>
Co-authored-by: ericgaspar <junk.eg@free.fr>
---
 README.md       |  3 +--
 README_fr.md    |  3 +--
 manifest.json   | 11 ++++-------
 scripts/restore |  2 --
 scripts/upgrade |  4 ++--
 5 files changed, 8 insertions(+), 15 deletions(-)

diff --git a/README.md b/README.md
index 79f86b1..2e88dce 100644
--- a/README.md
+++ b/README.md
@@ -17,7 +17,7 @@ If you don't have YunoHost, please consult [the guide](https://yunohost.org/#/in
 
 Manage MySQL databases over the web
 
-**Shipped version:** 5.1.1~ynh1
+**Shipped version:** 5.1.1~ynh2
 
 **Demo:** https://demo.phpmyadmin.net/master-config
 
@@ -33,7 +33,6 @@ phpMyAdmin is a free software tool written in PHP, intended to handle the admini
 ## Documentation and resources
 
 * Official app website: http://www.phpmyadmin.net
-* Official user documentation: https://yunohost.org/en/app_phpmyadmin
 * Official admin documentation: https://www.phpmyadmin.net/docs/
 * Upstream app code repository: https://github.com/phpmyadmin/phpmyadmin
 * YunoHost documentation for this app: https://yunohost.org/app_phpmyadmin
diff --git a/README_fr.md b/README_fr.md
index 56e9cda..e62f40a 100644
--- a/README_fr.md
+++ b/README_fr.md
@@ -13,7 +13,7 @@ Si vous n'avez pas YunoHost, regardez [ici](https://yunohost.org/#/install) pour
 
 Application web de gestion des bases de données MySQL
 
-**Version incluse :** 5.1.1~ynh1
+**Version incluse :** 5.1.1~ynh2
 
 **Démo :** https://demo.phpmyadmin.net/master-config
 
@@ -29,7 +29,6 @@ phpMyAdmin est un outil logiciel libre écrit en PHP, destiné à gérer l'admin
 ## Documentations et ressources
 
 * Site officiel de l'app : http://www.phpmyadmin.net
-* Documentation officielle utilisateur : https://yunohost.org/en/app_phpmyadmin
 * Documentation officielle de l'admin : https://www.phpmyadmin.net/docs/
 * Dépôt de code officiel de l'app : https://github.com/phpmyadmin/phpmyadmin
 * Documentation YunoHost pour cette app : https://yunohost.org/app_phpmyadmin
diff --git a/manifest.json b/manifest.json
index 2795400..2fcb724 100644
--- a/manifest.json
+++ b/manifest.json
@@ -6,14 +6,13 @@
         "en": "Manage MySQL databases over the web",
         "fr": "Application web de gestion des bases de données MySQL"
     },
-    "version": "5.1.1~ynh1",
+    "version": "5.1.1~ynh2",
     "url": "http://www.phpmyadmin.net",
     "upstream": {
         "license": "GPL-2.0-only",
         "website": "http://www.phpmyadmin.net",
         "demo": "https://demo.phpmyadmin.net/master-config",
         "admindoc": "https://www.phpmyadmin.net/docs/",
-        "userdoc": "https://yunohost.org/en/app_phpmyadmin",
         "code": "https://github.com/phpmyadmin/phpmyadmin"
     },
     "license": "GPL-2.0-only",
@@ -22,7 +21,7 @@
         "email": "julien.malik@paraiso.me"
     },
     "requirements": {
-        "yunohost": ">= 4.2.0"
+        "yunohost": ">= 4.3.0"
     },
     "multi_instance": false,
     "services": [
@@ -34,8 +33,7 @@
         "install" : [
             {
                 "name": "domain",
-                "type": "domain",
-                "example": "domain.org"
+                "type": "domain"
             },
             {
                 "name": "path",
@@ -45,8 +43,7 @@
             },
             {
                 "name": "admin",
-                "type": "user",
-                "example": "johndoe"
+                "type": "user"
             }
         ]
     }
diff --git a/scripts/restore b/scripts/restore
index 4a7311d..3505835 100644
--- a/scripts/restore
+++ b/scripts/restore
@@ -34,8 +34,6 @@ db_name=$(ynh_app_setting_get --app=$app --key=db_name)
 #=================================================
 ynh_script_progression --message="Validating restoration parameters..." --weight=2
 
-ynh_webpath_available --domain=$domain --path_url=$path_url \
-	|| ynh_die --message="Path not available: ${domain}${path_url}"
 test ! -d $final_path \
 	|| ynh_die --message="There is already a directory: $final_path "
 
diff --git a/scripts/upgrade b/scripts/upgrade
index 38435b5..97bef41 100644
--- a/scripts/upgrade
+++ b/scripts/upgrade
@@ -181,9 +181,9 @@ then
 	ynh_script_progression --message="Upgrading dependencies with Composer..." --weight=19
 
 	# Force dependency to the used PHP version
-	ynh_exec_warn_less ynh_composer_exec --commands=\"config -g platform.php $YNH_PHP_VERSION\"
+	ynh_exec_warn_less ynh_composer_exec --commands="config -g platform.php $YNH_PHP_VERSION"
 	# Install dependencies
-	ynh_exec_warn_less ynh_composer_exec --commands=\"update --no-dev\"
+	ynh_exec_warn_less ynh_composer_exec --commands="update --no-dev"
 fi
 
 #=================================================