From 0582de48c9d35cc09c9ed7f2376073d20342c43c Mon Sep 17 00:00:00 2001
From: Olav Seyfarth <olav@seyfarth.de>
Date: Tue, 7 Nov 2023 00:09:30 +0100
Subject: [PATCH] Add support for Nextcloud 28 and PHP 8.3

Leave NC 24 and 25 since they run with the icurrent minimum PHP version 8.0.
Allow for NC 28 (tested against NC28 beta 1 only!) and PHP 8.3 (untested).

Signed-off-by: Olav Seyfarth <olav@seyfarth.de>
---
 .github/workflows/static-analysis.yml | 15 ++++++++++++---
 CHANGELOG.md                          |  7 +++++++
 appinfo/info.xml                      |  6 +++---
 3 files changed, 22 insertions(+), 6 deletions(-)

diff --git a/.github/workflows/static-analysis.yml b/.github/workflows/static-analysis.yml
index 306d530..7a46028 100644
--- a/.github/workflows/static-analysis.yml
+++ b/.github/workflows/static-analysis.yml
@@ -13,17 +13,26 @@ jobs:
           - 'dev-stable25'
           - 'dev-stable26'
           - 'dev-stable27'
+          - 'dev-stable28'
           - 'dev-master'
         php:
           - '8.0'
           - '8.1'
+          - '8.2'
+          - '8.3'
         include:
-          - ocp: 'dev-stable27'
-            php: '8.2'
+          - ocp: 'dev-stable24'
+            php: '8.0'
+          - ocp: 'dev-stable25'
+            php: '8.1'
           - ocp: 'dev-stable26'
             php: '8.2'
-          - ocp: 'dev-master'
+          - ocp: 'dev-stable27'
             php: '8.2'
+          - ocp: 'dev-stable28'
+            php: '8.3'
+          - ocp: 'dev-master'
+            php: '8.3'
     name: Nextcloud ${{ matrix.ocp }} on PHP ${{ matrix.php }}
     steps:
       - name: Checkout
diff --git a/CHANGELOG.md b/CHANGELOG.md
index 8d30930..ac1da5f 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,6 +1,13 @@
 # Changelog
 Notable changes in [changelog format](https://keepachangelog.com/en/1.0.0/), project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0.html)
 
+## 2.7.4 (2023-11-06)
+
+### Added
+
+- Support for Nextcloud 28 (tested against beta1)
+- Support for PHP 8.3
+
 ## 2.7.3 (2023-05-20)
 
 ### Added
diff --git a/appinfo/info.xml b/appinfo/info.xml
index 243cce3..4ec4fb1 100644
--- a/appinfo/info.xml
+++ b/appinfo/info.xml
@@ -1,10 +1,10 @@
 <?xml version="1.0"?>
 <info xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="https://apps.nextcloud.com/schema/apps/info.xsd">
 	<id>twofactor_email</id>
-	<version>2.7.3</version>
+	<version>2.7.4</version>
 	<dependencies>
-		<nextcloud min-version="24" max-version="27" />
-		<php min-version="8.0" max-version="8.2" />
+		<nextcloud min-version="24" max-version="28" />
+		<php min-version="8.0" max-version="8.3" />
 	</dependencies>
 	<repository type="git">https://github.com/nursoda/twofactor_email.git</repository>
 	<licence>agpl</licence>