mbk-lab
/
nextcloud
2
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

adjust to moved repair step 

Signed-off-by: Robin Appelman <robin@icewind.nl>
This commit is contained in:
Robin Appelman 2017-06-29 14:45:08 +02:00
parent d422875ae4
commit 64d0a0ffc9
No known key found for this signature in database
GPG Key ID: CBCA68FBAEBF98C9
3 changed files with 14 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
lib/private/Repair.php
View File

@ -145,7 +145,7 @@ class Repair implements IOutput{
\OC::$server->getConfig(), \OC::$server->getConfig(),
\OC::$server->query(Installer::class) \OC::$server->query(Installer::class)
), ),
new RepairInvalidPaths(\OC::$server->getDatabaseConnection()) new RepairInvalidPaths(\OC::$server->getDatabaseConnection(), \OC::$server->getConfig())
]; ];
} }

6
lib/private/Repair/NC13/RepairInvalidPaths.php
View File

@ -22,6 +22,7 @@
namespace OC\Repair\NC13; namespace OC\Repair\NC13;
use OCP\IConfig;
use OCP\IDBConnection; use OCP\IDBConnection;
use OCP\Migration\IOutput; use OCP\Migration\IOutput;
use OCP\Migration\IRepairStep; use OCP\Migration\IRepairStep;
@ -29,9 +30,12 @@ use OCP\Migration\IRepairStep;
class RepairInvalidPaths implements IRepairStep { class RepairInvalidPaths implements IRepairStep {
/** @var IDBConnection */ /** @var IDBConnection */
private $connection; private $connection;
/** @var IConfig */
private $config;
public function __construct(IDBConnection $connection) { public function __construct(IDBConnection $connection, IConfig $config) {
$this->connection = $connection; $this->connection = $connection;
$this->config = $config;
} }

10
tests/lib/Repair/RepairInvalidPathsTest.php
View File

@ -23,7 +23,8 @@ namespace Test\Repair;
use OC\Files\Cache\Cache; use OC\Files\Cache\Cache;
use OC\Files\Storage\Temporary; use OC\Files\Storage\Temporary;
use OC\Repair\RepairInvalidPaths; use OC\Repair\NC13\RepairInvalidPaths;
use OCP\IConfig;
use OCP\Migration\IOutput; use OCP\Migration\IOutput;
use Test\TestCase; use Test\TestCase;
@ -43,7 +44,12 @@ class RepairInvalidPathsTest extends TestCase {
$this->storage = new Temporary(); $this->storage = new Temporary();
$this->cache = $this->storage->getCache(); $this->cache = $this->storage->getCache();
$this->repair = new RepairInvalidPaths(\OC::$server->getDatabaseConnection()); $config = $this->createMock(IConfig::class);
$config->expects($this->any())
->method('getSystemValue')
->with('version', '0.0.0')
->willReturn('12.0.0.0');
$this->repair = new RepairInvalidPaths(\OC::$server->getDatabaseConnection(), $config);
} }
protected function tearDown() { protected function tearDown() {