From 5bb4330ea47e1c0839bebaeb9afbf1a1f7a77916 Mon Sep 17 00:00:00 2001 From: Victor Dubiniuk Date: Wed, 2 Oct 2013 00:58:51 +0300 Subject: Fix autoloader regression --- lib/autoloader.php | 1 + 1 file changed, 1 insertion(+) diff --git a/lib/autoloader.php b/lib/autoloader.php index 72041200116..44d19ae0ee2 100644 --- a/lib/autoloader.php +++ b/lib/autoloader.php @@ -77,6 +77,7 @@ class Autoloader { $paths[] = 'private/' . strtolower(str_replace('_', '/', substr($class, 3)) . '.php'); } elseif (strpos($class, 'OC\\') === 0) { $paths[] = 'private/' . strtolower(str_replace('\\', '/', substr($class, 3)) . '.php'); + $paths[] = strtolower(str_replace('\\', '/', substr($class, 3)) . '.php'); } elseif (strpos($class, 'OCP\\') === 0) { $paths[] = 'public/' . strtolower(str_replace('\\', '/', substr($class, 4)) . '.php'); } elseif (strpos($class, 'OCA\\') === 0) { -- cgit v1.2.3 From ceeb22aa5ff354419051b96e94d6239c69d7b206 Mon Sep 17 00:00:00 2001 From: Morris Jobke Date: Wed, 2 Oct 2013 11:25:44 +0200 Subject: fix unit tests --- tests/lib/autoloader.php | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/tests/lib/autoloader.php b/tests/lib/autoloader.php index b182dc87477..314a8ebee8d 100644 --- a/tests/lib/autoloader.php +++ b/tests/lib/autoloader.php @@ -19,11 +19,11 @@ class AutoLoader extends \PHPUnit_Framework_TestCase { } public function testLeadingSlashOnClassName() { - $this->assertEquals(array('private/files/storage/local.php'), $this->loader->findClass('\OC\Files\Storage\Local')); + $this->assertEquals(array('private/files/storage/local.php', 'files/storage/local.php'), $this->loader->findClass('\OC\Files\Storage\Local')); } public function testNoLeadingSlashOnClassName() { - $this->assertEquals(array('private/files/storage/local.php'), $this->loader->findClass('OC\Files\Storage\Local')); + $this->assertEquals(array('private/files/storage/local.php', 'files/storage/local.php'), $this->loader->findClass('OC\Files\Storage\Local')); } public function testLegacyPath() { @@ -54,7 +54,7 @@ class AutoLoader extends \PHPUnit_Framework_TestCase { } public function testLoadCoreNamespace() { - $this->assertEquals(array('private/foo/bar.php'), $this->loader->findClass('OC\Foo\Bar')); + $this->assertEquals(array('private/foo/bar.php', 'foo/bar.php'), $this->loader->findClass('OC\Foo\Bar')); } public function testLoadCore() { -- cgit v1.2.3