From 0c6a9fd63d3e86d6a90db693addb895a92f8f0da Mon Sep 17 00:00:00 2001 From: nextcloud-command Date: Sun, 24 Sep 2023 02:24:12 +0000 Subject: [PATCH 1/2] chore(dev-deps): Bump nextcloud/ocp package Signed-off-by: GitHub --- composer.lock | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/composer.lock b/composer.lock index a3e939cd4..73865d2c5 100644 --- a/composer.lock +++ b/composer.lock @@ -921,12 +921,12 @@ "source": { "type": "git", "url": "https://github.com/nextcloud-deps/ocp.git", - "reference": "8999be903f6fa719dc26394ce1022f1bff11ae0e" + "reference": "54b06fd311d50109fa02e79165f4df6fac6ed8e5" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/nextcloud-deps/ocp/zipball/8999be903f6fa719dc26394ce1022f1bff11ae0e", - "reference": "8999be903f6fa719dc26394ce1022f1bff11ae0e", + "url": "https://api.github.com/repos/nextcloud-deps/ocp/zipball/54b06fd311d50109fa02e79165f4df6fac6ed8e5", + "reference": "54b06fd311d50109fa02e79165f4df6fac6ed8e5", "shasum": "" }, "require": { @@ -958,7 +958,7 @@ "issues": "https://github.com/nextcloud-deps/ocp/issues", "source": "https://github.com/nextcloud-deps/ocp/tree/master" }, - "time": "2023-09-12T00:29:25+00:00" + "time": "2023-09-21T00:30:50+00:00" }, { "name": "nikic/php-parser", @@ -3929,5 +3929,5 @@ "platform-overrides": { "php": "8.0.2" }, - "plugin-api-version": "2.3.0" + "plugin-api-version": "2.6.0" } From cac988fd2b2c3ac6b569bca7d24be70377f26c8e Mon Sep 17 00:00:00 2001 From: Joas Schilling Date: Mon, 25 Sep 2023 12:56:31 +0200 Subject: [PATCH 2/2] fix(autoloader): Fix dev autoloader overwriting OCP Signed-off-by: Joas Schilling --- composer.json | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/composer.json b/composer.json index 954965618..b21ad34cf 100644 --- a/composer.json +++ b/composer.json @@ -1,7 +1,6 @@ { - "autoload-dev": { + "autoload": { "psr-4": { - "OCP\\": "vendor/nextcloud/ocp/OCP", "OCA\\Notifications\\": "lib/" } },