upstream/nextcloud
1
0
Fork 0
mirror of https://github.com/nextcloud/server.git synced 2026-05-28 04:32:30 -04:00
Code Issues Projects Releases Packages Wiki Activity Actions 25

fix: cominbation of small fixes

Browse source 
- possible null return
- parameter name mismatch in implementation
- incomplete unit test

Signed-off-by: Arthur Schiwon <blizzz@arthur-schiwon.de>
This commit is contained in:
Arthur Schiwon 2023-06-21 18:01:49 +02:00
parent d21b251a85
commit 1ffae9d110
No known key found for this signature in database
GPG key ID: 7424F1874854DF23
3 changed files with 25 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
apps/dav/lib/Connector/Sabre/FilesReportPlugin.php
View file

@ -284,9 +284,9 @@ class FilesReportPlugin extends ServerPlugin {
* @param array $filterRules
* @return array array of unique file id results
*/
protected function processFilterRulesForFileIDs($filterRules) {
protected function processFilterRulesForFileIDs(array $filterRules): array {
$ns = '{' . $this::NS_OWNCLOUD . '}';
$resultFileIds = null;
$resultFileIds = [];
$circlesIds = [];
$favoriteFilter = null;
foreach ($filterRules as $filterRule) {
@ -407,7 +407,7 @@ class FilesReportPlugin extends ServerPlugin {
* @param array $fileIds file ids
* @return Node[] array of Sabre nodes
*/
public function findNodesByFileIds($rootNode, $fileIds): array {
public function findNodesByFileIds(Node $rootNode, array $fileIds): array {
if (empty($fileIds)) {
return [];
}

23
apps/dav/tests/unit/Connector/Sabre/FilesReportPluginTest.php
View file

@ -889,13 +889,26 @@ class FilesReportPluginTest extends \Test\TestCase {
->willReturn([$tag1, $tag2]);
$filesNode1 = $this->createMock(File::class);
$filesNode1->expects($this->any())
->method('getId')
->willReturn(111);
$filesNode1->expects($this->any())
->method('getSize')
->willReturn(12);
$filesNode2 = $this->createMock(Folder::class);
$filesNode2->expects($this->any())
->method('getId')
->willReturn(222);
$filesNode2->expects($this->any())
->method('getSize')
->willReturn(10);
$filesNode3 = $this->createMock(Folder::class);
$filesNode3->expects($this->any())
->method('getId')
->willReturn(333);
$filesNode3->expects($this->any())
->method('getSize')
->willReturn(33);
$this->tagManager->expects($this->once())
->method('getTagsByIds')
@ -903,16 +916,20 @@ class FilesReportPluginTest extends \Test\TestCase {
->willReturn([$tag1, $tag2]);
// main assertion: only user visible tags are being passed through.
$this->userFolder->expects($this->exactly(1))
$this->userFolder->expects($this->exactly(2))
->method('searchBySystemTag')
->with('FourFiveSix', $this->anything(), $this->anything(), $this->anything());
->withConsecutive(['OneTwoThree'], ['FourFiveSix'])
->willReturnOnConsecutiveCalls(
[$filesNode1, $filesNode2],
[$filesNode2, $filesNode3],
);
$rules = [
['name' => '{http://owncloud.org/ns}systemtag', 'value' => '123'],
['name' => '{http://owncloud.org/ns}systemtag', 'value' => '456'],
];
$this->invokePrivate($this->plugin, 'processFilterRulesForFileNodes', [$rules, null, null]);
$this->assertEquals([$filesNode2], array_values($this->invokePrivate($this->plugin, 'processFilterRulesForFileNodes', [$rules, null, null])));
}
public function testProcessFavoriteFilter(): void {

4
lib/private/Files/Node/Folder.php
View file

@ -301,8 +301,8 @@ class Folder extends Node implements \OCP\Files\Folder {
return $this->search($query);
}
public function searchBySystemTag(string $tag, string $userId, int $limit = 0, int $offset = 0): array {
$query = $this->queryFromOperator(new SearchComparison(ISearchComparison::COMPARE_EQUAL, 'systemtag', $tag), $userId, $limit, $offset);
public function searchBySystemTag(string $tagName, string $userId, int $limit = 0, int $offset = 0): array {
$query = $this->queryFromOperator(new SearchComparison(ISearchComparison::COMPARE_EQUAL, 'systemtag', $tagName), $userId, $limit, $offset);
return $this->search($query);
}