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

Fix target-dir autoloader

pull/606/merge
Jordi Boggiano 2012-04-23 10:56:46 +02:00
parent 6a50dbd46d
commit aff7745231
2 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -88,12 +88,12 @@ EOF;
$prefixes = implode(', ', array_map(function ($prefix) { $prefixes = implode(', ', array_map(function ($prefix) {
return var_export($prefix, true); return var_export($prefix, true);
}, array_keys($mainAutoload['psr-0']))); }, array_keys($mainAutoload['psr-0'])));
$baseDirFromTargetDirCode = $filesystem->findShortestPathCode(realpath($targetDir), getcwd(), true); $baseDirFromVendorDirCode = $filesystem->findShortestPathCode($vendorPath, getcwd(), true);
$targetDirLoader = <<<EOF $targetDirLoader = <<<EOF
spl_autoload_register(function(\$class) { spl_autoload_register(function(\$class) {
static \$dir = $baseDirFromTargetDirCode . '/'; \$dir = $baseDirFromVendorDirCode . '/';
static \$prefixes = array($prefixes); \$prefixes = array($prefixes);
foreach (\$prefixes as \$prefix) { foreach (\$prefixes as \$prefix) {
if (0 !== strpos(\$class, \$prefix)) { if (0 !== strpos(\$class, \$prefix)) {
continue; continue;

4
tests/Composer/Test/Autoload/Fixtures/autoload_target_dir.php
View File

@ -20,8 +20,8 @@ return call_user_func(function() {
} }
spl_autoload_register(function($class) { spl_autoload_register(function($class) {
static $dir = dirname(dirname(__DIR__)) . '/'; $dir = dirname(__DIR__) . '/';
static $prefixes = array('Main\\Foo', 'Main\\Bar'); $prefixes = array('Main\\Foo', 'Main\\Bar');
foreach ($prefixes as $prefix) { foreach ($prefixes as $prefix) {
if (0 !== strpos($class, $prefix)) { if (0 !== strpos($class, $prefix)) {
continue; continue;