Upgrade to 5.1.0 (#107)

* Upgrade to 5.1.0

* Fix doc links

README.md

@@ -12,7 +12,7 @@ If you don't have YunoHost, please see [here](https://yunohost.org/#/install) to
 
 phpMyAdmin is a free software tool written in PHP, intended to handle the administration of MySQL over the Web. phpMyAdmin supports a wide range of operations on MySQL and MariaDB. Frequently used operations (managing databases, tables, columns, relations, indexes, users, permissions, etc) can be performed via the user interface, while you still have the ability to directly execute any SQL statement.
 
-**Shipped version:** 5.0.4
+**Shipped version:** 5.1.0
 
 ## Screenshots
 
@@ -28,7 +28,7 @@ phpMyAdmin is a free software tool written in PHP, intended to handle the admini
 ## Documentation
 
  * Official documentation: https://www.phpmyadmin.net/docs/
- * YunoHost documentation: https://yunohost.org/#/app_phpmyadmin
+ * YunoHost documentation: https://yunohost.org/en/app_phpmyadmin
 
 ## YunoHost specific features
 

README_fr.md

@@ -1,7 +1,7 @@
 # phpMyAdmin avec YunoHost
 
 [![Niveau d'intégration](https://dash.yunohost.org/integration/phpmyadmin.svg)](https://dash.yunohost.org/appci/app/phpmyadmin) ![](https://ci-apps.yunohost.org/ci/badges/phpmyadmin.status.svg) ![](https://ci-apps.yunohost.org/ci/badges/phpmyadmin.maintain.svg)  
-[![Installer phpMyAdmin avec YunoHost](https://install-app.yunohost.org/install-with-yunohost.png)](https://install-app.yunohost.org/?app=phpmyadmin)
+[![Installer phpMyAdmin avec YunoHost](https://install-app.yunohost.org/install-with-yunohost.svg)](https://install-app.yunohost.org/?app=phpmyadmin)
 
 *[Read this readme in english.](./README.md)* 
 
@@ -12,7 +12,7 @@ Si vous n'avez pas YunoHost, consultez [le guide](https://yunohost.org/#/install
 
 phpMyAdmin est un outil logiciel libre écrit en PHP, destiné à gérer l'administration de MySQL sur le Web. phpMyAdmin prend en charge un large éventail d'opérations sur MySQL et MariaDB. Les opérations fréquemment utilisées (gestion des bases de données, des tables, des colonnes, des relations, des index, des utilisateurs, des autorisations, etc.) peuvent être effectuées via l'interface utilisateur, tandis que vous avez toujours la possibilité d'exécuter directement les instructions SQL.
 
-**Version incluse :** 5.0.4
+**Version incluse :** 5.1.0
 
 ## Captures d'écran
 
@@ -28,7 +28,7 @@ phpMyAdmin est un outil logiciel libre écrit en PHP, destiné à gérer l'admin
 ## Documentation
 
  * Documentation officielle : https://www.phpmyadmin.net/docs/
- * Documentation YunoHost : https://yunohost.org/#/app_phpmyadmin_fr
+ * Documentation YunoHost : https://yunohost.org/fr/app_phpmyadmin
 
 ## Caractéristiques spécifiques YunoHost
 

conf/app.src

@@ -1,5 +1,5 @@
-SOURCE_URL=https://files.phpmyadmin.net/phpMyAdmin/5.0.4/phpMyAdmin-5.0.4-all-languages.tar.gz
+SOURCE_URL=https://files.phpmyadmin.net/phpMyAdmin/5.1.0/phpMyAdmin-5.1.0-all-languages.tar.gz
-SOURCE_SUM=fbb993b74a7c29ce2fcdb6b6be22b0b6c58bff8df3292ab42f6280871450c316
+SOURCE_SUM=fec6996440009b29af82e031ea2c085766752732771289975af7573652ed4798
 SOURCE_SUM_PRG=sha256sum
 SOURCE_FORMAT=tar.gz
 SOURCE_IN_SUBDIR=true

manifest.json

@@ -6,7 +6,7 @@
         "en": "Manage MySQL databases over the web",
         "fr": "Application web de gestion des bases de données MySQL"
     },
-    "version": "5.0.4~ynh1",
+    "version": "5.1.0~ynh1",
     "url": "http://www.phpmyadmin.net",
     "license": "GPL-2.0-only",
     "maintainer": {
@@ -19,7 +19,7 @@
     "multi_instance": false,
     "services": [
         "nginx",
-        "php7.0-fpm",
+        "php7.3-fpm",
         "mysql"
     ],
     "arguments": {

pull_request_template.md

@@ -11,14 +11,6 @@
 - [ ] Upgrade from last version tested.
 - [ ] Can be reviewed and tested.
 
-## Validation
+## Package_check results
 ---
-*Minor decision*
+* An automatic package_check will be launch at https://ci-apps-dev.yunohost.org/, when you add a specific comment to your Pull Request: "!testme", "!gogogadgetoci" or "By the power of systemd, I invoke The Great App CI to test this Pull Request!"*
-- **Upgrade previous version** : 
-- [ ] **Code review** : 
-- [ ] **Approval (LGTM)** : 
-- [ ] **Approval (LGTM)** : 
-- **CI succeeded** : 
-[![Build Status](https://ci-apps-hq.yunohost.org/jenkins/job/phpmyadmin_ynh%20PR-NUM-/badge/icon)](https://ci-apps-hq.yunohost.org/jenkins/job/phpmyadmin_ynh%20PR-NUM-/)  
-*Please replace '-NUM-' in this link by the PR number.*  
-When the PR is marked as ready to merge, you have to wait for 3 days before really merging it.

scripts/install

@@ -162,10 +162,10 @@ chown $app: $final_path/tmp
 #=================================================
 # SETUP SSOWAT
 #=================================================
-ynh_script_progression --message="Configuring SSOwat..." --weight=3
+ynh_script_progression --message="Configuring permissions..." --weight=3
 
 # Restrict access to admin only
-yunohost app addaccess --users=$admin $app
+ynh_permission_create --permission="admin" --allowed=$admin
 
 #=================================================
 # RELOAD NGINX

scripts/upgrade

@@ -71,6 +71,11 @@ if [ -z "$db_admin_user" ]; then
 	fi
 fi
 
+if ! ynh_permission_exists --permission="admin"; then
+	# Create the required permissions
+	ynh_permission_create --permission="admin" --allowed=$admin
+fi
+
 #=================================================
 # BACKUP BEFORE UPGRADE THEN ACTIVE TRAP
 #=================================================
@@ -199,14 +204,6 @@ then
 	ynh_exec_warn_less ynh_composer_exec --commands=\"update --no-dev\"
 fi
 
-#=================================================
-# SETUP SSOWAT
-#=================================================
-ynh_script_progression --message="Upgrading SSOwat configuration..."
-
-# Restrict access to admin only
-yunohost app addaccess --users=$admin $app
-
 #=================================================
 # RELOAD NGINX
 #=================================================