Merge pull request #21493 from owncloud/fix-repair-path

Move lib/repair to lib/private/repair
2016-01-07 14:18:51 +07:00 · 2016-01-07 14:18:51 +07:00 · 30e1a33910
parent 29416b07ac 604897945b
commit 30e1a33910
19 changed files with 1 additions and 4 deletions
--- a/lib/autoloader.php
+++ b/lib/autoloader.php
@ -112,9 +112,6 @@ class Autoloader {
 					$paths[] = \OC::$SERVERROOT . '/core/' . strtolower(str_replace('\\', '/', $split[2])) . '.php';
 				} else if ($split[1] === 'settings') {
 					$paths[] = \OC::$SERVERROOT . '/settings/' . strtolower(str_replace('\\', '/', $split[2])) . '.php';
-				} else if ($split[1] === 'repair') {
-					$paths[] = \OC::$SERVERROOT . '/lib/repair/' . strtolower(str_replace('\\', '/', $split[2])) . '.php';
-
 				} else {
 					$paths[] = \OC::$SERVERROOT . '/lib/private/' . $split[1] . '/' . strtolower(str_replace('\\', '/', $split[2])) . '.php';
 				}
--- a/lib/private/repair/assetcache.php
+++ b/lib/private/repair/assetcache.php
--- a/lib/private/repair/cleantags.php
+++ b/lib/private/repair/cleantags.php
--- a/lib/private/repair/collation.php
+++ b/lib/private/repair/collation.php
--- a/lib/private/repair/dropoldjobs.php
+++ b/lib/private/repair/dropoldjobs.php
--- a/lib/private/repair/dropoldtables.php
+++ b/lib/private/repair/dropoldtables.php
--- a/lib/private/repair/filletags.php
+++ b/lib/private/repair/filletags.php
--- a/lib/private/repair/innodb.php
+++ b/lib/private/repair/innodb.php
--- a/lib/private/repair/oldgroupmembershipshares.php
+++ b/lib/private/repair/oldgroupmembershipshares.php
--- a/lib/private/repair/preview.php
+++ b/lib/private/repair/preview.php
--- a/lib/private/repair/removegetetagentries.php
+++ b/lib/private/repair/removegetetagentries.php
--- a/lib/private/repair/repairinvalidshares.php
+++ b/lib/private/repair/repairinvalidshares.php
--- a/lib/private/repair/repairlegacystorages.php
+++ b/lib/private/repair/repairlegacystorages.php
--- a/lib/private/repair/repairmimetypes.php
+++ b/lib/private/repair/repairmimetypes.php
--- a/lib/private/repair/searchlucenetables.php
+++ b/lib/private/repair/searchlucenetables.php
--- a/lib/private/repair/sqliteautoincrement.php
+++ b/lib/private/repair/sqliteautoincrement.php
--- a/lib/private/repair/updatecertificatestore.php
+++ b/lib/private/repair/updatecertificatestore.php
--- a/lib/private/repair/updateoutdatedocsids.php
+++ b/lib/private/repair/updateoutdatedocsids.php
--- a/tests/lib/autoloader.php
+++ b/tests/lib/autoloader.php
@ -90,7 +90,7 @@ class AutoLoader extends TestCase {

 	public function testLoadCoreNamespaceRepair() {
 		$this->assertEquals([
-			\OC::$SERVERROOT . '/lib/repair/foo/bar.php', 
+			\OC::$SERVERROOT . '/lib/private/repair/foo/bar.php',
 		], $this->loader->findClass('OC\Repair\Foo\Bar'));
 	}
 }