Merge pull request #18 from YunoHost-Apps/testing

Testing

ALL_README.md

@@ -5,4 +5,6 @@
 - [Irakurri README euskaraz](README_eu.md)
 - [Lire le README en français](README_fr.md)
 - [Le o README en galego](README_gl.md)
+- [Baca README dalam bahasa bahasa Indonesia](README_id.md)
+- [Прочитать README на русский](README_ru.md)
 - [阅读中文（简体）的 README](README_zh_Hans.md)

README.md

@@ -5,7 +5,7 @@ It shall NOT be edited by hand.
 
 # Phpinfo for YunoHost
 
-[![Integration level](https://dash.yunohost.org/integration/phpinfo.svg)](https://dash.yunohost.org/appci/app/phpinfo) ![Working status](https://ci-apps.yunohost.org/ci/badges/phpinfo.status.svg) ![Maintenance status](https://ci-apps.yunohost.org/ci/badges/phpinfo.maintain.svg)
+[![Integration level](https://dash.yunohost.org/integration/phpinfo.svg)](https://ci-apps.yunohost.org/ci/apps/phpinfo/) ![Working status](https://ci-apps.yunohost.org/ci/badges/phpinfo.status.svg) ![Maintenance status](https://ci-apps.yunohost.org/ci/badges/phpinfo.maintain.svg)
 
 [![Install Phpinfo with YunoHost](https://install-app.yunohost.org/install-with-yunohost.svg)](https://install-app.yunohost.org/?app=phpinfo)
 
@@ -18,7 +18,7 @@ It shall NOT be edited by hand.
 
 Simple phpinfo
 
-**Shipped version:** 1.0~ynh5
+**Shipped version:** 1.0~ynh6
 ## Documentation and resources
 
 - Official app website: <https://www.php.net/manual/fr/function.phpinfo.php>

README_es.md

@@ -5,7 +5,7 @@ No se debe editar a mano.
 
 # Phpinfo para Yunohost
 
-[![Nivel de integración](https://dash.yunohost.org/integration/phpinfo.svg)](https://dash.yunohost.org/appci/app/phpinfo) ![Estado funcional](https://ci-apps.yunohost.org/ci/badges/phpinfo.status.svg) ![Estado En Mantención](https://ci-apps.yunohost.org/ci/badges/phpinfo.maintain.svg)
+[![Nivel de integración](https://dash.yunohost.org/integration/phpinfo.svg)](https://ci-apps.yunohost.org/ci/apps/phpinfo/) ![Estado funcional](https://ci-apps.yunohost.org/ci/badges/phpinfo.status.svg) ![Estado En Mantención](https://ci-apps.yunohost.org/ci/badges/phpinfo.maintain.svg)
 
 [![Instalar Phpinfo con Yunhost](https://install-app.yunohost.org/install-with-yunohost.svg)](https://install-app.yunohost.org/?app=phpinfo)
 
@@ -18,7 +18,7 @@ No se debe editar a mano.
 
 Simple phpinfo
 
-**Versión actual:** 1.0~ynh5
+**Versión actual:** 1.0~ynh6
 ## Documentaciones y recursos
 
 - Sitio web oficial: <https://www.php.net/manual/fr/function.phpinfo.php>

README_eu.md

@@ -5,7 +5,7 @@ EZ editatu eskuz.
 
 # Phpinfo YunoHost-erako
 
-[![Integrazio maila](https://dash.yunohost.org/integration/phpinfo.svg)](https://dash.yunohost.org/appci/app/phpinfo) ![Funtzionamendu egoera](https://ci-apps.yunohost.org/ci/badges/phpinfo.status.svg) ![Mantentze egoera](https://ci-apps.yunohost.org/ci/badges/phpinfo.maintain.svg)
+[![Integrazio maila](https://dash.yunohost.org/integration/phpinfo.svg)](https://ci-apps.yunohost.org/ci/apps/phpinfo/) ![Funtzionamendu egoera](https://ci-apps.yunohost.org/ci/badges/phpinfo.status.svg) ![Mantentze egoera](https://ci-apps.yunohost.org/ci/badges/phpinfo.maintain.svg)
 
 [![Instalatu Phpinfo YunoHost-ekin](https://install-app.yunohost.org/install-with-yunohost.svg)](https://install-app.yunohost.org/?app=phpinfo)
 
@@ -18,7 +18,7 @@ EZ editatu eskuz.
 
 Simple phpinfo
 
-**Paketatutako bertsioa:** 1.0~ynh5
+**Paketatutako bertsioa:** 1.0~ynh6
 ## Dokumentazioa eta baliabideak
 
 - Aplikazioaren webgune ofiziala: <https://www.php.net/manual/fr/function.phpinfo.php>

README_fr.md

@@ -5,7 +5,7 @@ Il NE doit PAS être modifié à la main.
 
 # Phpinfo pour YunoHost
 
-[![Niveau d’intégration](https://dash.yunohost.org/integration/phpinfo.svg)](https://dash.yunohost.org/appci/app/phpinfo) ![Statut du fonctionnement](https://ci-apps.yunohost.org/ci/badges/phpinfo.status.svg) ![Statut de maintenance](https://ci-apps.yunohost.org/ci/badges/phpinfo.maintain.svg)
+[![Niveau d’intégration](https://dash.yunohost.org/integration/phpinfo.svg)](https://ci-apps.yunohost.org/ci/apps/phpinfo/) ![Statut du fonctionnement](https://ci-apps.yunohost.org/ci/badges/phpinfo.status.svg) ![Statut de maintenance](https://ci-apps.yunohost.org/ci/badges/phpinfo.maintain.svg)
 
 [![Installer Phpinfo avec YunoHost](https://install-app.yunohost.org/install-with-yunohost.svg)](https://install-app.yunohost.org/?app=phpinfo)
 
@@ -18,7 +18,7 @@ Il NE doit PAS être modifié à la main.
 
 Simple phpinfo
 
-**Version incluse :** 1.0~ynh5
+**Version incluse :** 1.0~ynh6
 ## Documentations et ressources
 
 - Site officiel de l’app : <https://www.php.net/manual/fr/function.phpinfo.php>

README_gl.md

@@ -5,7 +5,7 @@ NON debe editarse manualmente.
 
 # Phpinfo para YunoHost
 
-[![Nivel de integración](https://dash.yunohost.org/integration/phpinfo.svg)](https://dash.yunohost.org/appci/app/phpinfo) ![Estado de funcionamento](https://ci-apps.yunohost.org/ci/badges/phpinfo.status.svg) ![Estado de mantemento](https://ci-apps.yunohost.org/ci/badges/phpinfo.maintain.svg)
+[![Nivel de integración](https://dash.yunohost.org/integration/phpinfo.svg)](https://ci-apps.yunohost.org/ci/apps/phpinfo/) ![Estado de funcionamento](https://ci-apps.yunohost.org/ci/badges/phpinfo.status.svg) ![Estado de mantemento](https://ci-apps.yunohost.org/ci/badges/phpinfo.maintain.svg)
 
 [![Instalar Phpinfo con YunoHost](https://install-app.yunohost.org/install-with-yunohost.svg)](https://install-app.yunohost.org/?app=phpinfo)
 
@@ -18,7 +18,7 @@ NON debe editarse manualmente.
 
 Simple phpinfo
 
-**Versión proporcionada:** 1.0~ynh5
+**Versión proporcionada:** 1.0~ynh6
 ## Documentación e recursos
 
 - Web oficial da app: <https://www.php.net/manual/fr/function.phpinfo.php>

README_id.md

@@ -0,0 +1,40 @@
+<!--
+N.B.: README ini dibuat secara otomatis oleh <https://github.com/YunoHost/apps/tree/master/tools/readme_generator>
+Ini TIDAK boleh diedit dengan tangan.
+-->
+
+# Phpinfo untuk YunoHost
+
+[![Tingkat integrasi](https://dash.yunohost.org/integration/phpinfo.svg)](https://ci-apps.yunohost.org/ci/apps/phpinfo/) ![Status kerja](https://ci-apps.yunohost.org/ci/badges/phpinfo.status.svg) ![Status pemeliharaan](https://ci-apps.yunohost.org/ci/badges/phpinfo.maintain.svg)
+
+[![Pasang Phpinfo dengan YunoHost](https://install-app.yunohost.org/install-with-yunohost.svg)](https://install-app.yunohost.org/?app=phpinfo)
+
+*[Baca README ini dengan bahasa yang lain.](./ALL_README.md)*
+
+> *Paket ini memperbolehkan Anda untuk memasang Phpinfo secara cepat dan mudah pada server YunoHost.*  
+> *Bila Anda tidak mempunyai YunoHost, silakan berkonsultasi dengan [panduan](https://yunohost.org/install) untuk mempelajari bagaimana untuk memasangnya.*
+
+## Ringkasan
+
+Simple phpinfo
+
+**Versi terkirim:** 1.0~ynh6
+## Dokumentasi dan sumber daya
+
+- Website aplikasi resmi: <https://www.php.net/manual/fr/function.phpinfo.php>
+- Gudang YunoHost: <https://apps.yunohost.org/app/phpinfo>
+- Laporkan bug: <https://github.com/YunoHost-Apps/phpinfo_ynh/issues>
+
+## Info developer
+
+Silakan kirim pull request ke [`testing` branch](https://github.com/YunoHost-Apps/phpinfo_ynh/tree/testing).
+
+Untuk mencoba branch `testing`, silakan dilanjutkan seperti:
+
+```bash
+sudo yunohost app install https://github.com/YunoHost-Apps/phpinfo_ynh/tree/testing --debug
+atau
+sudo yunohost app upgrade phpinfo -u https://github.com/YunoHost-Apps/phpinfo_ynh/tree/testing --debug
+```
+
+**Info lebih lanjut mengenai pemaketan aplikasi:** <https://yunohost.org/packaging_apps>

README_ru.md

@@ -0,0 +1,40 @@
+<!--
+Важно: этот README был автоматически сгенерирован <https://github.com/YunoHost/apps/tree/master/tools/readme_generator>
+Он НЕ ДОЛЖЕН редактироваться вручную.
+-->
+
+# Phpinfo для YunoHost
+
+[![Уровень интеграции](https://dash.yunohost.org/integration/phpinfo.svg)](https://ci-apps.yunohost.org/ci/apps/phpinfo/) ![Состояние работы](https://ci-apps.yunohost.org/ci/badges/phpinfo.status.svg) ![Состояние сопровождения](https://ci-apps.yunohost.org/ci/badges/phpinfo.maintain.svg)
+
+[![Установите Phpinfo с YunoHost](https://install-app.yunohost.org/install-with-yunohost.svg)](https://install-app.yunohost.org/?app=phpinfo)
+
+*[Прочтите этот README на других языках.](./ALL_README.md)*
+
+> *Этот пакет позволяет Вам установить Phpinfo быстро и просто на YunoHost-сервер.*  
+> *Если у Вас нет YunoHost, пожалуйста, посмотрите [инструкцию](https://yunohost.org/install), чтобы узнать, как установить его.*
+
+## Обзор
+
+Simple phpinfo
+
+**Поставляемая версия:** 1.0~ynh6
+## Документация и ресурсы
+
+- Официальный веб-сайт приложения: <https://www.php.net/manual/fr/function.phpinfo.php>
+- Магазин YunoHost: <https://apps.yunohost.org/app/phpinfo>
+- Сообщите об ошибке: <https://github.com/YunoHost-Apps/phpinfo_ynh/issues>
+
+## Информация для разработчиков
+
+Пришлите Ваш запрос на слияние в [ветку `testing`](https://github.com/YunoHost-Apps/phpinfo_ynh/tree/testing).
+
+Чтобы попробовать ветку `testing`, пожалуйста, сделайте что-то вроде этого:
+
+```bash
+sudo yunohost app install https://github.com/YunoHost-Apps/phpinfo_ynh/tree/testing --debug
+или
+sudo yunohost app upgrade phpinfo -u https://github.com/YunoHost-Apps/phpinfo_ynh/tree/testing --debug
+```
+
+**Больше информации о пакетировании приложений:** <https://yunohost.org/packaging_apps>

README_zh_Hans.md

@@ -5,7 +5,7 @@
 
 # YunoHost 上的 Phpinfo
 
-[![集成程度](https://dash.yunohost.org/integration/phpinfo.svg)](https://dash.yunohost.org/appci/app/phpinfo) ![工作状态](https://ci-apps.yunohost.org/ci/badges/phpinfo.status.svg) ![维护状态](https://ci-apps.yunohost.org/ci/badges/phpinfo.maintain.svg)
+[![集成程度](https://dash.yunohost.org/integration/phpinfo.svg)](https://ci-apps.yunohost.org/ci/apps/phpinfo/) ![工作状态](https://ci-apps.yunohost.org/ci/badges/phpinfo.status.svg) ![维护状态](https://ci-apps.yunohost.org/ci/badges/phpinfo.maintain.svg)
 
 [![使用 YunoHost 安装 Phpinfo](https://install-app.yunohost.org/install-with-yunohost.svg)](https://install-app.yunohost.org/?app=phpinfo)
 
@@ -18,7 +18,7 @@
 
 Simple phpinfo
 
-**分发版本：** 1.0~ynh5
+**分发版本：** 1.0~ynh6
 ## 文档与资源
 
 - 官方应用网站： <https://www.php.net/manual/fr/function.phpinfo.php>

manifest.toml

@@ -5,9 +5,9 @@ name = "Phpinfo"
 description.en = "Simple phpinfo"
 description.fr = "Simple phpinfo"
 
-version = "1.0~ynh5"
+version = "1.0~ynh6"
 
-maintainers = ["Maniack Crudelis"]
+maintainers = []
 
 [upstream]
 license = "GPL-3.0-or-later"
@@ -42,8 +42,8 @@ ram.runtime = "50M"
     ask.en = "Choose the version of PHP to use."
     ask.fr = "Choisissez la version de PHP à utiliser."
     type = "select"
-    choices = ["7.4", "8.0", "8.1", "8.2"]
+    choices = ["7.4", "8.0", "8.1", "8.2", "8.3"]
-    default = "8.2"
+    default = "8.3"
 
 [resources]
     [resources.system_user]
@@ -54,5 +54,7 @@ ram.runtime = "50M"
     main.url = "/"
 
     [resources.apt]
-    packages = "php8.2-fpm"
+    packages = "nginx" # Kind of "dummy" value to be sure to have a non-empty dep list
-    
+    packages_from_raw_bash = """
+        echo "php${phpversion}-fpm"
+    """

scripts/install

@@ -27,8 +27,9 @@ chown -R $app:www-data "$install_dir"
 #=================================================
 ynh_script_progression --message="Configuring PHP-FPM..."
 
+
 # Create a dedicated PHP-FPM config
-ynh_add_fpm_config
+ynh_add_fpm_config --phpversion=$phpversion
 
 # Create a dedicated NGINX config
 ynh_add_nginx_config

scripts/upgrade

@@ -36,7 +36,7 @@ chown -R $app:www-data "$install_dir"
 ynh_script_progression --message="Upgrading PHP-FPM configuration..."
 
 # Create a dedicated PHP-FPM config
-ynh_add_fpm_config
+ynh_add_fpm_config --phpversion=$phpversion
 
 # Create a dedicated NGINX config
 ynh_add_nginx_config

tests.toml

@@ -6,8 +6,35 @@ test_format = 1.0
     # Tests to run
     # ------------
 
-    exclude = ["install.private", "change_url"]
+    exclude = ["change_url"]
     
     # -------------------------------
     # Default args to use for install
     # -------------------------------
+
+    args.phpversion = "8.3"
+
+    # -------------------------------
+    # Commits to test upgrade from
+    # -------------------------------
+
+[74_test]
+
+    only = ["install.subdir", "backup_restore", "upgrade" ]
+    args.phpversion = "7.4"
+
+[80_test]
+
+    only = ["install.subdir", "backup_restore", "upgrade" ]
+    args.phpversion = "8.0"
+
+[81_test]
+
+    only = ["install.subdir", "backup_restore", "upgrade" ]
+    args.phpversion = "8.1"
+
+
+[82_test]
+
+    only = ["install.subdir", "backup_restore", "upgrade" ]
+    args.phpversion = "8.2"