From 1a848f050c659b41c15a0a1d202cf991d98fc009 Mon Sep 17 00:00:00 2001 From: znerol Date: Thu, 27 Jul 2023 12:44:42 +0200 Subject: [PATCH 1/2] Fix composer lock after updating nextcloud/ocp --- composer.lock | 15 ++++++++------- 1 file changed, 8 insertions(+), 7 deletions(-) diff --git a/composer.lock b/composer.lock index bbc3ee0..e75a7fd 100644 --- a/composer.lock +++ b/composer.lock @@ -1191,16 +1191,16 @@ }, { "name": "nextcloud/ocp", - "version": "v24.0.1", + "version": "v26.0.4", "source": { "type": "git", "url": "https://github.com/nextcloud-deps/ocp.git", - "reference": "f032acdff1502a7323f95a6524d163290f43b446" + "reference": "6f0ffec5ace13e71f50d0735c0258fc37f4ca562" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/nextcloud-deps/ocp/zipball/f032acdff1502a7323f95a6524d163290f43b446", - "reference": "f032acdff1502a7323f95a6524d163290f43b446", + "url": "https://api.github.com/repos/nextcloud-deps/ocp/zipball/6f0ffec5ace13e71f50d0735c0258fc37f4ca562", + "reference": "6f0ffec5ace13e71f50d0735c0258fc37f4ca562", "shasum": "" }, "require": { @@ -1212,7 +1212,7 @@ "type": "library", "extra": { "branch-alias": { - "dev-master": "24.0.0-dev" + "dev-master": "26.0.0-dev" } }, "notification-url": "https://packagist.org/downloads/", @@ -1227,9 +1227,10 @@ ], "description": "Composer package containing Nextcloud's public API (classes, interfaces)", "support": { - "source": "https://github.com/nextcloud-deps/ocp/tree/v24.0.1" + "issues": "https://github.com/nextcloud-deps/ocp/issues", + "source": "https://github.com/nextcloud-deps/ocp/tree/v26.0.4" }, - "time": "2022-06-02T14:16:47+00:00" + "time": "2023-07-17T09:26:46+00:00" }, { "name": "nikic/php-parser", From a65f7071bf015622f0927619168d1dac2b1affd9 Mon Sep 17 00:00:00 2001 From: znerol Date: Thu, 27 Jul 2023 13:15:52 +0200 Subject: [PATCH 2/2] Allow to upgrade psr/container symfony/service-contracts when installing deps --- .github/workflows/static.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/static.yml b/.github/workflows/static.yml index 4d84b74..96cd02e 100644 --- a/.github/workflows/static.yml +++ b/.github/workflows/static.yml @@ -21,7 +21,7 @@ jobs: - name: Install dependencies run: composer i - name: Install dependencies - run: composer require --dev nextcloud/ocp:${{ matrix.ocp-version }} + run: composer require --dev nextcloud/ocp:${{ matrix.ocp-version }} psr/container symfony/service-contracts - name: Run coding standards check run: composer run psalm