From 95f356b8d023cedb70d934f1642e934b767c8773 Mon Sep 17 00:00:00 2001 From: Christian Flothmann Date: Sat, 11 May 2013 19:17:06 +0200 Subject: [PATCH] remove check for PHP bug #50731 --- src/Symfony/Component/ClassLoader/ClassLoader.php | 4 ---- src/Symfony/Component/ClassLoader/MapClassLoader.php | 8 -------- .../Component/ClassLoader/Tests/ClassLoaderTest.php | 2 -- .../ClassLoader/Tests/UniversalClassLoaderTest.php | 2 -- .../Component/ClassLoader/UniversalClassLoader.php | 4 ---- 5 files changed, 20 deletions(-) diff --git a/src/Symfony/Component/ClassLoader/ClassLoader.php b/src/Symfony/Component/ClassLoader/ClassLoader.php index 469b2ba6a2..1a359794ab 100644 --- a/src/Symfony/Component/ClassLoader/ClassLoader.php +++ b/src/Symfony/Component/ClassLoader/ClassLoader.php @@ -164,10 +164,6 @@ class ClassLoader */ public function findFile($class) { - if ('\\' == $class[0]) { - $class = substr($class, 1); - } - if (false !== $pos = strrpos($class, '\\')) { // namespaced class name $classPath = str_replace('\\', DIRECTORY_SEPARATOR, substr($class, 0, $pos)).DIRECTORY_SEPARATOR; diff --git a/src/Symfony/Component/ClassLoader/MapClassLoader.php b/src/Symfony/Component/ClassLoader/MapClassLoader.php index cf17d42642..82010a77ae 100644 --- a/src/Symfony/Component/ClassLoader/MapClassLoader.php +++ b/src/Symfony/Component/ClassLoader/MapClassLoader.php @@ -47,10 +47,6 @@ class MapClassLoader */ public function loadClass($class) { - if ('\\' === $class[0]) { - $class = substr($class, 1); - } - if (isset($this->map[$class])) { require $this->map[$class]; } @@ -65,10 +61,6 @@ class MapClassLoader */ public function findFile($class) { - if ('\\' === $class[0]) { - $class = substr($class, 1); - } - if (isset($this->map[$class])) { return $this->map[$class]; } diff --git a/src/Symfony/Component/ClassLoader/Tests/ClassLoaderTest.php b/src/Symfony/Component/ClassLoader/Tests/ClassLoaderTest.php index 21184c32f6..9dae537442 100644 --- a/src/Symfony/Component/ClassLoader/Tests/ClassLoaderTest.php +++ b/src/Symfony/Component/ClassLoader/Tests/ClassLoaderTest.php @@ -54,8 +54,6 @@ class ClassLoaderTest extends \PHPUnit_Framework_TestCase return array( array('\\Namespaced2\\Foo', 'Namespaced2\\Foo', '->loadClass() loads Namespaced2\Foo class'), array('\\Pearlike2_Foo', 'Pearlike2_Foo', '->loadClass() loads Pearlike2_Foo class'), - array('\\Namespaced2\\Bar', '\\Namespaced2\\Bar', '->loadClass() loads Namespaced2\Bar class with a leading slash'), - array('\\Pearlike2_Bar', '\\Pearlike2_Bar', '->loadClass() loads Pearlike2_Bar class with a leading slash'), ); } diff --git a/src/Symfony/Component/ClassLoader/Tests/UniversalClassLoaderTest.php b/src/Symfony/Component/ClassLoader/Tests/UniversalClassLoaderTest.php index b40d5a6b20..6bd7e43621 100644 --- a/src/Symfony/Component/ClassLoader/Tests/UniversalClassLoaderTest.php +++ b/src/Symfony/Component/ClassLoader/Tests/UniversalClassLoaderTest.php @@ -32,8 +32,6 @@ class UniversalClassLoaderTest extends \PHPUnit_Framework_TestCase return array( array('\\Namespaced\\Foo', 'Namespaced\\Foo', '->loadClass() loads Namespaced\Foo class'), array('\\Pearlike_Foo', 'Pearlike_Foo', '->loadClass() loads Pearlike_Foo class'), - array('\\Namespaced\\Bar', '\\Namespaced\\Bar', '->loadClass() loads Namespaced\Bar class with a leading slash'), - array('\\Pearlike_Bar', '\\Pearlike_Bar', '->loadClass() loads Pearlike_Bar class with a leading slash'), ); } diff --git a/src/Symfony/Component/ClassLoader/UniversalClassLoader.php b/src/Symfony/Component/ClassLoader/UniversalClassLoader.php index ee16e4809c..734af7430c 100644 --- a/src/Symfony/Component/ClassLoader/UniversalClassLoader.php +++ b/src/Symfony/Component/ClassLoader/UniversalClassLoader.php @@ -263,10 +263,6 @@ class UniversalClassLoader */ public function findFile($class) { - if ('\\' == $class[0]) { - $class = substr($class, 1); - } - if (false !== $pos = strrpos($class, '\\')) { // namespaced class name $namespace = substr($class, 0, $pos);