upstream/nextcloud
1
0
Fork 0
mirror of https://github.com/nextcloud/server.git synced 2026-04-22 23:03:00 -04:00
Code Issues Projects Releases Packages Wiki Activity Actions 56

Merge pull request #48162 from nextcloud/bugfix/noid/array-keys

Browse source 
fix(autocomplete): Move known array keys to psalm docs
This commit is contained in:
Joas Schilling 2024-09-19 10:25:06 +02:00 committed by GitHub
commit a0cb795f04
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
3 changed files with 7 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

10
apps/files_sharing/tests/Collaboration/ShareRecipientSorterTest.php
View file

@ -109,7 +109,7 @@ class ShareRecipientSorterTest extends TestCase {
]
];
$workArray = $originalArray;
$this->sorter->sort($workArray, ['itemType' => 'files', 'itemId' => 404]);
$this->sorter->sort($workArray, ['itemType' => 'files', 'itemId' => '404']);
$this->assertEquals($originalArray, $workArray);
}
@ -118,7 +118,7 @@ class ShareRecipientSorterTest extends TestCase {
return [[
[
#0 – sort properly and otherwise keep existing order
'context' => ['itemType' => 'files', 'itemId' => 42],
'context' => ['itemType' => 'files', 'itemId' => '42'],
'accessList' => ['users' => ['celia', 'darius', 'faruk', 'gail'], 'bots' => ['r2-d2']],
'input' => [
'users' =>
@ -155,7 +155,7 @@ class ShareRecipientSorterTest extends TestCase {
],
[
#1 – no recipients
'context' => ['itemType' => 'files', 'itemId' => 42],
'context' => ['itemType' => 'files', 'itemId' => '42'],
'accessList' => ['users' => false],
'input' => [
'users' =>
@ -192,7 +192,7 @@ class ShareRecipientSorterTest extends TestCase {
],
[
#2 – unsupported item type
'context' => ['itemType' => 'announcements', 'itemId' => 42],
'context' => ['itemType' => 'announcements', 'itemId' => '42'],
'accessList' => null, // not needed
'input' => [
'users' =>
@ -229,7 +229,7 @@ class ShareRecipientSorterTest extends TestCase {
],
[
#3 – no nothing
'context' => ['itemType' => 'files', 'itemId' => 42],
'context' => ['itemType' => 'files', 'itemId' => '42'],
'accessList' => [],
'input' => [],
'expected' => [],

2
lib/public/Collaboration/AutoComplete/IManager.php
View file

@ -20,7 +20,7 @@ interface IManager {
/**
* @param array $sorters list of sorter IDs, separated by "|"
* @param array $sortArray array representation of OCP\Collaboration\Collaborators\ISearchResult
* @param array $context context info of the search, keys: itemType, itemId
* @param array{itemType: string, itemId: string, search?: string} $context context info of the search
* @since 13.0.0
*/
public function runSorters(array $sorters, array &$sortArray, array $context);

2
lib/public/Collaboration/AutoComplete/ISorter.php
View file

@ -23,7 +23,7 @@ interface ISorter {
* executes the sort action
*
* @param array $sortArray the array to be sorted, provided as reference
* @param array $context carries key 'itemType' and 'itemId' of the source object (e.g. a file)
* @param array{itemType: string, itemId: string, search?: string} $context carries key 'itemType' and 'itemId' of the source object (e.g. a file)
* @since 13.0.0
*/
public function sort(array &$sortArray, array $context);