From bccdd16bb9b92a036e66647403f3d80e1da11937 Mon Sep 17 00:00:00 2001
From: Christoph Wurst <christoph@winzerhof-wurst.at>
Date: Mon, 13 Jun 2022 10:48:57 +0200
Subject: [PATCH] Add PHP8.1 support

Signed-off-by: Christoph Wurst <christoph@winzerhof-wurst.at>
---
 .github/workflows/test.yml | 44 +++++++++++++++++++++++++++++---------
 appinfo/info.xml           |  2 +-
 2 files changed, 35 insertions(+), 11 deletions(-)

diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml
index a47800c06..f02fd8ec1 100644
--- a/.github/workflows/test.yml
+++ b/.github/workflows/test.yml
@@ -15,9 +15,16 @@ jobs:
     strategy:
       fail-fast: false
       matrix:
-        php-version: [ 8.0 ]
-        nextcloud-version: [ 'master', 'stable23', 'stable22' ]
+        php-version: [ "8.1" ]
+        nextcloud-version: [ 'master', 'stable24' ]
         db: ['sqlite']
+        include:
+          - php-version: "8.0"
+            nextcloud-version: stable23
+            db: sqlite
+          - php-version: "7.4"
+            nextcloud-version: stable22
+            db: sqlite
 
     name: Nextcloud ${{ matrix.nextcloud-version }} php${{ matrix.php-version }} unit tests
     steps:
@@ -61,17 +68,21 @@ jobs:
     strategy:
       fail-fast: false
       matrix:
-        php-version: [ "7.4", "8.0" ]
-        nextcloud-version: [ 'master', 'stable22' ]
-        browser: [ 'firefox', 'chrome' ]
+        php-version: [ "8.1" ]
+        nextcloud-version: [ 'master' ]
+        browser: [ 'firefox' ]
         db: [ 'mysql' ]
         include:
-          - php-versions: "8.1"
-            nextcloud-versions: "master"
+          - php-version: "8.1"
+            nextcloud-version: "stable24"
+            browser: 'chrome'
+            db: 'sqlite'
+          - php-version: "8.0"
+            nextcloud-version: "stable23"
             browser: 'firefox'
-            db: 'mysql'
-          - php-versions: "8.1"
-            nextcloud-versions: "master"
+            db: 'pgsql'
+          - php-version: "7.4"
+            nextcloud-version: "stable22"
             browser: 'chrome'
             db: 'mysql'
 
@@ -92,6 +103,19 @@ jobs:
           --health-interval=10s
           --health-timeout=5s
           --health-retries=3
+      postgres-service:
+        image: postgres
+        env:
+          POSTGRES_USER: nextcloud
+          POSTGRES_DB: nextcloud
+          POSTGRES_PASSWORD: nextcloud
+        ports:
+          - 5432:5432
+        options: >-
+          --health-cmd pg_isready
+          --health-interval 10s
+          --health-timeout 5s
+          --health-retries 5
 
     steps:
       - name: Set up php${{ matrix.php-version }}
diff --git a/appinfo/info.xml b/appinfo/info.xml
index 5b818542c..9edf8ecff 100644
--- a/appinfo/info.xml
+++ b/appinfo/info.xml
@@ -17,7 +17,7 @@
 	<screenshot>https://raw.githubusercontent.com/nextcloud/twofactor_totp/dd1e48deec73a250886f35f3924186f5357f4c5f/screenshots/enter_challenge.png</screenshot>
 	<screenshot>https://raw.githubusercontent.com/nextcloud/twofactor_totp/dd1e48deec73a250886f35f3924186f5357f4c5f/screenshots/settings.png</screenshot>
 	<dependencies>
-		<php min-version="7.4" max-version="8.0" />
+		<php min-version="7.4" max-version="8.1" />
 		<nextcloud min-version="22" max-version="25" />
 	</dependencies>
 	<two-factor-providers>