From fd5afe527656397900e296974f30963ea10f7645 Mon Sep 17 00:00:00 2001 From: Joas Schilling Date: Fri, 15 May 2026 12:17:15 +0200 Subject: [PATCH] chore(CI): Adjust testing matrix for Nextcloud 34 on stable34 Signed-off-by: Joas Schilling --- .github/workflows/integration.yml | 2 +- composer.json | 2 +- composer.lock | 127 +++++++++++++++++++++++++++--- 3 files changed, 118 insertions(+), 13 deletions(-) diff --git a/.github/workflows/integration.yml b/.github/workflows/integration.yml index f9a4bea..f0483e6 100644 --- a/.github/workflows/integration.yml +++ b/.github/workflows/integration.yml @@ -29,7 +29,7 @@ jobs: matrix: php-versions: ['8.1', '8.2', '8.3'] databases: ['sqlite'] - server-versions: ['master'] + server-versions: ['stable34'] name: integration-php${{ matrix.php-versions }}-${{ matrix.databases }} diff --git a/composer.json b/composer.json index de5f4de..158237c 100644 --- a/composer.json +++ b/composer.json @@ -48,7 +48,7 @@ "require-dev": { "phpunit/phpunit": "^9.5", "nextcloud/coding-standard": "^1.4", - "nextcloud/ocp": "dev-master" + "nextcloud/ocp": "dev-stable34" }, "extra": { "patches": { diff --git a/composer.lock b/composer.lock index 7456d92..f461371 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": "4f945b7ff92dc54b33fe0c7b4afef6dd", + "content-hash": "ec04a1bbc6b336cd434a362566e1c837", "packages": [ { "name": "bamarni/composer-bin-plugin", @@ -471,30 +471,30 @@ }, { "name": "nextcloud/ocp", - "version": "dev-master", + "version": "dev-stable34", "source": { "type": "git", "url": "https://github.com/nextcloud-deps/ocp.git", - "reference": "ba6108b934c18b629f78c48cca3fc038087f0dec" + "reference": "72de02fbad95545055983d050e564fe39128992d" }, "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/72de02fbad95545055983d050e564fe39128992d", + "reference": "72de02fbad95545055983d050e564fe39128992d", "shasum": "" }, "require": { - "php": "~8.1 || ~8.2 || ~8.3", + "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", + "psr/http-client": "^1.0.3", "psr/log": "^3.0.2" }, - "default-branch": true, "type": "library", "extra": { "branch-alias": { - "dev-master": "31.0.0-dev" + "dev-stable34": "34.0.0-dev" } }, "notification-url": "https://packagist.org/downloads/", @@ -514,9 +514,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/stable34" }, - "time": "2025-01-17T00:42:09+00:00" + "time": "2026-05-15T08:43:27+00:00" }, { "name": "nikic/php-parser", @@ -1319,6 +1319,111 @@ }, "time": "2019-01-08T18:20:26+00:00" }, + { + "name": "psr/http-client", + "version": "1.0.3", + "source": { + "type": "git", + "url": "https://github.com/php-fig/http-client.git", + "reference": "bb5906edc1c324c9a05aa0873d40117941e5fa90" + }, + "dist": { + "type": "zip", + "url": "https://api.github.com/repos/php-fig/http-client/zipball/bb5906edc1c324c9a05aa0873d40117941e5fa90", + "reference": "bb5906edc1c324c9a05aa0873d40117941e5fa90", + "shasum": "" + }, + "require": { + "php": "^7.0 || ^8.0", + "psr/http-message": "^1.0 || ^2.0" + }, + "type": "library", + "extra": { + "branch-alias": { + "dev-master": "1.0.x-dev" + } + }, + "autoload": { + "psr-4": { + "Psr\\Http\\Client\\": "src/" + } + }, + "notification-url": "https://packagist.org/downloads/", + "license": [ + "MIT" + ], + "authors": [ + { + "name": "PHP-FIG", + "homepage": "https://www.php-fig.org/" + } + ], + "description": "Common interface for HTTP clients", + "homepage": "https://github.com/php-fig/http-client", + "keywords": [ + "http", + "http-client", + "psr", + "psr-18" + ], + "support": { + "source": "https://github.com/php-fig/http-client" + }, + "time": "2023-09-23T14:17:50+00:00" + }, + { + "name": "psr/http-message", + "version": "2.0", + "source": { + "type": "git", + "url": "https://github.com/php-fig/http-message.git", + "reference": "402d35bcb92c70c026d1a6a9883f06b2ead23d71" + }, + "dist": { + "type": "zip", + "url": "https://api.github.com/repos/php-fig/http-message/zipball/402d35bcb92c70c026d1a6a9883f06b2ead23d71", + "reference": "402d35bcb92c70c026d1a6a9883f06b2ead23d71", + "shasum": "" + }, + "require": { + "php": "^7.2 || ^8.0" + }, + "type": "library", + "extra": { + "branch-alias": { + "dev-master": "2.0.x-dev" + } + }, + "autoload": { + "psr-4": { + "Psr\\Http\\Message\\": "src/" + } + }, + "notification-url": "https://packagist.org/downloads/", + "license": [ + "MIT" + ], + "authors": [ + { + "name": "PHP-FIG", + "homepage": "https://www.php-fig.org/" + } + ], + "description": "Common interface for HTTP messages", + "homepage": "https://github.com/php-fig/http-message", + "keywords": [ + "http", + "http-message", + "psr", + "psr-7", + "request", + "response" + ], + "support": { + "source": "https://github.com/php-fig/http-message/tree/2.0" + }, + "time": "2023-04-04T09:54:51+00:00" + }, { "name": "psr/log", "version": "3.0.2", @@ -2395,5 +2500,5 @@ "platform-overrides": { "php": "8.1" }, - "plugin-api-version": "2.6.0" + "plugin-api-version": "2.9.0" }