From a6ba77c56eb0b64d8020f658d0749c81bc3a6cae Mon Sep 17 00:00:00 2001
From: Joas Schilling <coding@schilljs.com>
Date: Thu, 23 Jan 2025 10:12:37 +0100
Subject: [PATCH] chore(CI): Adjust testing matrix for Nextcloud 31 on stable31

Signed-off-by: Joas Schilling <coding@schilljs.com>
---
 .github/workflows/integration.yml |  8 ++++----
 composer.json                     |  2 +-
 composer.lock                     | 19 +++++++++----------
 3 files changed, 14 insertions(+), 15 deletions(-)

diff --git a/.github/workflows/integration.yml b/.github/workflows/integration.yml
index b852c145e3..55f77b9d86 100644
--- a/.github/workflows/integration.yml
+++ b/.github/workflows/integration.yml
@@ -54,7 +54,7 @@ jobs:
         code-image: [ 'release', 'nightly' ]
         php-versions: ['8.1']
         databases: ['sqlite']
-        server-versions: ['master']
+        server-versions: ['stable31']
         scenarios: ['wopi', 'direct', 'federation', 'api']
 
     name: integration-${{ matrix.code-image }}-${{ matrix.scenarios }}-${{ matrix.php-versions }}-${{ matrix.databases }}-${{ matrix.server-versions }}
@@ -126,7 +126,7 @@ jobs:
       matrix:
         php-versions: ['8.1']
         databases: ['mysql']
-        server-versions: ['master']
+        server-versions: ['stable31']
         scenarios: ['wopi', 'direct', 'federation', 'api']
 
     name: integration-${{ matrix.scenarios }}-${{ matrix.php-versions }}-${{ matrix.databases }}-${{ matrix.server-versions }}
@@ -205,7 +205,7 @@ jobs:
       matrix:
         php-versions: ['8.1']
         databases: ['pgsql']
-        server-versions: ['master']
+        server-versions: ['stable31']
         scenarios: ['wopi', 'direct', 'federation', 'api']
 
     name: integration-${{ matrix.scenarios }}-${{ matrix.php-versions }}-${{ matrix.databases }}-${{ matrix.server-versions }}
@@ -286,7 +286,7 @@ jobs:
       matrix:
         php-versions: ['8.1']
         databases: ['oci']
-        server-versions: ['master']
+        server-versions: ['stable31']
         scenarios: ['wopi', 'direct', 'federation', 'api']
 
     name: integration-${{ matrix.scenarios }}-${{ matrix.php-versions }}-${{ matrix.databases }}-${{ matrix.server-versions }}
diff --git a/composer.json b/composer.json
index a2246a5b5d..c7553d7b53 100644
--- a/composer.json
+++ b/composer.json
@@ -21,7 +21,7 @@
 		"psalm/phar": "^5.3",
 		"friendsofphp/php-cs-fixer": "^3.8",
 		"nextcloud/coding-standard": "^1.0",
-		"nextcloud/ocp": "dev-master",
+		"nextcloud/ocp": "dev-stable31",
 		"phpunit/phpunit": "^9.5",
 		"bamarni/composer-bin-plugin": "^1.8"
 	},
diff --git a/composer.lock b/composer.lock
index 32fbb3eb67..35c01a2fa1 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": "e2fa29217850c4397522384d4e3de2bb",
+    "content-hash": "0705d8dc1cda3ed8f77f6320fa7f7c69",
     "packages": [],
     "packages-dev": [
         {
@@ -337,30 +337,29 @@
         },
         {
             "name": "nextcloud/ocp",
-            "version": "dev-master",
+            "version": "dev-stable31",
             "source": {
                 "type": "git",
                 "url": "https://github.com/nextcloud-deps/ocp.git",
-                "reference": "ba6108b934c18b629f78c48cca3fc038087f0dec"
+                "reference": "3ac4be37f04642c663a2fc711f3848f69f3713f1"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/nextcloud-deps/ocp/zipball/ba6108b934c18b629f78c48cca3fc038087f0dec",
-                "reference": "ba6108b934c18b629f78c48cca3fc038087f0dec",
+                "url": "https://api.github.com/repos/nextcloud-deps/ocp/zipball/3ac4be37f04642c663a2fc711f3848f69f3713f1",
+                "reference": "3ac4be37f04642c663a2fc711f3848f69f3713f1",
                 "shasum": ""
             },
             "require": {
-                "php": "~8.1 || ~8.2 || ~8.3",
+                "php": "~8.1 || ~8.2 || ~8.3 || ~8.4",
                 "psr/clock": "^1.0",
                 "psr/container": "^2.0.2",
                 "psr/event-dispatcher": "^1.0",
                 "psr/log": "^3.0.2"
             },
-            "default-branch": true,
             "type": "library",
             "extra": {
                 "branch-alias": {
-                    "dev-master": "31.0.0-dev"
+                    "dev-stable31": "31.0.0-dev"
                 }
             },
             "notification-url": "https://packagist.org/downloads/",
@@ -380,9 +379,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/master"
+                "source": "https://github.com/nextcloud-deps/ocp/tree/stable31"
             },
-            "time": "2025-01-17T00:42:09+00:00"
+            "time": "2025-01-23T08:35:12+00:00"
         },
         {
             "name": "nikic/php-parser",