From f01bd935edc92b8838f67f3db7edd3d0a0d32188 Mon Sep 17 00:00:00 2001
From: Robin Appelman <robin@icewind.nl>
Date: Thu, 29 Jun 2017 14:45:08 +0200
Subject: [PATCH] adjust to moved repair step

Signed-off-by: Robin Appelman <robin@icewind.nl>
---
 lib/private/Repair.php                         |  2 +-
 lib/private/Repair/NC13/RepairInvalidPaths.php |  6 +++++-
 tests/lib/Repair/RepairInvalidPathsTest.php    | 10 ++++++++--
 3 files changed, 14 insertions(+), 4 deletions(-)

diff --git a/lib/private/Repair.php b/lib/private/Repair.php
index 5b030e0b8a..320f39d9a6 100644
--- a/lib/private/Repair.php
+++ b/lib/private/Repair.php
@@ -164,7 +164,7 @@ class Repair implements IOutput{
 				\OC::$server->getConfig()
 			),
 			new FixMountStorages(\OC::$server->getDatabaseConnection()),
-			new RepairInvalidPaths(\OC::$server->getDatabaseConnection())
+			new RepairInvalidPaths(\OC::$server->getDatabaseConnection(), \OC::$server->getConfig())
 		];
 	}
 
diff --git a/lib/private/Repair/NC13/RepairInvalidPaths.php b/lib/private/Repair/NC13/RepairInvalidPaths.php
index 8551f8261e..076fbb735c 100644
--- a/lib/private/Repair/NC13/RepairInvalidPaths.php
+++ b/lib/private/Repair/NC13/RepairInvalidPaths.php
@@ -22,6 +22,7 @@
 namespace OC\Repair\NC13;
 
 
+use OCP\IConfig;
 use OCP\IDBConnection;
 use OCP\Migration\IOutput;
 use OCP\Migration\IRepairStep;
@@ -29,9 +30,12 @@ use OCP\Migration\IRepairStep;
 class RepairInvalidPaths implements IRepairStep {
 	/** @var IDBConnection */
 	private $connection;
+	/** @var IConfig */
+	private $config;
 
-	public function __construct(IDBConnection $connection) {
+	public function __construct(IDBConnection $connection, IConfig $config) {
 		$this->connection = $connection;
+		$this->config = $config;
 	}
 
 
diff --git a/tests/lib/Repair/RepairInvalidPathsTest.php b/tests/lib/Repair/RepairInvalidPathsTest.php
index c6c1bbb19b..b18758585c 100644
--- a/tests/lib/Repair/RepairInvalidPathsTest.php
+++ b/tests/lib/Repair/RepairInvalidPathsTest.php
@@ -23,7 +23,8 @@ namespace Test\Repair;
 
 use OC\Files\Cache\Cache;
 use OC\Files\Storage\Temporary;
-use OC\Repair\RepairInvalidPaths;
+use OC\Repair\NC13\RepairInvalidPaths;
+use OCP\IConfig;
 use OCP\Migration\IOutput;
 use Test\TestCase;
 
@@ -43,7 +44,12 @@ class RepairInvalidPathsTest extends TestCase {
 
 		$this->storage = new Temporary();
 		$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() {