Merge pull request #23820 from owncloud/move-settings-completely-to-psr4

Move OC/Settings completely to PSR-4

lib/autoloader.php

@@ -112,7 +112,7 @@ class Autoloader {
 				if ($split[1] === 'core') {
 					$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';
+					// Covered by PSR-4 autoloader
 				} else {
 					$paths[] = \OC::$SERVERROOT . '/lib/private/' . $split[1] . '/' . strtolower(str_replace('\\', '/', $split[2])) . '.php';
 				}

tests/lib/autoloader.php

@@ -83,9 +83,7 @@ class AutoLoader extends TestCase {
 	}
 
 	public function testLoadCoreNamespaceSettings() {
-		$this->assertEquals([
-			\OC::$SERVERROOT . '/settings/foo/bar.php', 
-		], $this->loader->findClass('OC\Settings\Foo\Bar'));
+		$this->assertEquals([], $this->loader->findClass('OC\Settings\Foo\Bar'));
 	}
 
 	public function testLoadCoreNamespaceRepair() {