From 4cc6eeace71da0c3c5246c9143cfc636e9cc2eb5 Mon Sep 17 00:00:00 2001
From: "Misha M.-Kupriyanov" <kupriyanov@strato.de>
Date: Thu, 9 Apr 2026 15:50:17 +0200
Subject: [PATCH 1/4] chore(appinfo): bump max-version to 33

---
 appinfo/info.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/appinfo/info.xml b/appinfo/info.xml
index e4a66df..d175b13 100644
--- a/appinfo/info.xml
+++ b/appinfo/info.xml
@@ -12,7 +12,7 @@
 	<category>tools</category>
 	<bugs>https://github.com/IONOS-Productivity/nc-simple-settings</bugs>
 	<dependencies>
-		<nextcloud min-version="30" max-version="31"/>
+		<nextcloud min-version="30" max-version="33"/>
 	</dependencies>
 	<!--
 	- no navigations configured, we'll redirect from the /app/settings path

From 18b2c4d81a230cee289e6cac2ce9c7cdea7ae5c4 Mon Sep 17 00:00:00 2001
From: "Misha M.-Kupriyanov" <kupriyanov@strato.de>
Date: Thu, 9 Apr 2026 15:50:23 +0200
Subject: [PATCH 2/4] chore(composer): bump nextcloud/ocp to v33, require PHP
 8.2

---
 composer.json |  6 +++---
 composer.lock | 24 ++++++++++++------------
 2 files changed, 15 insertions(+), 15 deletions(-)

diff --git a/composer.json b/composer.json
index fedd654..3d6059e 100644
--- a/composer.json
+++ b/composer.json
@@ -29,10 +29,10 @@
 	},
 	"require": {
 		"bamarni/composer-bin-plugin": "^1.8",
-		"php": "^8.1"
+		"php": "^8.2"
 	},
 	"require-dev": {
-		"nextcloud/ocp": "^v31.0.6",
+		"nextcloud/ocp": "^v33.0.0",
 		"roave/security-advisories": "dev-latest"
 	},
 	"config": {
@@ -42,7 +42,7 @@
 		"optimize-autoloader": true,
 		"sort-packages": true,
 		"platform": {
-			"php": "8.1"
+			"php": "8.2"
 		}
 	}
 }
diff --git a/composer.lock b/composer.lock
index c1fb2cf..8df5925 100644
--- a/composer.lock
+++ b/composer.lock
@@ -4,7 +4,7 @@
         "Read more about it at https://getcomposer.org/doc/01-basic-usage.md#installing-dependencies",
         "This file is @generated automatically"
     ],
