Merge pull request #575 from nextcloud/feat/drop-php-8.0

feat!: drop support for php 8.0 and nextcloud <= 29
nextcloud · May 7, 2024 · 9387075 · 9387075
2 parents 9bf94f7 + 18f7f50
commit 9387075
Show file tree

Hide file tree

Showing 19 changed files with 629 additions and 1,063 deletions.
diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml
@@ -12,19 +12,8 @@ jobs:
     runs-on: ubuntu-latest
     strategy:
       matrix:
-        php-version: ['8.1', '8.2']
-        nextcloud-version: ['master', 'stable29', 'stable28', 'stable27']
-        include:
-          - php-version: '8.0'
-            nextcloud-version: stable27
-          - php-version: '8.0'
-            nextcloud-version: stable28
-          - php-version: '8.0'
-            nextcloud-version: stable29
-          - php-version: '8.3'
-            nextcloud-version: stable29
-          - php-version: '8.3'
-            nextcloud-version: master
+        php-version: ['8.1', '8.2', '8.3']
+        nextcloud-version: ['master']
     name: Nextcloud ${{ matrix.nextcloud-version }} php${{ matrix.php-version }} unit tests
     steps:
     - name: Set up Nextcloud env
@@ -57,14 +46,11 @@ jobs:
           - php-version: '8.1'
             nextcloud-version: master
             db: 'oci'
-          - php-version: '8.0'
-            nextcloud-version: stable27
-            db: 'pgsql'
-          - php-version: '8.0'
-            nextcloud-version: stable28
+          - php-version: '8.1'
+            nextcloud-version: master
             db: 'pgsql'
           - php-version: '8.2'
-            nextcloud-version: stable29
+            nextcloud-version: master
             db: 'mysql'
     name: Nextcloud ${{ matrix.nextcloud-version }} php${{ matrix.php-version }}-${{ matrix.db }} integration tests
     services:
@@ -153,8 +139,8 @@ jobs:
     name: Front-end E2E tests
     strategy:
       matrix:
-        php-version: [ '8.1' ]
-        nextcloud-version: [ 'master', 'stable29', 'stable28', 'stable27' ]
+        php-version: [ '8.1', '8.2', '8.3' ]
+        nextcloud-version: [ 'master']
         node-version: [ '20' ]
     steps:
       - name: Set up Nextcloud env
@@ -211,5 +197,8 @@ jobs:
           name: playwright-report
           path: nextcloud/apps/twofactor_webauthn/playwright-report/
           retention-days: 30
+      - name: Print server logs
+        if: always()
+        run: cat nextcloud/data/nextcloud.log*
     env:
       CI: true
diff --git a/appinfo/info.xml b/appinfo/info.xml
@@ -4,10 +4,11 @@
 	<name>Two-Factor WebAuthn</name>
 	<summary>WebAuthn two-factor provider</summary>
 	<description>A two-factor provider for WebAuthn devices</description>
-	<version>1.5.0-alpha.1</version>
+	<version>2.0.0-alpha.1</version>
 	<licence>agpl</licence>
 	<author>Christoph Wurst</author>
 	<author>Michael Blumenstein</author>
+	<author>Richard Steinmetz</author>
 	<namespace>TwoFactorWebauthn</namespace>
 	<category>security</category>
 
@@ -18,9 +19,9 @@
 	<screenshot>https://raw.githubusercontent.com/nextcloud/twofactor_webauthn/main/screenshots/challenge.png</screenshot>
 
 	<dependencies>
-		<php min-version="8.0" max-version="8.3"/>
+		<php min-version="8.1" max-version="8.3"/>
 		<lib>gmp</lib>
-		<nextcloud min-version="27" max-version="30" />
+		<nextcloud min-version="30" max-version="30" />
 	</dependencies>
 
 	<repair-steps>

diff --git a/composer.json b/composer.json
@@ -12,10 +12,10 @@
 		}
 	],
 	"require": {
-		"php": ">=8.0.0",
+		"php": ">=8.1.0",
 		"ext-json": "*",
 		"bamarni/composer-bin-plugin": "^1.8.2",
-		"web-auth/webauthn-lib": "^3.3.12"
+		"web-auth/webauthn-lib": "^4.8.5"
 	},
 	"require-dev": {
 		"christophwurst/nextcloud_testing": "^1.0.0",
@@ -45,7 +45,7 @@
 		"optimize-autoloader": true,
 		"classmap-authoritative": true,
 		"platform": {
-			"php": "8.0.0"
+			"php": "8.1.0"
 		},
 		"sort-packages": true,
 		"allow-plugins": {