From 8e9bdfb4da3213d60fe0ff41b0e9e5dee6047a5a Mon Sep 17 00:00:00 2001
From: Andreas Hennings <andreas@dqxtech.net>
Date: Tue, 23 Jul 2013 16:37:54 +0200
Subject: [PATCH] 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 = "<?php\n\n".rtrim($filesCode)."\n";
-            file_put_contents($targetDir.'/autoload_files.php', $filesCode);
-            $filesCode = "        require __DIR__ . '/autoload_files.php';";
+        if ($includeFilesFile = $this->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 <<<EOF
+<?php
+
+// autoload_files.php generated by Composer
+
+\$vendorDir = $vendorPathCode;
+\$baseDir = $appBaseDirCode;
+
+$filesCode
+EOF;
+    }
+
     protected function getPathCode(Filesystem $filesystem, $basePath, $vendorPath, $path)
     {
         if (!$filesystem->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 = <<<HEADER
 <?php
 
@@ -436,9 +449,22 @@ REGISTER_AUTOLOAD;
 
         }
 
-        $file .= <<<METHOD_FOOTER
-        \$loader->register(true);{$filesCode}
+        $file .= <<<REGISTER_LOADER
+        \$loader->register(true);
 
+
+REGISTER_LOADER;
+
+        if ($useIncludeFiles) {
+            $file .= <<<INCLUDE_FILES
+        require __DIR__ . '/autoload_files.php';
+
+
+INCLUDE_FILES;
+
+        }
+
+        $file .= <<<METHOD_FOOTER
         return \$loader;
     }
 
diff --git a/tests/Composer/Test/Autoload/Fixtures/autoload_files.php b/tests/Composer/Test/Autoload/Fixtures/autoload_files.php
index 47b17f8b0..838fbb900 100644
--- a/tests/Composer/Test/Autoload/Fixtures/autoload_files.php
+++ b/tests/Composer/Test/Autoload/Fixtures/autoload_files.php
@@ -1,4 +1,9 @@
 <?php
 
+// autoload_files.php generated by Composer
+
+$vendorDir = dirname(dirname(__FILE__));
+$baseDir = dirname($vendorDir);
+
 require $baseDir . '/foo.php';
-require $baseDir . '/bar.php';
+require $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 1aa5224b2..a7763f270 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
@@ -1,8 +1,13 @@
 <?php
 
+// autoload_files.php generated by Composer
+
+$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';
+require $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 aff68a375..3d61e6b57 100644
--- a/tests/Composer/Test/Autoload/Fixtures/autoload_files_functions.php
+++ b/tests/Composer/Test/Autoload/Fixtures/autoload_files_functions.php
@@ -1,7 +1,12 @@
 <?php
 
+// autoload_files.php generated by Composer
+
+$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';
+require $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 47b17f8b0..838fbb900 100644
--- a/tests/Composer/Test/Autoload/Fixtures/autoload_files_target_dir.php
+++ b/tests/Composer/Test/Autoload/Fixtures/autoload_files_target_dir.php
@@ -1,4 +1,9 @@
 <?php
 
+// autoload_files.php generated by Composer
+
+$vendorDir = dirname(dirname(__FILE__));
+$baseDir = dirname($vendorDir);
+
 require $baseDir . '/foo.php';
-require $baseDir . '/bar.php';
+require $baseDir . '/bar.php';
\ No newline at end of file