diogo
/
symfony
Archived
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

merged branch xabbuh/issue8007-master (PR #8052) 

This PR was submitted for the master branch but it was merged into the 2.3 branch instead (closes #8052).

Discussion
----------

remove check for PHP bug #50731

| Q             | A
| ------------- | ---
| Bug fix?      | no
| New feature?  | no
| BC breaks?    | no
| Deprecations? | no
| Tests pass?   | yes
| Fixed tickets | #8007
| License       | MIT
| Doc PR        |

Commits
-------

28534a6 remove check for PHP bug #50731
This commit is contained in:
Fabien Potencier 2013-05-16 11:44:24 +02:00
parent 2b3a0b9802 95f356b8d0
commit c31caca04c
5 changed files with 0 additions and 20 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
src/Symfony/Component/ClassLoader/ClassLoader.php
View File

@ -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;

8
src/Symfony/Component/ClassLoader/MapClassLoader.php
View File

@ -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];
}

2
src/Symfony/Component/ClassLoader/Tests/ClassLoaderTest.php
View File

@ -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'),
);
}

2
src/Symfony/Component/ClassLoader/Tests/UniversalClassLoaderTest.php
View File

@ -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'),
);
}

4
src/Symfony/Component/ClassLoader/UniversalClassLoader.php
View File

@ -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);