From 86161a5ca017ff6d1c5d0b32b36a51628f4029ce Mon Sep 17 00:00:00 2001 From: Max Date: Wed, 2 Sep 2026 05:34:23 +0200 Subject: [PATCH] chore(upgrade) nextcloud/ocp and fix deprecation Signed-off-by: Max --- composer.lock | 14 ++++---- lib/Controller/UserApiController.php | 2 +- .../unit/Controller/UserApiControllerTest.php | 2 +- vendor-bin/rector/composer.lock | 33 +++++++++---------- 4 files changed, 24 insertions(+), 27 deletions(-) diff --git a/composer.lock b/composer.lock index da2c34a395e..0c893419960 100644 --- a/composer.lock +++ b/composer.lock @@ -297,12 +297,12 @@ "source": { "type": "git", "url": "https://github.com/nextcloud-deps/ocp.git", - "reference": "8e0d2537bab13824ede074f334a40432a4bc0367" + "reference": "a56e4e2962b4f338b3233fea1fb2940d372440d7" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/nextcloud-deps/ocp/zipball/8e0d2537bab13824ede074f334a40432a4bc0367", - "reference": "8e0d2537bab13824ede074f334a40432a4bc0367", + "url": "https://api.github.com/repos/nextcloud-deps/ocp/zipball/a56e4e2962b4f338b3233fea1fb2940d372440d7", + "reference": "a56e4e2962b4f338b3233fea1fb2940d372440d7", "shasum": "" }, "require": { @@ -343,7 +343,7 @@ "issues": "https://github.com/nextcloud-deps/ocp/issues", "source": "https://github.com/nextcloud-deps/ocp/tree/master" }, - "time": "2026-08-29T04:41:42+00:00" + "time": "2026-09-02T01:51:46+00:00" }, { "name": "nikic/php-parser", @@ -3841,8 +3841,8 @@ "aliases": [], "minimum-stability": "stable", "stability-flags": { - "nextcloud/ocp": 20, - "roave/security-advisories": 20 + "roave/security-advisories": 20, + "nextcloud/ocp": 20 }, "prefer-stable": false, "prefer-lowest": false, @@ -3855,5 +3855,5 @@ "platform-overrides": { "php": "8.3" }, - "plugin-api-version": "2.9.0" + "plugin-api-version": "2.6.0" } diff --git a/lib/Controller/UserApiController.php b/lib/Controller/UserApiController.php index f960176f4f4..5096b1af870 100644 --- a/lib/Controller/UserApiController.php +++ b/lib/Controller/UserApiController.php @@ -56,7 +56,7 @@ public function index(string $filter = '', int $limit = 5): DataResponse { if (!$this->getSession()->isGuest()) { // Add other users to the autocomplete list - [$result] = $this->collaboratorSearch->search($filter, [IShare::TYPE_USER], false, $limit, 0); + [$result] = $this->collaboratorSearch->filteredSearch($filter, [IShare::TYPE_USER], false, 'file', null, $limit, 0); $userSearch = array_merge($result['users'], $result['exact']['users']); foreach ($userSearch as ['label' => $label, 'value' => $value]) { diff --git a/tests/unit/Controller/UserApiControllerTest.php b/tests/unit/Controller/UserApiControllerTest.php index 9d4c3bfc8ba..19f014ab3bb 100644 --- a/tests/unit/Controller/UserApiControllerTest.php +++ b/tests/unit/Controller/UserApiControllerTest.php @@ -73,7 +73,7 @@ public function testUsersIndex(int $documentId, int $sessionId, string $sessionT ->willReturn('Administrator'); $this->collaboratorSearch ->expects($this->once()) - ->method('search')->willReturn([ + ->method('filteredSearch')->willReturn([ [ 'exact' => [ 'users' => [] diff --git a/vendor-bin/rector/composer.lock b/vendor-bin/rector/composer.lock index 49e4c282e3c..42862e8c267 100644 --- a/vendor-bin/rector/composer.lock +++ b/vendor-bin/rector/composer.lock @@ -123,11 +123,11 @@ }, { "name": "phpstan/phpstan", - "version": "2.2.9", + "version": "2.2.12", "dist": { "type": "zip", - "url": "https://api.github.com/repos/phpstan/phpstan/zipball/13d6b4f347bad222da436580c8304fa6f83e6bd0", - "reference": "13d6b4f347bad222da436580c8304fa6f83e6bd0", + "url": "https://api.github.com/repos/phpstan/phpstan/zipball/174b0d88710f00a42598886504dd7a146f91ace5", + "reference": "174b0d88710f00a42598886504dd7a146f91ace5", "shasum": "" }, "require": { @@ -183,7 +183,7 @@ "type": "github" } ], - "time": "2026-08-22T07:38:16+00:00" + "time": "2026-08-31T19:09:43+00:00" }, { "name": "psr/clock", @@ -493,21 +493,21 @@ }, { "name": "rector/rector", - "version": "2.6.4", + "version": "2.6.5", "source": { "type": "git", "url": "https://github.com/rectorphp/rector.git", - "reference": "6ff008471683591224951526247b7a2b86980ba9" + "reference": "f8686605798c755456327a3597201c3b5be76294" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/rectorphp/rector/zipball/6ff008471683591224951526247b7a2b86980ba9", - "reference": "6ff008471683591224951526247b7a2b86980ba9", + "url": "https://api.github.com/repos/rectorphp/rector/zipball/f8686605798c755456327a3597201c3b5be76294", + "reference": "f8686605798c755456327a3597201c3b5be76294", "shasum": "" }, "require": { "php": "^7.4|^8.0", - "phpstan/phpstan": "^2.2.6" + "phpstan/phpstan": "^2.2.10" }, "conflict": { "rector/rector-doctrine": "*", @@ -515,9 +515,6 @@ "rector/rector-phpunit": "*", "rector/rector-symfony": "*" }, - "suggest": { - "ext-dom": "To manipulate phpunit.xml via the custom-rule command" - }, "bin": [ "bin/rector" ], @@ -541,7 +538,7 @@ ], "support": { "issues": "https://github.com/rectorphp/rector/issues", - "source": "https://github.com/rectorphp/rector/tree/2.6.4" + "source": "https://github.com/rectorphp/rector/tree/2.6.5" }, "funding": [ { @@ -549,7 +546,7 @@ "type": "github" } ], - "time": "2026-08-27T09:20:34+00:00" + "time": "2026-08-30T22:02:04+00:00" }, { "name": "webmozart/assert", @@ -612,10 +609,10 @@ ], "aliases": [], "minimum-stability": "stable", - "stability-flags": {}, + "stability-flags": [], "prefer-stable": false, "prefer-lowest": false, - "platform": {}, - "platform-dev": {}, - "plugin-api-version": "2.9.0" + "platform": [], + "platform-dev": [], + "plugin-api-version": "2.6.0" }