Merge pull request #8 from YunoHost-Apps/testing

Testing
2024-09-03 20:16:11 +02:00 · 2022-09-09 20:17:14 +02:00 · 2022-09-09 20:17:14 +02:00 · 985cfccb68
commit 985cfccb68
parent f9b75a3199 24264a92a5
13 changed files with 84 additions and 61 deletions
--- a/README.md
+++ b/README.md
@ -5,7 +5,7 @@ It shall NOT be edited by hand.

 # Quizzes for YunoHost

-[![Integration level](https://dash.yunohost.org/integration/quizzes.svg)](https://dash.yunohost.org/appci/app/quizzes) ![](https://ci-apps.yunohost.org/ci/badges/quizzes.status.svg) ![](https://ci-apps.yunohost.org/ci/badges/quizzes.maintain.svg)  
+[![Integration level](https://dash.yunohost.org/integration/quizzes.svg)](https://dash.yunohost.org/appci/app/quizzes) ![Working status](https://ci-apps.yunohost.org/ci/badges/quizzes.status.svg) ![Maintenance status](https://ci-apps.yunohost.org/ci/badges/quizzes.maintain.svg)  
 [![Install Quizzes with YunoHost](https://install-app.yunohost.org/install-with-yunohost.svg)](https://install-app.yunohost.org/?app=quizzes)

 *[Lire ce readme en français.](./README_fr.md)*
@ -20,11 +20,9 @@ Multiple choice quiz platform with results analysis interface
 **Shipped version:** 1.3.0~ynh1


-
 ## Screenshots

-![](./doc/screenshots/.DS_Store)
-![](./doc/screenshots/score_par_theme.png)
+![Screenshot of Quizzes](./doc/screenshots/score_par_theme.png)

 ## Disclaimers / important information

@ -36,20 +34,21 @@ test
 ```
 ## Documentation and resources

-* Official app website: https://github.com/hipay/quizzes/
-* Upstream app code repository: https://github.com/hipay/quizzes/
-* YunoHost documentation for this app: https://yunohost.org/app_quizzes
-* Report a bug: https://github.com/YunoHost-Apps/quizzes_ynh/issues
+* Official app website: <https://github.com/hipay/quizzes/>
+* Upstream app code repository: <https://github.com/hipay/quizzes/>
+* YunoHost documentation for this app: <https://yunohost.org/app_quizzes>
+* Report a bug: <https://github.com/YunoHost-Apps/quizzes_ynh/issues>

 ## Developer info

 Please send your pull request to the [testing branch](https://github.com/YunoHost-Apps/quizzes_ynh/tree/testing).

 To try the testing branch, please proceed like that.
-```
+
+``` bash
 sudo yunohost app install https://github.com/YunoHost-Apps/quizzes_ynh/tree/testing --debug
 or
 sudo yunohost app upgrade quizzes -u https://github.com/YunoHost-Apps/quizzes_ynh/tree/testing --debug
 ```

-**More info regarding app packaging:** https://yunohost.org/packaging_apps
+**More info regarding app packaging:** <https://yunohost.org/packaging_apps>
--- a/README_fr.md
+++ b/README_fr.md
@ -1,10 +1,14 @@
+<!--
+N.B.: This README was automatically generated by https://github.com/YunoHost/apps/tree/master/tools/README-generator
+It shall NOT be edited by hand.
+-->
+
 # Quizzes pour YunoHost

-[![Niveau d'intégration](https://dash.yunohost.org/integration/quizzes.svg)](https://dash.yunohost.org/appci/app/quizzes) ![](https://ci-apps.yunohost.org/ci/badges/quizzes.status.svg) ![](https://ci-apps.yunohost.org/ci/badges/quizzes.maintain.svg)  
+[![Niveau d'intégration](https://dash.yunohost.org/integration/quizzes.svg)](https://dash.yunohost.org/appci/app/quizzes) ![Statut du fonctionnement](https://ci-apps.yunohost.org/ci/badges/quizzes.status.svg) ![Statut de maintenance](https://ci-apps.yunohost.org/ci/badges/quizzes.maintain.svg)  
 [![Installer Quizzes avec YunoHost](https://install-app.yunohost.org/install-with-yunohost.svg)](https://install-app.yunohost.org/?app=quizzes)

 *[Read this readme in english.](./README.md)*
-*[Lire ce readme en français.](./README_fr.md)*

 > *Ce package vous permet d'installer Quizzes rapidement et simplement sur un serveur YunoHost.
 Si vous n'avez pas YunoHost, regardez [ici](https://yunohost.org/#/install) pour savoir comment l'installer et en profiter.*
@ -13,14 +17,12 @@ Si vous n'avez pas YunoHost, regardez [ici](https://yunohost.org/#/install) pour

 Plate-forme de quizzes à choix multiples (QCM) avec interface d'analyse des résultats

-**Version incluse :** 1.3.0~ynh1
-
+**Version incluse :** 1.3.0~ynh1


 ## Captures d'écran

-![](./doc/screenshots/.DS_Store)
-![](./doc/screenshots/score_par_theme.png)
+![Capture d'écran de Quizzes](./doc/screenshots/score_par_theme.png)

 ## Avertissements / informations importantes

@ -32,20 +34,21 @@ test
 ```
 ## Documentations et ressources

-* Site officiel de l'app : https://github.com/hipay/quizzes/
-* Dépôt de code officiel de l'app : https://github.com/hipay/quizzes/
-* Documentation YunoHost pour cette app : https://yunohost.org/app_quizzes
-* Signaler un bug : https://github.com/YunoHost-Apps/quizzes_ynh/issues
+* Site officiel de l'app : <https://github.com/hipay/quizzes/>
+* Dépôt de code officiel de l'app : <https://github.com/hipay/quizzes/>
+* Documentation YunoHost pour cette app : <https://yunohost.org/app_quizzes>
+* Signaler un bug : <https://github.com/YunoHost-Apps/quizzes_ynh/issues>

 ## Informations pour les développeurs

 Merci de faire vos pull request sur la [branche testing](https://github.com/YunoHost-Apps/quizzes_ynh/tree/testing).

 Pour essayer la branche testing, procédez comme suit.
-```
+
+``` bash
 sudo yunohost app install https://github.com/YunoHost-Apps/quizzes_ynh/tree/testing --debug
 ou
 sudo yunohost app upgrade quizzes -u https://github.com/YunoHost-Apps/quizzes_ynh/tree/testing --debug
 ```

-**Plus d'infos sur le packaging d'applications :** https://yunohost.org/packaging_apps
+**Plus d'infos sur le packaging d'applications :** <https://yunohost.org/packaging_apps>
--- a/3
+++ b/3
@ -1,10 +1,7 @@
 ;; Test complet
 	; Manifest
 		domain="domain.tld"
-		path="/path"
-		admin="john"
 		is_public=1
-		password="1Strong-Password"
 	; Checks
 		pkg_linter=1
 		setup_sub_dir=0
--- a/conf/nginx.conf
+++ b/conf/nginx.conf
@ -1,4 +1,4 @@
-location / {
+location __PATH__/ {

  # Path to source
  alias __FINALPATH__/web/;
--- a/doc/.DS_Store
+++ b/doc/.DS_Store
--- a/doc/screenshots/.DS_Store
+++ b/doc/screenshots/.DS_Store
--- a/scripts/install
+++ b/scripts/install
@ -76,14 +76,6 @@ chmod 750 "$final_path"
 chmod -R o-rwx "$final_path"
 chown -R $app:www-data "$final_path"

-#=================================================
-# NGINX CONFIGURATION
-#=================================================
-ynh_script_progression --message="Configuring NGINX web server..." --weight=1
-
-# Create a dedicated NGINX config
-ynh_add_nginx_config
-
 #=================================================
 # PHP-FPM CONFIGURATION
 #=================================================
@ -92,6 +84,14 @@ ynh_script_progression --message="Configuring PHP-FPM..." --weight=2
 # Create a dedicated PHP-FPM config
 ynh_add_fpm_config

+#=================================================
+# NGINX CONFIGURATION
+#=================================================
+ynh_script_progression --message="Configuring NGINX web server..." --weight=1
+
+# Create a dedicated NGINX config
+ynh_add_nginx_config
+
 #=================================================
 # SPECIFIC SETUP
 #=================================================
@ -101,6 +101,10 @@ ynh_script_progression --message="Installing $app with Composer..." --weight=5

 ynh_install_composer --install_args="--ignore-platform-reqs" 2>&1

+pushd $final_path
+	patch --strip=1 < $YNH_APP_BASEDIR/sources/app-array_key_exists.patch
+popd 
+
 #=================================================
 # ADD A CONFIGURATION
 #=================================================
@ -140,6 +144,8 @@ ynh_script_progression --message="Configuring permissions..." --weight=1
 # Make app public if necessary
 if [ $is_public -eq 1 ]
 then
+	# Everyone can access the app.
+	# The "main" permission is automatically created before the install script.
 	ynh_permission_update --permission="main" --add="visitors"
 fi

--- a/scripts/remove
+++ b/scripts/remove
@ -64,7 +64,7 @@ ynh_remove_app_dependencies
 #=================================================
 # REMOVE VARIOUS FILES
 #=================================================
-ynh_script_progression --message="Removing various files..."
+ynh_script_progression --message="Removing various files..." --weight=1

 # Remove the log files
 ynh_secure_remove --file="/var/log/$app"
--- a/scripts/restore
+++ b/scripts/restore
@ -42,13 +42,6 @@ test ! -d $final_path \

 #=================================================
 # STANDARD RESTORATION STEPS
-#=================================================
-# RESTORE THE NGINX CONFIGURATION
-#=================================================
-ynh_script_progression --message="Restoring the NGINX configuration..." --weight=1
-
-ynh_restore_file --origin_path="/etc/nginx/conf.d/$domain.d/$app.conf"
-
 #=================================================
 # RECREATE THE DEDICATED USER
 #=================================================
@ -68,6 +61,14 @@ chmod 750 "$final_path"
 chmod -R o-rwx "$final_path"
 chown -R $app:www-data "$final_path"

+#=================================================
+# REINSTALL DEPENDENCIES
+#=================================================
+ynh_script_progression --message="Reinstalling dependencies..." --weight=1
+
+# Define and install dependencies
+ynh_install_app_dependencies $pkg_dependencies
+
 #=================================================
 # RESTORE THE PHP-FPM CONFIGURATION
 #=================================================
@ -76,12 +77,11 @@ ynh_script_progression --message="Restoring the PHP-FPM configuration..." --weig
 ynh_restore_file --origin_path="/etc/php/$phpversion/fpm/pool.d/$app.conf"

 #=================================================
-# REINSTALL DEPENDENCIES
+# RESTORE THE NGINX CONFIGURATION
 #=================================================
-ynh_script_progression --message="Reinstalling dependencies..." --weight=1
+ynh_script_progression --message="Restoring the NGINX web server configuration..." --weight=1

-# Define and install dependencies
-ynh_install_app_dependencies $pkg_dependencies
+ynh_restore_file --origin_path="/etc/nginx/conf.d/$domain.d/$app.conf"

 #=================================================
 # RESTORE THE LOGROTATE CONFIGURATION
--- a/scripts/upgrade
+++ b/scripts/upgrade
@ -23,7 +23,7 @@ final_path=$(ynh_app_setting_get --app=$app --key=final_path)
 #=================================================
 # CHECK VERSION
 #=================================================
-ynh_script_progression --message="Checking version..."
+ynh_script_progression --message="Checking version..." --weight=1

 upgrade_type=$(ynh_check_app_version_changed)

@ -62,20 +62,10 @@ then
 	ynh_setup_source --dest_dir="$final_path"
 fi

-ynh_install_composer --install_args="--ignore-platform-reqs" 2>&1
-
 chmod 750 "$final_path"
 chmod -R o-rwx "$final_path"
 chown -R $app:www-data "$final_path"

-#=================================================
-# NGINX CONFIGURATION
-#=================================================
-ynh_script_progression --message="Upgrading NGINX web server configuration..." --weight=1
-
-# Create a dedicated NGINX config
-ynh_add_nginx_config
-
 #=================================================
 # UPGRADE DEPENDENCIES
 #=================================================
@ -91,6 +81,27 @@ ynh_script_progression --message="Upgrading PHP-FPM configuration..." --weight=2
 # Create a dedicated PHP-FPM config
 ynh_add_fpm_config

+#=================================================
+# NGINX CONFIGURATION
+#=================================================
+ynh_script_progression --message="Upgrading NGINX web server configuration..." --weight=1
+
+# Create a dedicated NGINX config
+ynh_add_nginx_config
+
+#=================================================
+# SPECIFIC UPGRADE
+#=================================================
+# INSTALL LYCHEE WITH COMPOSER
+#=================================================
+ynh_script_progression --message="Installing $app with Composer..." --weight=5
+
+ynh_install_composer --install_args="--ignore-platform-reqs" 2>&1
+
+pushd $final_path
+	patch --strip=1 < $YNH_APP_BASEDIR/sources/app-array_key_exists.patch
+popd 
+
 #=================================================
 # UPDATE A CONFIG FILE
 #=================================================
--- a/sources/app-array_key_exists.patch
+++ b/sources/app-array_key_exists.patch
@ -0,0 +1,11 @@
+--- a/vendor/twig/twig/lib/Twig/Template.php	2022-09-05 02:54:39.800617851 +0200
+++ a/vendor/twig/twig/lib/Twig/Template.php	2022-09-05 03:54:48.000000000 +0200
+@@ -387,7 +387,7 @@
+ 
+         // object property
+         if (Twig_TemplateInterface::METHOD_CALL !== $type) {
+-            if (isset($object->$item) || array_key_exists((string) $item, $object)) {
+            if (isset($object->$item)) {
+                 if ($isDefinedTest) {
+                     return true;
+                 }
--- a/sources/extra_files/app/.gitignore
+++ b/sources/extra_files/app/.gitignore
@ -1,2 +0,0 @@
-*~
-*.sw[op]
--- a/sources/patches/.gitignore
+++ b/sources/patches/.gitignore
@ -1,2 +0,0 @@
-*~
-*.sw[op]