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

Allow PHP 5.2 autoloaders to consume namespace, classmap and include path files, fixes #1730

pull/1736/merge
Jordi Boggiano 2013-03-27 18:45:27 +01:00
parent 842155d69e
commit 3cc5698e7b
13 changed files with 17 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -48,6 +48,7 @@ class AutoloadGenerator
$relVendorPath = $filesystem->findShortestPath(getcwd(), $vendorPath, true); $relVendorPath = $filesystem->findShortestPath(getcwd(), $vendorPath, true);
$vendorPathCode = $filesystem->findShortestPathCode(realpath($targetDir), $vendorPath, true); $vendorPathCode = $filesystem->findShortestPathCode(realpath($targetDir), $vendorPath, true);
$vendorPathCode52 = str_replace('__DIR__', 'dirname(__FILE__)', $vendorPathCode);
$vendorPathToTargetDirCode = $filesystem->findShortestPathCode($vendorPath, realpath($targetDir), true); $vendorPathToTargetDirCode = $filesystem->findShortestPathCode($vendorPath, realpath($targetDir), true);
$appBaseDirCode = $filesystem->findShortestPathCode($vendorPath, getcwd(), true); $appBaseDirCode = $filesystem->findShortestPathCode($vendorPath, getcwd(), true);
@ -58,7 +59,7 @@ class AutoloadGenerator
// autoload_namespaces.php generated by Composer // autoload_namespaces.php generated by Composer
\$vendorDir = $vendorPathCode; \$vendorDir = $vendorPathCode52;
\$baseDir = $appBaseDirCode; \$baseDir = $appBaseDirCode;
return array( return array(
@ -88,7 +89,7 @@ EOF;
// autoload_classmap.php generated by Composer // autoload_classmap.php generated by Composer
\$vendorDir = $vendorPathCode; \$vendorDir = $vendorPathCode52;
\$baseDir = $appBaseDirCode; \$baseDir = $appBaseDirCode;
return array( return array(
@ -180,7 +181,7 @@ EOF;
file_put_contents($targetDir.'/autoload_namespaces.php', $namespacesFile); file_put_contents($targetDir.'/autoload_namespaces.php', $namespacesFile);
file_put_contents($targetDir.'/autoload_classmap.php', $classmapFile); file_put_contents($targetDir.'/autoload_classmap.php', $classmapFile);
if ($includePathFile = $this->getIncludePathsFile($packageMap, $filesystem, $relVendorPath, $vendorPath, $vendorPathCode, $appBaseDirCode)) { if ($includePathFile = $this->getIncludePathsFile($packageMap, $filesystem, $relVendorPath, $vendorPath, $vendorPathCode52, $appBaseDirCode)) {
file_put_contents($targetDir.'/include_paths.php', $includePathFile); file_put_contents($targetDir.'/include_paths.php', $includePathFile);
} }
file_put_contents($vendorPath.'/autoload.php', $this->getAutoloadFile($vendorPathToTargetDirCode, $suffix)); file_put_contents($vendorPath.'/autoload.php', $this->getAutoloadFile($vendorPathToTargetDirCode, $suffix));

4
tests/Composer/Test/Autoload/AutoloadGeneratorTest.php
View File

@ -475,7 +475,7 @@ class AutoloadGeneratorTest extends TestCase
// autoload_namespaces.php generated by Composer // autoload_namespaces.php generated by Composer
\$vendorDir = dirname(__DIR__); \$vendorDir = dirname(dirname(__FILE__));
\$baseDir = dirname(\$vendorDir); \$baseDir = dirname(\$vendorDir);
return array( return array(
@ -491,7 +491,7 @@ EOF;
// autoload_classmap.php generated by Composer // autoload_classmap.php generated by Composer
\$vendorDir = dirname(__DIR__); \$vendorDir = dirname(dirname(__FILE__));
\$baseDir = dirname(\$vendorDir); \$baseDir = dirname(\$vendorDir);
return array( return array(

2
tests/Composer/Test/Autoload/Fixtures/autoload_classmap.php
View File

@ -2,7 +2,7 @@
// autoload_classmap.php generated by Composer // autoload_classmap.php generated by Composer
$vendorDir = dirname(__DIR__); $vendorDir = dirname(dirname(__FILE__));
$baseDir = dirname($vendorDir); $baseDir = dirname($vendorDir);
return array( return array(

2
tests/Composer/Test/Autoload/Fixtures/autoload_classmap2.php
View File

@ -2,7 +2,7 @@
// autoload_classmap.php generated by Composer // autoload_classmap.php generated by Composer
$vendorDir = dirname(__DIR__); $vendorDir = dirname(dirname(__FILE__));
$baseDir = dirname(dirname($vendorDir)); $baseDir = dirname(dirname($vendorDir));
return array( return array(

2
tests/Composer/Test/Autoload/Fixtures/autoload_classmap3.php
View File

@ -2,7 +2,7 @@
// autoload_classmap.php generated by Composer // autoload_classmap.php generated by Composer
$vendorDir = dirname(__DIR__); $vendorDir = dirname(dirname(__FILE__));
$baseDir = $vendorDir; $baseDir = $vendorDir;
return array( return array(

2
tests/Composer/Test/Autoload/Fixtures/autoload_classmap4.php
View File

@ -2,7 +2,7 @@
// autoload_classmap.php generated by Composer // autoload_classmap.php generated by Composer
$vendorDir = dirname(__DIR__); $vendorDir = dirname(dirname(__FILE__));
$baseDir = dirname($vendorDir); $baseDir = dirname($vendorDir);
return array( return array(

2
tests/Composer/Test/Autoload/Fixtures/autoload_classmap5.php
View File

@ -2,7 +2,7 @@
// autoload_classmap.php generated by Composer // autoload_classmap.php generated by Composer
$vendorDir = dirname(__DIR__); $vendorDir = dirname(dirname(__FILE__));
$baseDir = dirname($vendorDir); $baseDir = dirname($vendorDir);
return array( return array(

2
tests/Composer/Test/Autoload/Fixtures/autoload_classmap6.php
View File

@ -2,7 +2,7 @@
// autoload_classmap.php generated by Composer // autoload_classmap.php generated by Composer
$vendorDir = dirname(__DIR__); $vendorDir = dirname(dirname(__FILE__));
$baseDir = dirname($vendorDir); $baseDir = dirname($vendorDir);
return array( return array(

2
tests/Composer/Test/Autoload/Fixtures/autoload_main.php
View File

@ -2,7 +2,7 @@
// autoload_namespaces.php generated by Composer // autoload_namespaces.php generated by Composer
$vendorDir = dirname(__DIR__); $vendorDir = dirname(dirname(__FILE__));
$baseDir = dirname($vendorDir); $baseDir = dirname($vendorDir);
return array( return array(

2
tests/Composer/Test/Autoload/Fixtures/autoload_main2.php
View File

@ -2,7 +2,7 @@
// autoload_namespaces.php generated by Composer // autoload_namespaces.php generated by Composer
$vendorDir = dirname(__DIR__); $vendorDir = dirname(dirname(__FILE__));
$baseDir = dirname(dirname($vendorDir)); $baseDir = dirname(dirname($vendorDir));
return array( return array(

2
tests/Composer/Test/Autoload/Fixtures/autoload_main3.php
View File

@ -2,7 +2,7 @@
// autoload_namespaces.php generated by Composer // autoload_namespaces.php generated by Composer
$vendorDir = dirname(__DIR__); $vendorDir = dirname(dirname(__FILE__));
$baseDir = $vendorDir; $baseDir = $vendorDir;
return array( return array(

2
tests/Composer/Test/Autoload/Fixtures/autoload_vendors.php
View File

@ -2,7 +2,7 @@
// autoload_namespaces.php generated by Composer // autoload_namespaces.php generated by Composer
$vendorDir = dirname(__DIR__); $vendorDir = dirname(dirname(__FILE__));
$baseDir = dirname($vendorDir); $baseDir = dirname($vendorDir);
return array( return array(

2
tests/Composer/Test/Autoload/Fixtures/include_paths.php
View File

@ -2,7 +2,7 @@
// include_paths.php generated by Composer // include_paths.php generated by Composer
$vendorDir = dirname(__DIR__); $vendorDir = dirname(dirname(__FILE__));
$baseDir = dirname($vendorDir); $baseDir = dirname($vendorDir);
return array( return array(