public-mirrors
/
composer
mirror of https://github.com/composer/composer
1
0
Fork 0
Code

Merge pull request #4684 from composer/revert-4672-patch-1 

Revert "[ClassLoader] performance improvement: use str_replace instead of strtr"
pull/4700/head
Jordi Boggiano 2015-12-09 15:47:26 +00:00
parent 44bc8e019f 43f7b762e5
commit 1c525b76f8
1 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
src/Composer/Autoload/ClassLoader.php
View File

@ -344,7 +344,7 @@ class ClassLoader
private function findFileWithExtension($class, $ext)
{
// PSR-4 lookup
$logicalPathPsr4 = ('\\' !== DIRECTORY_SEPARATOR ? str_replace('\\', DIRECTORY_SEPARATOR, $class) : $class) . $ext;
$logicalPathPsr4 = strtr($class, '\\', DIRECTORY_SEPARATOR) . $ext;
$first = $class[0];
if (isset($this->prefixLengthsPsr4[$first])) {
@ -370,10 +370,10 @@ class ClassLoader
if (false !== $pos = strrpos($class, '\\')) {
// namespaced class name
$logicalPathPsr0 = substr($logicalPathPsr4, 0, $pos + 1)
. str_replace('_', DIRECTORY_SEPARATOR, substr($logicalPathPsr4, $pos + 1));
. strtr(substr($logicalPathPsr4, $pos + 1), '_', DIRECTORY_SEPARATOR);
} else {
// PEAR-like class name
$logicalPathPsr0 = str_replace('_', DIRECTORY_SEPARATOR, $class) . $ext;
$logicalPathPsr0 = strtr($class, '_', DIRECTORY_SEPARATOR) . $ext;
}
if (isset($this->prefixesPsr0[$first])) {