-    "content-hash": "c43699eb13688bda00527f9d670d5946",
+    "content-hash": "82681f881444734880a84290b5466e59",
     "packages": [
         {
             "name": "bamarni/composer-bin-plugin",
@@ -67,20 +67,20 @@
     "packages-dev": [
         {
             "name": "nextcloud/ocp",
-            "version": "v31.0.6",
+            "version": "v33.0.2",
             "source": {
                 "type": "git",
                 "url": "https://github.com/nextcloud-deps/ocp.git",
-                "reference": "bec55048b46eadbd2c564f2b26c9486a43f958c2"
+                "reference": "f5a898fb7795fa28a135f528105b8628df6d97f5"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/nextcloud-deps/ocp/zipball/bec55048b46eadbd2c564f2b26c9486a43f958c2",
-                "reference": "bec55048b46eadbd2c564f2b26c9486a43f958c2",
+                "url": "https://api.github.com/repos/nextcloud-deps/ocp/zipball/f5a898fb7795fa28a135f528105b8628df6d97f5",
+                "reference": "f5a898fb7795fa28a135f528105b8628df6d97f5",
                 "shasum": ""
             },
             "require": {
-                "php": "~8.1 || ~8.2 || ~8.3 || ~8.4",
+                "php": "~8.1 || ~8.2 || ~8.3 || ~8.4 || ~8.5",
                 "psr/clock": "^1.0",
                 "psr/container": "^2.0.2",
                 "psr/event-dispatcher": "^1.0",
@@ -89,7 +89,7 @@
             "type": "library",
             "extra": {
                 "branch-alias": {
-                    "dev-stable31": "31.0.0-dev"
+                    "dev-stable33": "33.0.0-dev"
                 }
             },
             "notification-url": "https://packagist.org/downloads/",
@@ -109,9 +109,9 @@
             "description": "Composer package containing Nextcloud's public OCP API and the unstable NCU API",
             "support": {
                 "issues": "https://github.com/nextcloud-deps/ocp/issues",
-                "source": "https://github.com/nextcloud-deps/ocp/tree/v31.0.6"
+                "source": "https://github.com/nextcloud-deps/ocp/tree/v33.0.2"
             },
-            "time": "2025-05-28T00:52:27+00:00"
+            "time": "2026-03-27T01:17:36+00:00"
         },
         {
             "name": "psr/clock",
@@ -1265,11 +1265,11 @@
     "prefer-stable": false,
     "prefer-lowest": false,
     "platform": {
-        "php": "^8.1"
+        "php": "^8.2"
     },
     "platform-dev": [],
     "platform-overrides": {
-        "php": "8.1"
+        "php": "8.2"
     },
-    "plugin-api-version": "2.3.0"
+    "plugin-api-version": "2.6.0"
 }

From f6673a85b8b85db069415d9e204c89d298139ea4 Mon Sep 17 00:00:00 2001
From: "Misha M.-Kupriyanov" <kupriyanov@strato.de>
Date: Thu, 9 Apr 2026 16:12:00 +0200
Subject: [PATCH 3/4] fix(tests): remove OC_Util static property access removed
 in NC33

---
 tests/Controller/PageControllerTest.php | 2 --
 1 file changed, 2 deletions(-)

diff --git a/tests/Controller/PageControllerTest.php b/tests/Controller/PageControllerTest.php
index 89ba419..e03e53d 100644
--- a/tests/Controller/PageControllerTest.php
+++ b/tests/Controller/PageControllerTest.php
@@ -223,8 +223,6 @@ protected function tearDown(): void {
 	 * Reset Util script and style state for clean test isolation
 	 */
 	private function resetUtilState(): void {
-		\OC_Util::$scripts = [];
-		\OC_Util::$styles = [];
 		self::invokePrivate(\OCP\Util::class, 'scripts', [[]]);
 		self::invokePrivate(\OCP\Util::class, 'scriptDeps', [[]]);
 	}

From 8d42c27911e80e1f9d79c1793339786cba87f7eb Mon Sep 17 00:00:00 2001
From: "Misha M.-Kupriyanov" <kupriyanov@strato.de>
Date: Thu, 9 Apr 2026 16:12:13 +0200
Subject: [PATCH 4/4] fix(composer): revert PHP constraint to ^8.1 (NC32 still
 supports PHP 8.1)

---
 composer.json | 4 ++--
 composer.lock | 6 +++---
 2 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/composer.json b/composer.json
index 3d6059e..7187820 100644
--- a/composer.json
+++ b/composer.json
@@ -29,7 +29,7 @@
 	},
 	"require": {
 		"bamarni/composer-bin-plugin": "^1.8",
-		"php": "^8.2"
+		"php": "^8.1"
 	},
 	"require-dev": {
 		"nextcloud/ocp": "^v33.0.0",
@@ -42,7 +42,7 @@
 		"optimize-autoloader": true,
 		"sort-packages": true,
 		"platform": {
-			"php": "8.2"
+			"php": "8.1"
 		}
 	}
 }
diff --git a/composer.lock b/composer.lock
index 8df5925..4f3c30c 100644
--- a/composer.lock
+++ b/composer.lock
@@ -4,7 +4,7 @@
         "Read more about it at https://getcomposer.org/doc/01-basic-usage.md#installing-dependencies",
         "This file is @generated automatically"
     ],
-    "content-hash": "82681f881444734880a84290b5466e59",
+    "content-hash": "524da7374b90919ed33224ab70187148",
     "packages": [
         {
             "name": "bamarni/composer-bin-plugin",
@@ -1265,11 +1265,11 @@
     "prefer-stable": false,
     "prefer-lowest": false,
     "platform": {
-        "php": "^8.2"
+        "php": "^8.1"
     },
     "platform-dev": [],
     "platform-overrides": {
-        "php": "8.2"
+        "php": "8.1"
     },
     "plugin-api-version": "2.6.0"
 }