From 5a0c936f99668fe5db0ffef8c76384ae0fe7fe52 Mon Sep 17 00:00:00 2001
From: Lukas Reschke <lukas@owncloud.com>
Date: Wed, 6 Apr 2016 11:13:15 +0200
Subject: [PATCH] Remove OC/Settings from old autoloader
---
lib/autoloader.php | 2 +-
tests/lib/autoloader.php | 4 +---
2 files changed, 2 insertions(+), 4 deletions(-)
diff --git a/lib/autoloader.php b/lib/autoloader.php
index 87a07f6da12..9e198a0351e 100644
--- a/lib/autoloader.php
+++ b/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';
}
diff --git a/tests/lib/autoloader.php b/tests/lib/autoloader.php
index 6443d87a2e5..fafdefd01be 100644
--- a/tests/lib/autoloader.php
+++ b/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() {
--
GitLab