wbrawner/server
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Merge pull request #22570 from owncloud/make-method-non-public

Browse source 
Make FilesReportPlugin::processFilterRules non-public
This commit is contained in:
Thomas Müller 2016-02-22 18:39:10 +01:00
commit d45314beda
2 changed files with 9 additions and 9 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
apps/dav/lib/connector/sabre/filesreportplugin.php
View file

@ -209,7 +209,7 @@ class FilesReportPlugin extends ServerPlugin {
*
* @throws TagNotFoundException whenever a tag was not found
*/
public function processFilterRules($filterRules) {
protected function processFilterRules($filterRules) {
$ns = '{' . $this::NS_OWNCLOUD . '}';
$resultFileIds = null;
$systemTagIds = [];

16
apps/dav/tests/unit/connector/sabre/filesreportplugin.php
View file

@ -376,7 +376,7 @@ class FilesReportPlugin extends \Test\TestCase {
['name' => '{http://owncloud.org/ns}systemtag', 'value' => '123'],
];
$this->assertEquals(['111', '222'], $this->plugin->processFilterRules($rules));
$this->assertEquals(['111', '222'], $this->invokePrivate($this->plugin, 'processFilterRules', [$rules]));
}
public function testProcessFilterRulesAndCondition() {
@ -400,7 +400,7 @@ class FilesReportPlugin extends \Test\TestCase {
['name' => '{http://owncloud.org/ns}systemtag', 'value' => '456'],
];
$this->assertEquals(['222'], array_values($this->plugin->processFilterRules($rules)));
$this->assertEquals(['222'], array_values($this->invokePrivate($this->plugin, 'processFilterRules', [$rules])));
}
public function testProcessFilterRulesAndConditionWithOneEmptyResult() {
@ -424,7 +424,7 @@ class FilesReportPlugin extends \Test\TestCase {
['name' => '{http://owncloud.org/ns}systemtag', 'value' => '456'],
];
$this->assertEquals([], array_values($this->plugin->processFilterRules($rules)));
$this->assertEquals([], array_values($this->invokePrivate($this->plugin, 'processFilterRules', [$rules])));
}
public function testProcessFilterRulesAndConditionWithFirstEmptyResult() {
@ -448,7 +448,7 @@ class FilesReportPlugin extends \Test\TestCase {
['name' => '{http://owncloud.org/ns}systemtag', 'value' => '456'],
];
$this->assertEquals([], array_values($this->plugin->processFilterRules($rules)));
$this->assertEquals([], array_values($this->invokePrivate($this->plugin, 'processFilterRules', [$rules])));
}
public function testProcessFilterRulesAndConditionWithEmptyMidResult() {
@ -475,7 +475,7 @@ class FilesReportPlugin extends \Test\TestCase {
['name' => '{http://owncloud.org/ns}systemtag', 'value' => '789'],
];
$this->assertEquals([], array_values($this->plugin->processFilterRules($rules)));
$this->assertEquals([], array_values($this->invokePrivate($this->plugin, 'processFilterRules', [$rules])));
}
public function testProcessFilterRulesInvisibleTagAsAdmin() {
@ -517,7 +517,7 @@ class FilesReportPlugin extends \Test\TestCase {
['name' => '{http://owncloud.org/ns}systemtag', 'value' => '456'],
];
$this->assertEquals(['222'], array_values($this->plugin->processFilterRules($rules)));
$this->assertEquals(['222'], array_values($this->invokePrivate($this->plugin, 'processFilterRules', [$rules])));
}
/**
@ -554,7 +554,7 @@ class FilesReportPlugin extends \Test\TestCase {
['name' => '{http://owncloud.org/ns}systemtag', 'value' => '456'],
];
$this->plugin->processFilterRules($rules);
$this->invokePrivate($this->plugin, 'processFilterRules', [$rules]);
}
public function testProcessFilterRulesVisibleTagAsUser() {
@ -597,6 +597,6 @@ class FilesReportPlugin extends \Test\TestCase {
['name' => '{http://owncloud.org/ns}systemtag', 'value' => '456'],
];
$this->assertEquals(['222'], array_values($this->plugin->processFilterRules($rules)));
$this->assertEquals(['222'], array_values($this->invokePrivate($this->plugin, 'processFilterRules', [$rules])));
}
}