Browse Source
Merge pull request #23157 from owncloud/remove-share-prop-entries
Merge pull request #23157 from owncloud/remove-share-prop-entries
remove old share propagation entries from appconfigremotes/origin/files-consistentpermsformountpoint
3 changed files with 105 additions and 0 deletions
-
2lib/private/repair.php
-
52lib/private/repair/sharepropagation.php
-
51tests/lib/repair/repairsharepropagation.php
@ -0,0 +1,52 @@ |
|||
<?php |
|||
/** |
|||
* @author Georg Ehrke <georg@owncloud.com> |
|||
* |
|||
* @copyright Copyright (c) 2016, ownCloud, Inc. |
|||
* @license AGPL-3.0 |
|||
* |
|||
* This code is free software: you can redistribute it and/or modify |
|||
* it under the terms of the GNU Affero General Public License, version 3, |
|||
* as published by the Free Software Foundation. |
|||
* |
|||
* This program is distributed in the hope that it will be useful, |
|||
* but WITHOUT ANY WARRANTY; without even the implied warranty of |
|||
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the |
|||
* GNU Affero General Public License for more details. |
|||
* |
|||
* You should have received a copy of the GNU Affero General Public License, version 3, |
|||
* along with this program. If not, see <http://www.gnu.org/licenses/> |
|||
* |
|||
*/ |
|||
namespace OC\Repair; |
|||
|
|||
use OC\Hooks\BasicEmitter; |
|||
use OCP\IConfig; |
|||
|
|||
class SharePropagation extends BasicEmitter implements \OC\RepairStep { |
|||
/** @var IConfig */ |
|||
private $config; |
|||
|
|||
/** |
|||
* SharePropagation constructor. |
|||
* |
|||
* @param IConfig $config |
|||
*/ |
|||
public function __construct(IConfig $config) { |
|||
$this->config = $config; |
|||
} |
|||
|
|||
public function getName() { |
|||
return 'Remove old share propagation app entries'; |
|||
} |
|||
|
|||
public function run() { |
|||
$keys = $this->config->getAppKeys('files_sharing'); |
|||
|
|||
foreach ($keys as $key) { |
|||
if (is_numeric($key)) { |
|||
$this->config->deleteAppValue('files_sharing', $key); |
|||
} |
|||
} |
|||
} |
|||
} |
@ -0,0 +1,51 @@ |
|||
<?php |
|||
/** |
|||
* Copyright (c) 2016 Robin Appelman <icewind@owncloud.com> |
|||
* This file is licensed under the Affero General Public License version 3 or |
|||
* later. |
|||
* See the COPYING-README file. |
|||
*/ |
|||
|
|||
namespace Test\Repair; |
|||
|
|||
use OC\Repair\SharePropagation; |
|||
|
|||
class RepairSharePropagation extends \Test\TestCase { |
|||
public function keyProvider() { |
|||
return [ |
|||
[['1', '2'], ['1', '2']], |
|||
[['1', '2', 'foo'], ['1', '2']], |
|||
[['foo'], []], |
|||
]; |
|||
} |
|||
|
|||
/** |
|||
* @dataProvider keyProvider |
|||
* @param array $startKeys |
|||
* @param array $expectedRemovedKeys |
|||
*/ |
|||
public function testRemovePropagationEntries(array $startKeys, array $expectedRemovedKeys) { |
|||
/** @var \PHPUnit_Framework_MockObject_MockObject|\OCP\IConfig $config */ |
|||
$config = $this->getMock('\OCP\IConfig'); |
|||
$config->expects($this->once()) |
|||
->method('getAppKeys') |
|||
->with('files_sharing') |
|||
->will($this->returnValue($startKeys)); |
|||
|
|||
$removedKeys = []; |
|||
|
|||
$config->expects($this->any()) |
|||
->method('deleteAppValue') |
|||
->will($this->returnCallback(function ($app, $key) use (&$removedKeys) { |
|||
$removedKeys[] = $key; |
|||
})); |
|||
|
|||
$step = new SharePropagation($config); |
|||
$step->run(); |
|||
|
|||
sort($expectedRemovedKeys); |
|||
sort($removedKeys); |
|||
|
|||
$this->assertEquals($expectedRemovedKeys, $removedKeys); |
|||
} |
|||
} |
Write
Preview
Loading…
Cancel
Save
Reference in new issue