From c6f8c7947c2db8b82cce018cc7c9ab7dbf8a1a1b Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C3=89ric=20Gaspar?=
 <46165813+ericgaspar@users.noreply.github.com>
Date: Fri, 9 Dec 2022 16:34:18 +0100
Subject: [PATCH 01/12] Update to PHP8.1

---
 manifest.json      | 2 +-
 scripts/_common.sh | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/manifest.json b/manifest.json
index 09a85d6..b5227cd 100644
--- a/manifest.json
+++ b/manifest.json
@@ -28,7 +28,7 @@
     "multi_instance": true,
     "services": [
         "nginx",
-        "php8.0-fpm",
+        "php8.1-fpm",
         "mysql"
     ],
     "arguments": {
diff --git a/scripts/_common.sh b/scripts/_common.sh
index ded3f70..d06f54d 100644
--- a/scripts/_common.sh
+++ b/scripts/_common.sh
@@ -4,7 +4,7 @@
 # COMMON VARIABLES
 #=================================================
 
-YNH_PHP_VERSION="8.0"
+YNH_PHP_VERSION="8.1"
 pkg_dependencies="imagemagick libmagickcore-6.q16-6-extra acl tar smbclient at php${YNH_PHP_VERSION}-fpm php${YNH_PHP_VERSION}-bz2 php${YNH_PHP_VERSION}-imap php${YNH_PHP_VERSION}-gmp php${YNH_PHP_VERSION}-gd php${YNH_PHP_VERSION}-intl php${YNH_PHP_VERSION}-curl php${YNH_PHP_VERSION}-apcu php${YNH_PHP_VERSION}-redis php${YNH_PHP_VERSION}-ldap php${YNH_PHP_VERSION}-imagick php${YNH_PHP_VERSION}-zip php${YNH_PHP_VERSION}-mbstring php${YNH_PHP_VERSION}-xml php${YNH_PHP_VERSION}-mysql php${YNH_PHP_VERSION}-igbinary php${YNH_PHP_VERSION}-bcmath"
 
 #=================================================

From 932d2961a1531f6dd9dc37c3f68810854400f2f2 Mon Sep 17 00:00:00 2001
From: yunohost-bot <yunohost@yunohost.org>
Date: Fri, 9 Dec 2022 15:34:27 +0000
Subject: [PATCH 02/12] Auto-update README

---
 README.md    | 2 +-
 README_fr.md | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/README.md b/README.md
index 6fc7650..3d88a5c 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
 
 Online storage, file sharing platform and various other applications
 
-**Shipped version:** 25.0.1~ynh1
+**Shipped version:** 25.0.2~ynh1
 
 **Demo:** https://demo.nextcloud.com/
 
diff --git a/README_fr.md b/README_fr.md
index e441d52..6ed96f2 100644
--- a/README_fr.md
+++ b/README_fr.md
@@ -17,7 +17,7 @@ Si vous n'avez pas YunoHost, regardez [ici](https://yunohost.org/#/install) pour
 
 Stockage en ligne, plateforme de partage de fichiers et diverses autres applications
 
-**Version incluse :** 25.0.1~ynh1
+**Version incluse :** 25.0.2~ynh1
 
 **Démo :** https://demo.nextcloud.com/
 

From 24eeaa20691cc2d2c403113e9e5868a82132e1a5 Mon Sep 17 00:00:00 2001
From: ericgaspar <junk.eg@free.fr>
Date: Sat, 21 Jan 2023 15:44:32 +0100
Subject: [PATCH 03/12] Update check_process

---
 check_process | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/check_process b/check_process
index 0776e9c..6922dcc 100644
--- a/check_process
+++ b/check_process
@@ -13,8 +13,8 @@
 		setup_private=1
 		setup_public=1
 		upgrade=1
-		#22.2.9
-		upgrade=1	from_commit=f565b6d216f5340f752e6d6a21a14abc3811e0e7
+		#25.0.2
+		upgrade=1	from_commit=c5cf91ad30149e1924c23b19e93f483c3ed3edd8
 		backup_restore=1
 		multi_instance=1
 		change_url=1
@@ -22,6 +22,6 @@
 Email=
 Notification=none
 ;;; Upgrade options
-	; commit=f565b6d216f5340f752e6d6a21a14abc3811e0e7
-		name=Merge pull request #495 from YunoHost-Apps/22.2.9
+	; commit=c5cf91ad30149e1924c23b19e93f483c3ed3edd8
+		name=Merge pull request #495 from YunoHost-Apps/25.0.2
 		manifest_arg=domain=DOMAIN&path=PATH&admin=USER&user_home=1&

From 8b4ccc9847b5c65ae52f7d52d749450398535cf1 Mon Sep 17 00:00:00 2001
From: yunohost-bot <yunohost@yunohost.org>
Date: Sat, 21 Jan 2023 22:32:02 +0000
Subject: [PATCH 04/12] Auto-update README

---
 README.md    | 2 +-
 README_fr.md | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/README.md b/README.md
index c355e88..ae28282 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
 
 Online storage, file sharing platform and various other applications
 
-**Shipped version:** 25.0.2~ynh2
+**Shipped version:** 25.0.3~ynh1
 
 **Demo:** https://demo.nextcloud.com/
 
diff --git a/README_fr.md b/README_fr.md
index 287dad9..14e1f7b 100644
--- a/README_fr.md
+++ b/README_fr.md
@@ -17,7 +17,7 @@ Si vous n’avez pas YunoHost, regardez [ici](https://yunohost.org/#/install) po
 
 Stockage en ligne, plateforme de partage de fichiers et diverses autres applications
 
-**Version incluse :** 25.0.2~ynh2
+**Version incluse :** 25.0.3~ynh1
 
 **Démo :** https://demo.nextcloud.com/
 

From 888808f0b9bf91e048a57b75bc8d11469791e7ff Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C3=89ric=20Gaspar?=
 <46165813+ericgaspar@users.noreply.github.com>
Date: Sun, 22 Jan 2023 15:56:03 +0100
Subject: [PATCH 05/12] Update install

---
 scripts/install | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/scripts/install b/scripts/install
index cdf98e2..dccc173 100755
--- a/scripts/install
+++ b/scripts/install
@@ -43,7 +43,7 @@ ynh_webpath_register --app=$app --domain=$domain --path_url=$path_url
 # Check machine architecture (26.0 Nextcloud version will drop support for 32bit architectures)
 if [ $YNH_ARCH == "i386" ] || [ $YNH_ARCH == "armhf" ]
 then
-    ynh_print_warn --message="Nextcloud has deprecated 32-bit support. Version 25 should be the last one to support 32-bit architectures."
+    ynh_print_warn --message="Nextcloud will deprecated 32-bit support. Version 25 or 26 should be the last one to support 32-bit architectures."
 fi
 
 #=================================================

From 1bc25a794b0c1fe8c06a853a38ef0f2d8f46cc78 Mon Sep 17 00:00:00 2001
From: yunohost-bot <yunohost@yunohost.org>
Date: Sun, 22 Jan 2023 14:56:08 +0000
Subject: [PATCH 06/12] Auto-update README

---
 README.md    | 4 ++--
 README_fr.md | 4 ++--
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/README.md b/README.md
index c355e88..d52ad1a 100644
--- a/README.md
+++ b/README.md
@@ -5,7 +5,7 @@ It shall NOT be edited by hand.
 
 # Nextcloud for YunoHost
 
-[![Integration level](https://dash.yunohost.org/integration/nextcloud.svg)](https://dash.yunohost.org/appci/app/nextcloud) ![Working status](https://ci-apps.yunohost.org/ci/badges/nextcloud.status.svg) ![Maintenance status](https://ci-apps.yunohost.org/ci/badges/nextcloud.maintain.svg)  
+[![Integration level](https://dash.yunohost.org/integration/nextcloud.svg)](https://dash.yunohost.org/appci/app/nextcloud) ![Working status](https://ci-apps.yunohost.org/ci/badges/nextcloud.status.svg) ![Maintenance status](https://ci-apps.yunohost.org/ci/badges/nextcloud.maintain.svg)
 [![Install Nextcloud with YunoHost](https://install-app.yunohost.org/install-with-yunohost.svg)](https://install-app.yunohost.org/?app=nextcloud)
 
 *[Lire ce readme en français.](./README_fr.md)*
@@ -17,7 +17,7 @@ If you don't have YunoHost, please consult [the guide](https://yunohost.org/#/in
 
 Online storage, file sharing platform and various other applications
 
-**Shipped version:** 25.0.2~ynh2
+**Shipped version:** 25.0.3~ynh1
 
 **Demo:** https://demo.nextcloud.com/
 
diff --git a/README_fr.md b/README_fr.md
index 287dad9..b545aac 100644
--- a/README_fr.md
+++ b/README_fr.md
@@ -5,7 +5,7 @@ It shall NOT be edited by hand.
 
 # Nextcloud pour YunoHost
 
-[![Niveau d’intégration](https://dash.yunohost.org/integration/nextcloud.svg)](https://dash.yunohost.org/appci/app/nextcloud) ![Statut du fonctionnement](https://ci-apps.yunohost.org/ci/badges/nextcloud.status.svg) ![Statut de maintenance](https://ci-apps.yunohost.org/ci/badges/nextcloud.maintain.svg)  
+[![Niveau d’intégration](https://dash.yunohost.org/integration/nextcloud.svg)](https://dash.yunohost.org/appci/app/nextcloud) ![Statut du fonctionnement](https://ci-apps.yunohost.org/ci/badges/nextcloud.status.svg) ![Statut de maintenance](https://ci-apps.yunohost.org/ci/badges/nextcloud.maintain.svg)
 [![Installer Nextcloud avec YunoHost](https://install-app.yunohost.org/install-with-yunohost.svg)](https://install-app.yunohost.org/?app=nextcloud)
 
 *[Read this readme in english.](./README.md)*
@@ -17,7 +17,7 @@ Si vous n’avez pas YunoHost, regardez [ici](https://yunohost.org/#/install) po
 
 Stockage en ligne, plateforme de partage de fichiers et diverses autres applications
 
-**Version incluse :** 25.0.2~ynh2
+**Version incluse :** 25.0.3~ynh1
 
 **Démo :** https://demo.nextcloud.com/
 

From c5da6cdf711f9df144fd9ecc324897a5fda7d8c1 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C3=89ric=20Gaspar?=
 <46165813+ericgaspar@users.noreply.github.com>
Date: Sun, 22 Jan 2023 15:58:50 +0100
Subject: [PATCH 07/12] Update upgrade

---
 scripts/upgrade | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/scripts/upgrade b/scripts/upgrade
index 5c8fc10..27407df 100755
--- a/scripts/upgrade
+++ b/scripts/upgrade
@@ -37,7 +37,7 @@ upgrade_type=$(ynh_check_app_version_changed)
 # Check machine architecture (26.0 Nextcloud version will drop support for 32bit architectures)
 if [ $YNH_ARCH == "i386" ] || [ $YNH_ARCH == "armhf" ]
 then
-    ynh_print_warn --message="Nextcloud has deprecated 32-bit support. Version 25 is the last one to support 32-bit architectures."
+    ynh_print_warn --message="Nextcloud will deprecated 32-bit support. Version 25 or 26 should be the last one to support 32-bit architectures."
 fi
 
 #=================================================

From a7df2428db5deed2eb5cfe64b64416153e97344e Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C3=89ric=20Gaspar?=
 <46165813+ericgaspar@users.noreply.github.com>
Date: Sun, 22 Jan 2023 16:16:08 +0100
Subject: [PATCH 08/12] be vague

---
 scripts/install | 2 +-
 scripts/upgrade | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/scripts/install b/scripts/install
index dccc173..488d6b0 100755
--- a/scripts/install
+++ b/scripts/install
@@ -43,7 +43,7 @@ ynh_webpath_register --app=$app --domain=$domain --path_url=$path_url
 # Check machine architecture (26.0 Nextcloud version will drop support for 32bit architectures)
 if [ $YNH_ARCH == "i386" ] || [ $YNH_ARCH == "armhf" ]
 then
-    ynh_print_warn --message="Nextcloud will deprecated 32-bit support. Version 25 or 26 should be the last one to support 32-bit architectures."
+    ynh_print_warn --message="Nextcloud will deprecated 32-bit support soon."
 fi
 
 #=================================================
diff --git a/scripts/upgrade b/scripts/upgrade
index 27407df..ac68155 100755
--- a/scripts/upgrade
+++ b/scripts/upgrade
@@ -37,7 +37,7 @@ upgrade_type=$(ynh_check_app_version_changed)
 # Check machine architecture (26.0 Nextcloud version will drop support for 32bit architectures)
 if [ $YNH_ARCH == "i386" ] || [ $YNH_ARCH == "armhf" ]
 then
-    ynh_print_warn --message="Nextcloud will deprecated 32-bit support. Version 25 or 26 should be the last one to support 32-bit architectures."
+    ynh_print_warn --message="Nextcloud will soon deprecate 32-bit support."
 fi
 
 #=================================================

From 8ea0038c04a7f4750f442e5e0985fcaca96074ab Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C3=89ric=20Gaspar?=
 <46165813+ericgaspar@users.noreply.github.com>
Date: Sun, 22 Jan 2023 16:22:43 +0100
Subject: [PATCH 09/12] Update install

---
 scripts/install | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/scripts/install b/scripts/install
index 488d6b0..1ac03d7 100755
--- a/scripts/install
+++ b/scripts/install
@@ -43,7 +43,7 @@ ynh_webpath_register --app=$app --domain=$domain --path_url=$path_url
 # Check machine architecture (26.0 Nextcloud version will drop support for 32bit architectures)
 if [ $YNH_ARCH == "i386" ] || [ $YNH_ARCH == "armhf" ]
 then
-    ynh_print_warn --message="Nextcloud will deprecated 32-bit support soon."
+    ynh_print_warn --message="Nextcloud will soon deprecate 32-bit support."
 fi
 
 #=================================================

From 2e6790a5bfef2821830ac2c70e235625c89dc332 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C3=89ric=20Gaspar?=
 <46165813+ericgaspar@users.noreply.github.com>
Date: Sun, 22 Jan 2023 16:25:23 +0100
Subject: [PATCH 10/12] Update _common.sh

---
 scripts/_common.sh | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/scripts/_common.sh b/scripts/_common.sh
index ded3f70..08562b6 100644
--- a/scripts/_common.sh
+++ b/scripts/_common.sh
@@ -5,7 +5,10 @@
 #=================================================
 
 YNH_PHP_VERSION="8.0"
-pkg_dependencies="imagemagick libmagickcore-6.q16-6-extra acl tar smbclient at php${YNH_PHP_VERSION}-fpm php${YNH_PHP_VERSION}-bz2 php${YNH_PHP_VERSION}-imap php${YNH_PHP_VERSION}-gmp php${YNH_PHP_VERSION}-gd php${YNH_PHP_VERSION}-intl php${YNH_PHP_VERSION}-curl php${YNH_PHP_VERSION}-apcu php${YNH_PHP_VERSION}-redis php${YNH_PHP_VERSION}-ldap php${YNH_PHP_VERSION}-imagick php${YNH_PHP_VERSION}-zip php${YNH_PHP_VERSION}-mbstring php${YNH_PHP_VERSION}-xml php${YNH_PHP_VERSION}-mysql php${YNH_PHP_VERSION}-igbinary php${YNH_PHP_VERSION}-bcmath"
+
+php_dependencies="php${YNH_PHP_VERSION}-fpm php${YNH_PHP_VERSION}-bz2 php${YNH_PHP_VERSION}-imap php${YNH_PHP_VERSION}-gmp php${YNH_PHP_VERSION}-gd php${YNH_PHP_VERSION}-intl php${YNH_PHP_VERSION}-curl php${YNH_PHP_VERSION}-apcu php${YNH_PHP_VERSION}-redis php${YNH_PHP_VERSION}-ldap php${YNH_PHP_VERSION}-imagick php${YNH_PHP_VERSION}-zip php${YNH_PHP_VERSION}-mbstring php${YNH_PHP_VERSION}-xml php${YNH_PHP_VERSION}-mysql php${YNH_PHP_VERSION}-igbinary php${YNH_PHP_VERSION}-bcmath"
+
+pkg_dependencies="imagemagick libmagickcore-6.q16-6-extra acl tar smbclient at $php_dependencies"
 
 #=================================================
 # EXPERIMENTAL HELPERS

From 9e801dc364dcb452bff4e12e74b5a40c94919c66 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C3=89ric=20Gaspar?=
 <46165813+ericgaspar@users.noreply.github.com>
Date: Sun, 22 Jan 2023 21:57:45 +0100
Subject: [PATCH 11/12] Fix warning

---
 scripts/install | 2 +-
 scripts/upgrade | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/scripts/install b/scripts/install
index 1ac03d7..6c02f97 100755
--- a/scripts/install
+++ b/scripts/install
@@ -43,7 +43,7 @@ ynh_webpath_register --app=$app --domain=$domain --path_url=$path_url
 # Check machine architecture (26.0 Nextcloud version will drop support for 32bit architectures)
 if [ $YNH_ARCH == "i386" ] || [ $YNH_ARCH == "armhf" ]
 then
-    ynh_print_warn --message="Nextcloud will soon deprecate 32-bit support."
+    ynh_print_warn --message="Nextcloud will soon deprecate 32-bit support. It is recommended to upgrade to a 64-bit architecture."
 fi
 
 #=================================================
diff --git a/scripts/upgrade b/scripts/upgrade
index ac68155..22d639b 100755
--- a/scripts/upgrade
+++ b/scripts/upgrade
@@ -37,7 +37,7 @@ upgrade_type=$(ynh_check_app_version_changed)
 # Check machine architecture (26.0 Nextcloud version will drop support for 32bit architectures)
 if [ $YNH_ARCH == "i386" ] || [ $YNH_ARCH == "armhf" ]
 then
-    ynh_print_warn --message="Nextcloud will soon deprecate 32-bit support."
+    ynh_print_warn --message="Nextcloud will soon deprecate 32-bit support. It is recommended to upgrade to a 64-bit architecture."
 fi
 
 #=================================================

From 8802926c279cc7d0448367cf969c9b0d3db3ef43 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C3=89ric=20Gaspar?=
 <46165813+ericgaspar@users.noreply.github.com>
Date: Sun, 22 Jan 2023 22:06:37 +0100
Subject: [PATCH 12/12] Fix warning

---
 scripts/install | 2 +-
 scripts/upgrade | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/scripts/install b/scripts/install
index 6c02f97..981c8be 100755
--- a/scripts/install
+++ b/scripts/install
@@ -40,7 +40,7 @@ test ! -e "$final_path" || ynh_die --message="This path already contains a folde
 # Register (book) web path
 ynh_webpath_register --app=$app --domain=$domain --path_url=$path_url
 
-# Check machine architecture (26.0 Nextcloud version will drop support for 32bit architectures)
+# Check machine architecture (Nextcloud will soon deprecate 32-bit support)
 if [ $YNH_ARCH == "i386" ] || [ $YNH_ARCH == "armhf" ]
 then
     ynh_print_warn --message="Nextcloud will soon deprecate 32-bit support. It is recommended to upgrade to a 64-bit architecture."
diff --git a/scripts/upgrade b/scripts/upgrade
index 22d639b..968c96d 100755
--- a/scripts/upgrade
+++ b/scripts/upgrade
@@ -34,7 +34,7 @@ fpm_usage=$(ynh_app_setting_get --app=$app --key=fpm_usage)
 
 upgrade_type=$(ynh_check_app_version_changed)
 
-# Check machine architecture (26.0 Nextcloud version will drop support for 32bit architectures)
+# Check machine architecture (Nextcloud will soon deprecate 32-bit support)
 if [ $YNH_ARCH == "i386" ] || [ $YNH_ARCH == "armhf" ]
 then
     ynh_print_warn --message="Nextcloud will soon deprecate 32-bit support. It is recommended to upgrade to a 64-bit architecture."