From f98a8f472ebf645e1a5e177d1938b3a3c2ec1e5f Mon Sep 17 00:00:00 2001 From: Andreas Hennings Date: Tue, 23 Jul 2013 13:48:55 +0200 Subject: [PATCH 1/3] Generate an autoload_files.php next to autoload_namespaces.php and autoload_classes.php --- src/Composer/Autoload/AutoloadGenerator.php | 7 ++++++- tests/Composer/Test/Autoload/AutoloadGeneratorTest.php | 8 +++++--- tests/Composer/Test/Autoload/Fixtures/autoload_files.php | 4 ++++ .../Fixtures/autoload_files_files_by_dependency.php | 8 ++++++++ .../Test/Autoload/Fixtures/autoload_files_functions.php | 7 +++++++ .../Test/Autoload/Fixtures/autoload_files_target_dir.php | 4 ++++ .../Fixtures/autoload_real_files_by_dependency.php | 7 +------ .../Test/Autoload/Fixtures/autoload_real_functions.php | 6 +----- .../Test/Autoload/Fixtures/autoload_real_target_dir.php | 3 +-- 9 files changed, 37 insertions(+), 17 deletions(-) create mode 100644 tests/Composer/Test/Autoload/Fixtures/autoload_files.php create mode 100644 tests/Composer/Test/Autoload/Fixtures/autoload_files_files_by_dependency.php create mode 100644 tests/Composer/Test/Autoload/Fixtures/autoload_files_functions.php create mode 100644 tests/Composer/Test/Autoload/Fixtures/autoload_files_target_dir.php diff --git a/src/Composer/Autoload/AutoloadGenerator.php b/src/Composer/Autoload/AutoloadGenerator.php index 5f8e4477e..675d3f9d1 100644 --- a/src/Composer/Autoload/AutoloadGenerator.php +++ b/src/Composer/Autoload/AutoloadGenerator.php @@ -170,7 +170,7 @@ EOF; $filesCode = ""; $autoloads['files'] = new \RecursiveIteratorIterator(new \RecursiveArrayIterator($autoloads['files'])); foreach ($autoloads['files'] as $functionFile) { - $filesCode .= ' require '.$this->getPathCode($filesystem, $basePath, $vendorPath, $functionFile).";\n"; + $filesCode .= 'require '.$this->getPathCode($filesystem, $basePath, $vendorPath, $functionFile).";\n"; } if (!$suffix) { @@ -182,6 +182,11 @@ EOF; if ($includePathFile = $this->getIncludePathsFile($packageMap, $filesystem, $basePath, $vendorPath, $vendorPathCode52, $appBaseDirCode)) { file_put_contents($targetDir.'/include_paths.php', $includePathFile); } + if ($filesCode) { + $filesCode = "getAutoloadFile($vendorPathToTargetDirCode, $suffix)); file_put_contents($targetDir.'/autoload_real.php', $this->getAutoloadRealFile(true, true, (bool) $includePathFile, $targetDirLoader, $filesCode, $vendorPathCode, $appBaseDirCode, $suffix, $useGlobalIncludePath)); diff --git a/tests/Composer/Test/Autoload/AutoloadGeneratorTest.php b/tests/Composer/Test/Autoload/AutoloadGeneratorTest.php index 9f54c3791..fea0cdab2 100644 --- a/tests/Composer/Test/Autoload/AutoloadGeneratorTest.php +++ b/tests/Composer/Test/Autoload/AutoloadGeneratorTest.php @@ -191,6 +191,7 @@ class AutoloadGeneratorTest extends TestCase $this->generator->dump($this->config, $this->repository, $package, $this->im, 'composer', false, 'TargetDir'); $this->assertFileEquals(__DIR__.'/Fixtures/autoload_target_dir.php', $this->vendorDir.'/autoload.php'); $this->assertFileEquals(__DIR__.'/Fixtures/autoload_real_target_dir.php', $this->vendorDir.'/composer/autoload_real.php'); + $this->assertFileEquals(__DIR__.'/Fixtures/autoload_files_target_dir.php', $this->vendorDir.'/composer/autoload_files.php'); $this->assertAutoloadFiles('classmap6', $this->vendorDir.'/composer', 'classmap'); } @@ -374,6 +375,7 @@ class AutoloadGeneratorTest extends TestCase $this->generator->dump($this->config, $this->repository, $package, $this->im, 'composer', false, 'FilesAutoload'); $this->assertFileEquals(__DIR__.'/Fixtures/autoload_functions.php', $this->vendorDir.'/autoload.php'); $this->assertFileEquals(__DIR__.'/Fixtures/autoload_real_functions.php', $this->vendorDir.'/composer/autoload_real.php'); + $this->assertFileEquals(__DIR__.'/Fixtures/autoload_files_functions.php', $this->vendorDir.'/composer/autoload_files.php'); include $this->vendorDir . '/autoload.php'; $this->assertTrue(function_exists('testFilesAutoloadGeneration1')); @@ -753,8 +755,8 @@ EOF; $this->assertEquals($expectedNamespace, file_get_contents($vendorDir.'/composer/autoload_namespaces.php')); $this->assertEquals($expectedClassmap, file_get_contents($vendorDir.'/composer/autoload_classmap.php')); - $this->assertContains("require \$vendorDir . '/b/b/bootstrap.php';", file_get_contents($vendorDir.'/composer/autoload_real.php')); - $this->assertContains("require \$baseDir . '/test.php';", file_get_contents($vendorDir.'/composer/autoload_real.php')); + $this->assertContains("require \$vendorDir . '/b/b/bootstrap.php';", file_get_contents($vendorDir.'/composer/autoload_files.php')); + $this->assertContains("require \$baseDir . '/test.php';", file_get_contents($vendorDir.'/composer/autoload_files.php')); } public function testUpLevelRelativePaths() @@ -813,7 +815,7 @@ EOF; $this->assertEquals($expectedNamespace, file_get_contents($this->vendorDir.'/composer/autoload_namespaces.php')); $this->assertEquals($expectedClassmap, file_get_contents($this->vendorDir.'/composer/autoload_classmap.php')); - $this->assertContains("require \$baseDir . '/../test.php';", file_get_contents($this->vendorDir.'/composer/autoload_real.php')); + $this->assertContains("require \$baseDir . '/../test.php';", file_get_contents($this->vendorDir.'/composer/autoload_files.php')); } public function testEmptyPaths() diff --git a/tests/Composer/Test/Autoload/Fixtures/autoload_files.php b/tests/Composer/Test/Autoload/Fixtures/autoload_files.php new file mode 100644 index 000000000..47b17f8b0 --- /dev/null +++ b/tests/Composer/Test/Autoload/Fixtures/autoload_files.php @@ -0,0 +1,4 @@ +register(true); - require $vendorDir . '/c/lorem/testC.php'; - require $vendorDir . '/z/foo/testA.php'; - require $vendorDir . '/d/d/testD.php'; - require $vendorDir . '/b/bar/testB.php'; - require $vendorDir . '/e/e/testE.php'; - require $baseDir . '/root.php'; + require __DIR__ . '/autoload_files.php'; return $loader; } diff --git a/tests/Composer/Test/Autoload/Fixtures/autoload_real_functions.php b/tests/Composer/Test/Autoload/Fixtures/autoload_real_functions.php index ac167bd83..729f9c7ed 100644 --- a/tests/Composer/Test/Autoload/Fixtures/autoload_real_functions.php +++ b/tests/Composer/Test/Autoload/Fixtures/autoload_real_functions.php @@ -38,11 +38,7 @@ class ComposerAutoloaderInitFilesAutoload $loader->register(true); - require $vendorDir . '/a/a/test.php'; - require $vendorDir . '/b/b/test2.php'; - require $vendorDir . '/c/c/foo/bar/test3.php'; - require $baseDir . '/root.php'; - require $vendorDir . '/c/c/foo/bar/test4.php'; + require __DIR__ . '/autoload_files.php'; return $loader; } diff --git a/tests/Composer/Test/Autoload/Fixtures/autoload_real_target_dir.php b/tests/Composer/Test/Autoload/Fixtures/autoload_real_target_dir.php index 2d66cf16f..95212ef0a 100644 --- a/tests/Composer/Test/Autoload/Fixtures/autoload_real_target_dir.php +++ b/tests/Composer/Test/Autoload/Fixtures/autoload_real_target_dir.php @@ -40,8 +40,7 @@ class ComposerAutoloaderInitTargetDir $loader->register(true); - require $baseDir . '/foo.php'; - require $baseDir . '/bar.php'; + require __DIR__ . '/autoload_files.php'; return $loader; } From 8e9bdfb4da3213d60fe0ff41b0e9e5dee6047a5a Mon Sep 17 00:00:00 2001 From: Andreas Hennings Date: Tue, 23 Jul 2013 16:37:54 +0200 Subject: [PATCH 2/3] Factor the filesCode generation into a separate method. --- src/Composer/Autoload/AutoloadGenerator.php | 62 +++++++++++++------ .../Test/Autoload/Fixtures/autoload_files.php | 7 ++- .../autoload_files_files_by_dependency.php | 7 ++- .../Fixtures/autoload_files_functions.php | 7 ++- .../Fixtures/autoload_files_target_dir.php | 7 ++- 5 files changed, 68 insertions(+), 22 deletions(-) diff --git a/src/Composer/Autoload/AutoloadGenerator.php b/src/Composer/Autoload/AutoloadGenerator.php index 675d3f9d1..65ea6e5bf 100644 --- a/src/Composer/Autoload/AutoloadGenerator.php +++ b/src/Composer/Autoload/AutoloadGenerator.php @@ -167,12 +167,6 @@ EOF; } $classmapFile .= ");\n"; - $filesCode = ""; - $autoloads['files'] = new \RecursiveIteratorIterator(new \RecursiveArrayIterator($autoloads['files'])); - foreach ($autoloads['files'] as $functionFile) { - $filesCode .= 'require '.$this->getPathCode($filesystem, $basePath, $vendorPath, $functionFile).";\n"; - } - if (!$suffix) { $suffix = md5(uniqid('', true)); } @@ -182,13 +176,11 @@ EOF; if ($includePathFile = $this->getIncludePathsFile($packageMap, $filesystem, $basePath, $vendorPath, $vendorPathCode52, $appBaseDirCode)) { file_put_contents($targetDir.'/include_paths.php', $includePathFile); } - if ($filesCode) { - $filesCode = "getIncludeFilesFile($autoloads['files'], $filesystem, $basePath, $vendorPath, $vendorPathCode52, $appBaseDirCode)) { + file_put_contents($targetDir.'/autoload_files.php', $includeFilesFile); } file_put_contents($vendorPath.'/autoload.php', $this->getAutoloadFile($vendorPathToTargetDirCode, $suffix)); - file_put_contents($targetDir.'/autoload_real.php', $this->getAutoloadRealFile(true, true, (bool) $includePathFile, $targetDirLoader, $filesCode, $vendorPathCode, $appBaseDirCode, $suffix, $useGlobalIncludePath)); + file_put_contents($targetDir.'/autoload_real.php', $this->getAutoloadRealFile(true, true, (bool) $includePathFile, $targetDirLoader, (bool) $includeFilesFile, $vendorPathCode, $appBaseDirCode, $suffix, $useGlobalIncludePath)); // use stream_copy_to_stream instead of copy // to work around https://bugs.php.net/bug.php?id=64634 @@ -303,6 +295,31 @@ EOF; return $includePathsFile . ");\n"; } + protected function getIncludeFilesFile(array $files, Filesystem $filesystem, $basePath, $vendorPath, $vendorPathCode, $appBaseDirCode) + { + $filesCode = ''; + $files = new \RecursiveIteratorIterator(new \RecursiveArrayIterator($files)); + foreach ($files as $functionFile) { + $filesCode .= 'require '.$this->getPathCode($filesystem, $basePath, $vendorPath, $functionFile).";\n"; + } + + if (!$filesCode) { + return FALSE; + } + $filesCode = rtrim($filesCode); + + return <<isAbsolutePath($path)) { @@ -343,7 +360,7 @@ return ComposerAutoloaderInit$suffix::getLoader(); AUTOLOAD; } - protected function getAutoloadRealFile($usePSR0, $useClassMap, $useIncludePath, $targetDirLoader, $filesCode, $vendorPathCode, $appBaseDirCode, $suffix, $useGlobalIncludePath) + protected function getAutoloadRealFile($usePSR0, $useClassMap, $useIncludePath, $targetDirLoader, $useIncludeFiles, $vendorPathCode, $appBaseDirCode, $suffix, $useGlobalIncludePath) { // TODO the class ComposerAutoloaderInit should be revert to a closure // when APC has been fixed: @@ -352,10 +369,6 @@ AUTOLOAD; // - https://bugs.php.net/bug.php?id=61576 // - https://bugs.php.net/bug.php?id=59298 - if ($filesCode) { - $filesCode = "\n\n".rtrim($filesCode); - } - $file = <<
register(true);{$filesCode} + $file .= <<register(true); + +REGISTER_LOADER; + + if ($useIncludeFiles) { + $file .= << Date: Thu, 1 Aug 2013 15:42:30 +0200 Subject: [PATCH 3/3] autoload_files.php should return an array of files, instead of directly including them. --- src/Composer/Autoload/AutoloadGenerator.php | 10 ++++++---- .../Test/Autoload/AutoloadGeneratorTest.php | 6 +++--- .../Test/Autoload/Fixtures/autoload_files.php | 6 ++++-- .../autoload_files_files_by_dependency.php | 14 ++++++++------ .../Autoload/Fixtures/autoload_files_functions.php | 12 +++++++----- .../Fixtures/autoload_files_target_dir.php | 6 ++++-- .../Fixtures/autoload_real_files_by_dependency.php | 4 +++- .../Autoload/Fixtures/autoload_real_functions.php | 4 +++- .../Autoload/Fixtures/autoload_real_target_dir.php | 4 +++- 9 files changed, 41 insertions(+), 25 deletions(-) diff --git a/src/Composer/Autoload/AutoloadGenerator.php b/src/Composer/Autoload/AutoloadGenerator.php index 65ea6e5bf..b32606fce 100644 --- a/src/Composer/Autoload/AutoloadGenerator.php +++ b/src/Composer/Autoload/AutoloadGenerator.php @@ -300,13 +300,12 @@ EOF; $filesCode = ''; $files = new \RecursiveIteratorIterator(new \RecursiveArrayIterator($files)); foreach ($files as $functionFile) { - $filesCode .= 'require '.$this->getPathCode($filesystem, $basePath, $vendorPath, $functionFile).";\n"; + $filesCode .= ' '.$this->getPathCode($filesystem, $basePath, $vendorPath, $functionFile).",\n"; } if (!$filesCode) { return FALSE; } - $filesCode = rtrim($filesCode); return <<assertEquals($expectedNamespace, file_get_contents($vendorDir.'/composer/autoload_namespaces.php')); $this->assertEquals($expectedClassmap, file_get_contents($vendorDir.'/composer/autoload_classmap.php')); - $this->assertContains("require \$vendorDir . '/b/b/bootstrap.php';", file_get_contents($vendorDir.'/composer/autoload_files.php')); - $this->assertContains("require \$baseDir . '/test.php';", file_get_contents($vendorDir.'/composer/autoload_files.php')); + $this->assertContains("\n \$vendorDir . '/b/b/bootstrap.php',\n", file_get_contents($vendorDir.'/composer/autoload_files.php')); + $this->assertContains("\n \$baseDir . '/test.php',\n", file_get_contents($vendorDir.'/composer/autoload_files.php')); } public function testUpLevelRelativePaths() @@ -815,7 +815,7 @@ EOF; $this->assertEquals($expectedNamespace, file_get_contents($this->vendorDir.'/composer/autoload_namespaces.php')); $this->assertEquals($expectedClassmap, file_get_contents($this->vendorDir.'/composer/autoload_classmap.php')); - $this->assertContains("require \$baseDir . '/../test.php';", file_get_contents($this->vendorDir.'/composer/autoload_files.php')); + $this->assertContains("\n \$baseDir . '/../test.php',\n", file_get_contents($this->vendorDir.'/composer/autoload_files.php')); } public function testEmptyPaths() diff --git a/tests/Composer/Test/Autoload/Fixtures/autoload_files.php b/tests/Composer/Test/Autoload/Fixtures/autoload_files.php index 838fbb900..9ecdc0cdb 100644 --- a/tests/Composer/Test/Autoload/Fixtures/autoload_files.php +++ b/tests/Composer/Test/Autoload/Fixtures/autoload_files.php @@ -5,5 +5,7 @@ $vendorDir = dirname(dirname(__FILE__)); $baseDir = dirname($vendorDir); -require $baseDir . '/foo.php'; -require $baseDir . '/bar.php'; \ No newline at end of file +return array( + $baseDir . '/foo.php', + $baseDir . '/bar.php', +); \ No newline at end of file diff --git a/tests/Composer/Test/Autoload/Fixtures/autoload_files_files_by_dependency.php b/tests/Composer/Test/Autoload/Fixtures/autoload_files_files_by_dependency.php index a7763f270..eafeb2722 100644 --- a/tests/Composer/Test/Autoload/Fixtures/autoload_files_files_by_dependency.php +++ b/tests/Composer/Test/Autoload/Fixtures/autoload_files_files_by_dependency.php @@ -5,9 +5,11 @@ $vendorDir = dirname(dirname(__FILE__)); $baseDir = dirname($vendorDir); -require $vendorDir . '/c/lorem/testC.php'; -require $vendorDir . '/z/foo/testA.php'; -require $vendorDir . '/d/d/testD.php'; -require $vendorDir . '/b/bar/testB.php'; -require $vendorDir . '/e/e/testE.php'; -require $baseDir . '/root.php'; \ No newline at end of file +return array( + $vendorDir . '/c/lorem/testC.php', + $vendorDir . '/z/foo/testA.php', + $vendorDir . '/d/d/testD.php', + $vendorDir . '/b/bar/testB.php', + $vendorDir . '/e/e/testE.php', + $baseDir . '/root.php', +); \ No newline at end of file diff --git a/tests/Composer/Test/Autoload/Fixtures/autoload_files_functions.php b/tests/Composer/Test/Autoload/Fixtures/autoload_files_functions.php index 3d61e6b57..48058b505 100644 --- a/tests/Composer/Test/Autoload/Fixtures/autoload_files_functions.php +++ b/tests/Composer/Test/Autoload/Fixtures/autoload_files_functions.php @@ -5,8 +5,10 @@ $vendorDir = dirname(dirname(__FILE__)); $baseDir = dirname($vendorDir); -require $vendorDir . '/a/a/test.php'; -require $vendorDir . '/b/b/test2.php'; -require $vendorDir . '/c/c/foo/bar/test3.php'; -require $baseDir . '/root.php'; -require $vendorDir . '/c/c/foo/bar/test4.php'; \ No newline at end of file +return array( + $vendorDir . '/a/a/test.php', + $vendorDir . '/b/b/test2.php', + $vendorDir . '/c/c/foo/bar/test3.php', + $baseDir . '/root.php', + $vendorDir . '/c/c/foo/bar/test4.php', +); \ No newline at end of file diff --git a/tests/Composer/Test/Autoload/Fixtures/autoload_files_target_dir.php b/tests/Composer/Test/Autoload/Fixtures/autoload_files_target_dir.php index 838fbb900..9ecdc0cdb 100644 --- a/tests/Composer/Test/Autoload/Fixtures/autoload_files_target_dir.php +++ b/tests/Composer/Test/Autoload/Fixtures/autoload_files_target_dir.php @@ -5,5 +5,7 @@ $vendorDir = dirname(dirname(__FILE__)); $baseDir = dirname($vendorDir); -require $baseDir . '/foo.php'; -require $baseDir . '/bar.php'; \ No newline at end of file +return array( + $baseDir . '/foo.php', + $baseDir . '/bar.php', +); \ No newline at end of file diff --git a/tests/Composer/Test/Autoload/Fixtures/autoload_real_files_by_dependency.php b/tests/Composer/Test/Autoload/Fixtures/autoload_real_files_by_dependency.php index 4195331a6..376f8512c 100644 --- a/tests/Composer/Test/Autoload/Fixtures/autoload_real_files_by_dependency.php +++ b/tests/Composer/Test/Autoload/Fixtures/autoload_real_files_by_dependency.php @@ -38,7 +38,9 @@ class ComposerAutoloaderInitFilesAutoloadOrder $loader->register(true); - require __DIR__ . '/autoload_files.php'; + foreach (require __DIR__ . '/autoload_files.php' as $file) { + require $file; + } return $loader; } diff --git a/tests/Composer/Test/Autoload/Fixtures/autoload_real_functions.php b/tests/Composer/Test/Autoload/Fixtures/autoload_real_functions.php index 729f9c7ed..3ddbc9ca9 100644 --- a/tests/Composer/Test/Autoload/Fixtures/autoload_real_functions.php +++ b/tests/Composer/Test/Autoload/Fixtures/autoload_real_functions.php @@ -38,7 +38,9 @@ class ComposerAutoloaderInitFilesAutoload $loader->register(true); - require __DIR__ . '/autoload_files.php'; + foreach (require __DIR__ . '/autoload_files.php' as $file) { + require $file; + } return $loader; } diff --git a/tests/Composer/Test/Autoload/Fixtures/autoload_real_target_dir.php b/tests/Composer/Test/Autoload/Fixtures/autoload_real_target_dir.php index 95212ef0a..347454fc5 100644 --- a/tests/Composer/Test/Autoload/Fixtures/autoload_real_target_dir.php +++ b/tests/Composer/Test/Autoload/Fixtures/autoload_real_target_dir.php @@ -40,7 +40,9 @@ class ComposerAutoloaderInitTargetDir $loader->register(true); - require __DIR__ . '/autoload_files.php'; + foreach (require __DIR__ . '/autoload_files.php' as $file) { + require $file; + } return $loader; }