aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJoas Schilling <213943+nickvergessen@users.noreply.github.com>2024-09-19 10:25:06 +0200
committerGitHub <noreply@github.com>2024-09-19 10:25:06 +0200
commita0cb795f043e27a1ef2f438f655efe690311a9b2 (patch)
treee7a56364223cf3fb44b683e2e3e3d29d3c9c0082
parent854d54dedfec5c74d405fef921b32a9d7564ed4a (diff)
parent0af0bf3d4226eada7278208cb3a80e68e055ec3d (diff)
downloadnextcloud-server-a0cb795f043e27a1ef2f438f655efe690311a9b2.tar.gz
nextcloud-server-a0cb795f043e27a1ef2f438f655efe690311a9b2.zip
Merge pull request #48162 from nextcloud/bugfix/noid/array-keys
fix(autocomplete): Move known array keys to psalm docs
-rw-r--r--apps/files_sharing/tests/Collaboration/ShareRecipientSorterTest.php10
-rw-r--r--lib/public/Collaboration/AutoComplete/IManager.php2
-rw-r--r--lib/public/Collaboration/AutoComplete/ISorter.php2
3 files changed, 7 insertions, 7 deletions
diff --git a/apps/files_sharing/tests/Collaboration/ShareRecipientSorterTest.php b/apps/files_sharing/tests/Collaboration/ShareRecipientSorterTest.php
index 83dde42f37b..2bef0b0e922 100644
--- a/apps/files_sharing/tests/Collaboration/ShareRecipientSorterTest.php
+++ b/apps/files_sharing/tests/Collaboration/ShareRecipientSorterTest.php
@@ -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' => [],
diff --git a/lib/public/Collaboration/AutoComplete/IManager.php b/lib/public/Collaboration/AutoComplete/IManager.php
index 33b4ae0566b..976bbfb7f18 100644
--- a/lib/public/Collaboration/AutoComplete/IManager.php
+++ b/lib/public/Collaboration/AutoComplete/IManager.php
@@ -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);
diff --git a/lib/public/Collaboration/AutoComplete/ISorter.php b/lib/public/Collaboration/AutoComplete/ISorter.php
index 772b1f9c6b9..4b9f2b72e7c 100644
--- a/lib/public/Collaboration/AutoComplete/ISorter.php
+++ b/lib/public/Collaboration/AutoComplete/ISorter.php
@@ -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);