From 2c065416eb0201a11e9233a9a19a50f831878c75 Mon Sep 17 00:00:00 2001
From: Victor Berchet <victor@suumit.com>
Date: Wed, 1 Aug 2012 10:12:46 +0200
Subject: [PATCH 1/3] [Autoload] generate an autoload_real.php file

---
 src/Composer/Autoload/AutoloadGenerator.php   | 102 ++++++++++--------
 .../Test/Autoload/AutoloadGeneratorTest.php   |   2 +
 .../Autoload/Fixtures/autoload_functions.php  |  31 +-----
 .../Fixtures/autoload_real_functions.php      |  32 ++++++
 .../Fixtures/autoload_real_target_dir.php     |  49 +++++++++
 .../Autoload/Fixtures/autoload_target_dir.php |  48 +--------
 6 files changed, 143 insertions(+), 121 deletions(-)
 create mode 100644 tests/Composer/Test/Autoload/Fixtures/autoload_real_functions.php
 create mode 100644 tests/Composer/Test/Autoload/Fixtures/autoload_real_target_dir.php

diff --git a/src/Composer/Autoload/AutoloadGenerator.php b/src/Composer/Autoload/AutoloadGenerator.php
index 69cd1fefe..b574e7f62 100644
--- a/src/Composer/Autoload/AutoloadGenerator.php
+++ b/src/Composer/Autoload/AutoloadGenerator.php
@@ -25,7 +25,7 @@ use Composer\Util\Filesystem;
  */
 class AutoloadGenerator
 {
-    public function dump(Config $config, RepositoryInterface $localRepo, PackageInterface $mainPackage, InstallationManager $installationManager, $targetDir, $classSuffix = '')
+    public function dump(Config $config, RepositoryInterface $localRepo, PackageInterface $mainPackage, InstallationManager $installationManager, $targetDir, $suffix = '')
     {
         $filesystem = new Filesystem();
         $filesystem->ensureDirectoryExists($config->get('vendor-dir'));
@@ -94,23 +94,23 @@ EOF;
 
             $targetDirLoader = <<<EOF
 
-        public static function autoload(\$class)
-        {
-            \$dir = $baseDirFromVendorDirCode . '/';
-            \$prefixes = array($prefixes);
-            foreach (\$prefixes as \$prefix) {
-                if (0 !== strpos(\$class, \$prefix)) {
-                    continue;
-                }
-                \$path = \$dir . implode('/', array_slice(explode('\\\\', \$class), $levels)).'.php';
-                if (!\$path = stream_resolve_include_path(\$path)) {
-                    return false;
-                }
-                require \$path;
-
-                return true;
+    public static function autoload(\$class)
+    {
+        \$dir = $baseDirFromVendorDirCode . '/';
+        \$prefixes = array($prefixes);
+        foreach (\$prefixes as \$prefix) {
+            if (0 !== strpos(\$class, \$prefix)) {
+                continue;
             }
+            \$path = \$dir . implode('/', array_slice(explode('\\\\', \$class), $levels)).'.php';
+            if (!\$path = stream_resolve_include_path(\$path)) {
+                return false;
+            }
+            require \$path;
+
+            return true;
         }
+    }
 
 EOF;
         }
@@ -128,7 +128,7 @@ EOF;
         $filesCode = "";
         $autoloads['files'] = new \RecursiveIteratorIterator(new \RecursiveArrayIterator($autoloads['files']));
         foreach ($autoloads['files'] as $functionFile) {
-            $filesCode .= '            require '.$this->getPathCode($filesystem, $relVendorPath, $vendorPath, $functionFile).";\n";
+            $filesCode .= '        require '.$this->getPathCode($filesystem, $relVendorPath, $vendorPath, $functionFile).";\n";
         }
 
         file_put_contents($targetDir.'/autoload_namespaces.php', $namespacesFile);
@@ -136,7 +136,8 @@ EOF;
         if ($includePathFile = $this->getIncludePathsFile($packageMap, $filesystem, $relVendorPath, $vendorPath, $vendorPathCode, $appBaseDirCode)) {
             file_put_contents($targetDir.'/include_paths.php', $includePathFile);
         }
-        file_put_contents($vendorPath.'/autoload.php', $this->getAutoloadFile($vendorPathToTargetDirCode, true, true, (bool) $includePathFile, $targetDirLoader, $filesCode, $classSuffix));
+        file_put_contents($vendorPath.'/autoload.php', $this->getAutoloadFile($suffix));
+        file_put_contents($vendorPath.'/autoload_real'.$suffix.'.php', $this->getAutoloadRealFile($vendorPathToTargetDirCode, true, true, (bool) $includePathFile, $targetDirLoader, $filesCode, $suffix));
         copy(__DIR__.'/ClassLoader.php', $targetDir.'/ClassLoader.php');
     }
 
@@ -278,7 +279,23 @@ EOF;
         return $baseDir.var_export($path, true);
     }
 
-    protected function getAutoloadFile($vendorPathToTargetDirCode, $usePSR0, $useClassMap, $useIncludePath, $targetDirLoader, $filesCode, $classSuffix)
+    protected function getAutoloadFile($suffix)
+    {
+
+
+        return <<<AUTOLOAD
+<?php
+
+// autoload.php generated by Composer
+
+require_once 'autoload_real$suffix.php';
+
+return ComposerAutoloaderInit$suffix::getLoader();
+
+AUTOLOAD;
+    }
+
+    protected function getAutoloadRealFile($vendorPathToTargetDirCode, $usePSR0, $useClassMap, $useIncludePath, $targetDirLoader, $filesCode, $suffix)
     {
         // TODO the class ComposerAutoloaderInit should be revert to a closure
         // when APC has been fixed:
@@ -293,27 +310,26 @@ EOF;
         $file = <<<HEADER
 <?php
 
-// autoload.php generated by Composer
+// autoload_real$suffix.php generated by Composer
 if (!class_exists('Composer\\\\Autoload\\\\ClassLoader', false)) {
     require $vendorPathToTargetDirCode . '/ClassLoader.php';
 }
 
-if (!class_exists('ComposerAutoloaderInit$classSuffix', false)) {
-    class ComposerAutoloaderInit$classSuffix
+class ComposerAutoloaderInit$suffix
+{
+    public static function getLoader()
     {
-        public static function getLoader()
-        {
-            \$loader = new \\Composer\\Autoload\\ClassLoader();
-            \$composerDir = $vendorPathToTargetDirCode;
+        \$loader = new \\Composer\\Autoload\\ClassLoader();
+        \$composerDir = $vendorPathToTargetDirCode;
 
 
 HEADER;
 
         if ($useIncludePath) {
             $file .= <<<'INCLUDE_PATH'
-            $includePaths = require $composerDir . '/include_paths.php';
-            array_push($includePaths, get_include_path());
-            set_include_path(join(PATH_SEPARATOR, $includePaths));
+        $includePaths = require $composerDir . '/include_paths.php';
+        array_push($includePaths, get_include_path());
+        set_include_path(join(PATH_SEPARATOR, $includePaths));
 
 
 INCLUDE_PATH;
@@ -321,10 +337,10 @@ INCLUDE_PATH;
 
         if ($usePSR0) {
             $file .= <<<'PSR0'
-            $map = require $composerDir . '/autoload_namespaces.php';
-            foreach ($map as $namespace => $path) {
-                $loader->add($namespace, $path);
-            }
+        $map = require $composerDir . '/autoload_namespaces.php';
+        foreach ($map as $namespace => $path) {
+            $loader->add($namespace, $path);
+        }
 
 
 PSR0;
@@ -332,10 +348,10 @@ PSR0;
 
         if ($useClassMap) {
             $file .= <<<'CLASSMAP'
-            $classMap = require $composerDir . '/autoload_classmap.php';
-            if ($classMap) {
-                $loader->addClassMap($classMap);
-            }
+        $classMap = require $composerDir . '/autoload_classmap.php';
+        if ($classMap) {
+            $loader->addClassMap($classMap);
+        }
 
 
 CLASSMAP;
@@ -343,7 +359,7 @@ CLASSMAP;
 
         if ($targetDirLoader) {
             $file .= <<<REGISTER_AUTOLOAD
-            spl_autoload_register(array('ComposerAutoloaderInit$classSuffix', 'autoload'));
+        spl_autoload_register(array('ComposerAutoloaderInit$suffix', 'autoload'));
 
 
 REGISTER_AUTOLOAD;
@@ -351,23 +367,21 @@ REGISTER_AUTOLOAD;
         }
 
         $file .= <<<METHOD_FOOTER
-            \$loader->register();
+        \$loader->register();
 $filesCode
-            return \$loader;
-        }
+        return \$loader;
+    }
 
 METHOD_FOOTER;
 
         $file .= $targetDirLoader;
 
         return $file . <<<FOOTER
-    }
 }
 
-return ComposerAutoloaderInit$classSuffix::getLoader();
-
 FOOTER;
 
     }
+
 }
 
diff --git a/tests/Composer/Test/Autoload/AutoloadGeneratorTest.php b/tests/Composer/Test/Autoload/AutoloadGeneratorTest.php
index 6f10bd8af..b821b126d 100644
--- a/tests/Composer/Test/Autoload/AutoloadGeneratorTest.php
+++ b/tests/Composer/Test/Autoload/AutoloadGeneratorTest.php
@@ -159,6 +159,7 @@ class AutoloadGeneratorTest extends TestCase
 
         $this->generator->dump($this->config, $this->repository, $package, $this->im, 'composer', 'TargetDir');
         $this->assertFileEquals(__DIR__.'/Fixtures/autoload_target_dir.php', $this->vendorDir.'/autoload.php');
+        $this->assertFileEquals(__DIR__.'/Fixtures/autoload_real_target_dir.php', $this->vendorDir.'/autoload_realTargetDir.php');
     }
 
     public function testVendorsAutoloading()
@@ -275,6 +276,7 @@ class AutoloadGeneratorTest extends TestCase
 
         $this->generator->dump($this->config, $this->repository, $package, $this->im, 'composer', 'FilesAutoload');
         $this->assertFileEquals(__DIR__.'/Fixtures/autoload_functions.php', $this->vendorDir.'/autoload.php');
+        $this->assertFileEquals(__DIR__.'/Fixtures/autoload_real_functions.php', $this->vendorDir.'/autoload_realFilesAutoload.php');
 
         include $this->vendorDir . '/autoload.php';
         $this->assertTrue(function_exists('testFilesAutoloadGeneration1'));
diff --git a/tests/Composer/Test/Autoload/Fixtures/autoload_functions.php b/tests/Composer/Test/Autoload/Fixtures/autoload_functions.php
index ebea90d04..fd0056060 100644
--- a/tests/Composer/Test/Autoload/Fixtures/autoload_functions.php
+++ b/tests/Composer/Test/Autoload/Fixtures/autoload_functions.php
@@ -1,36 +1,7 @@
 <?php
 
 // autoload.php generated by Composer
-if (!class_exists('Composer\\Autoload\\ClassLoader', false)) {
-    require __DIR__ . '/composer' . '/ClassLoader.php';
-}
 
-if (!class_exists('ComposerAutoloaderInitFilesAutoload', false)) {
-    class ComposerAutoloaderInitFilesAutoload
-    {
-        public static function getLoader()
-        {
-            $loader = new \Composer\Autoload\ClassLoader();
-            $composerDir = __DIR__ . '/composer';
-
-            $map = require $composerDir . '/autoload_namespaces.php';
-            foreach ($map as $namespace => $path) {
-                $loader->add($namespace, $path);
-            }
-
-            $classMap = require $composerDir . '/autoload_classmap.php';
-            if ($classMap) {
-                $loader->addClassMap($classMap);
-            }
-
-            $loader->register();
-
-            require $vendorDir . '/a/a/test.php';
-            require $vendorDir . '/b/b/test2.php';
-
-            return $loader;
-        }
-    }
-}
+require_once 'autoload_realFilesAutoload.php';
 
 return ComposerAutoloaderInitFilesAutoload::getLoader();
diff --git a/tests/Composer/Test/Autoload/Fixtures/autoload_real_functions.php b/tests/Composer/Test/Autoload/Fixtures/autoload_real_functions.php
new file mode 100644
index 000000000..01cb7b9f0
--- /dev/null
+++ b/tests/Composer/Test/Autoload/Fixtures/autoload_real_functions.php
@@ -0,0 +1,32 @@
+<?php
+
+// autoload_realFilesAutoload.php generated by Composer
+if (!class_exists('Composer\\Autoload\\ClassLoader', false)) {
+    require __DIR__ . '/composer' . '/ClassLoader.php';
+}
+
+class ComposerAutoloaderInitFilesAutoload
+{
+    public static function getLoader()
+    {
+        $loader = new \Composer\Autoload\ClassLoader();
+        $composerDir = __DIR__ . '/composer';
+
+        $map = require $composerDir . '/autoload_namespaces.php';
+        foreach ($map as $namespace => $path) {
+            $loader->add($namespace, $path);
+        }
+
+        $classMap = require $composerDir . '/autoload_classmap.php';
+        if ($classMap) {
+            $loader->addClassMap($classMap);
+        }
+
+        $loader->register();
+
+        require $vendorDir . '/a/a/test.php';
+        require $vendorDir . '/b/b/test2.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
new file mode 100644
index 000000000..147b3366b
--- /dev/null
+++ b/tests/Composer/Test/Autoload/Fixtures/autoload_real_target_dir.php
@@ -0,0 +1,49 @@
+<?php
+
+// autoload_realTargetDir.php generated by Composer
+if (!class_exists('Composer\\Autoload\\ClassLoader', false)) {
+    require __DIR__ . '/composer' . '/ClassLoader.php';
+}
+
+class ComposerAutoloaderInitTargetDir
+{
+    public static function getLoader()
+    {
+        $loader = new \Composer\Autoload\ClassLoader();
+        $composerDir = __DIR__ . '/composer';
+
+        $map = require $composerDir . '/autoload_namespaces.php';
+        foreach ($map as $namespace => $path) {
+            $loader->add($namespace, $path);
+        }
+
+        $classMap = require $composerDir . '/autoload_classmap.php';
+        if ($classMap) {
+            $loader->addClassMap($classMap);
+        }
+
+        spl_autoload_register(array('ComposerAutoloaderInitTargetDir', 'autoload'));
+
+        $loader->register();
+
+        return $loader;
+    }
+
+    public static function autoload($class)
+    {
+        $dir = dirname(__DIR__) . '/';
+        $prefixes = array('Main\\Foo', 'Main\\Bar');
+        foreach ($prefixes as $prefix) {
+            if (0 !== strpos($class, $prefix)) {
+                continue;
+            }
+            $path = $dir . implode('/', array_slice(explode('\\', $class), 2)).'.php';
+            if (!$path = stream_resolve_include_path($path)) {
+                return false;
+            }
+            require $path;
+
+            return true;
+        }
+    }
+}
diff --git a/tests/Composer/Test/Autoload/Fixtures/autoload_target_dir.php b/tests/Composer/Test/Autoload/Fixtures/autoload_target_dir.php
index a5bd984e8..8a75cc68a 100644
--- a/tests/Composer/Test/Autoload/Fixtures/autoload_target_dir.php
+++ b/tests/Composer/Test/Autoload/Fixtures/autoload_target_dir.php
@@ -1,53 +1,7 @@
 <?php
 
 // autoload.php generated by Composer
-if (!class_exists('Composer\\Autoload\\ClassLoader', false)) {
-    require __DIR__ . '/composer' . '/ClassLoader.php';
-}
 
-if (!class_exists('ComposerAutoloaderInitTargetDir', false)) {
-    class ComposerAutoloaderInitTargetDir
-    {
-        public static function getLoader()
-        {
-            $loader = new \Composer\Autoload\ClassLoader();
-            $composerDir = __DIR__ . '/composer';
-
-            $map = require $composerDir . '/autoload_namespaces.php';
-            foreach ($map as $namespace => $path) {
-                $loader->add($namespace, $path);
-            }
-
-            $classMap = require $composerDir . '/autoload_classmap.php';
-            if ($classMap) {
-                $loader->addClassMap($classMap);
-            }
-
-            spl_autoload_register(array('ComposerAutoloaderInitTargetDir', 'autoload'));
-
-            $loader->register();
-
-            return $loader;
-        }
-
-        public static function autoload($class)
-        {
-            $dir = dirname(__DIR__) . '/';
-            $prefixes = array('Main\\Foo', 'Main\\Bar');
-            foreach ($prefixes as $prefix) {
-                if (0 !== strpos($class, $prefix)) {
-                    continue;
-                }
-                $path = $dir . implode('/', array_slice(explode('\\', $class), 2)).'.php';
-                if (!$path = stream_resolve_include_path($path)) {
-                    return false;
-                }
-                require $path;
-
-                return true;
-            }
-        }
-    }
-}
+require_once 'autoload_realTargetDir.php';
 
 return ComposerAutoloaderInitTargetDir::getLoader();

From 4c82c35dbc774f8914bad26fe2ff76cccd0e47b5 Mon Sep 17 00:00:00 2001
From: Victor Berchet <victor@suumit.com>
Date: Mon, 6 Aug 2012 10:56:57 +0200
Subject: [PATCH 2/3] [Autoload] Generate the autoloader_real file in the
 target directory

---
 src/Composer/Autoload/AutoloadGenerator.php   | 24 +++++++++----------
 .../Test/Autoload/AutoloadGeneratorTest.php   |  4 ++--
 .../Autoload/Fixtures/autoload_functions.php  |  2 +-
 .../Fixtures/autoload_real_functions.php      |  7 +++---
 .../Fixtures/autoload_real_target_dir.php     |  9 ++++---
 .../Autoload/Fixtures/autoload_target_dir.php |  2 +-
 6 files changed, 23 insertions(+), 25 deletions(-)

diff --git a/src/Composer/Autoload/AutoloadGenerator.php b/src/Composer/Autoload/AutoloadGenerator.php
index b574e7f62..1e62a1122 100644
--- a/src/Composer/Autoload/AutoloadGenerator.php
+++ b/src/Composer/Autoload/AutoloadGenerator.php
@@ -90,13 +90,13 @@ EOF;
             $prefixes = implode(', ', array_map(function ($prefix) {
                 return var_export($prefix, true);
             }, array_keys($mainAutoload['psr-0'])));
-            $baseDirFromVendorDirCode = $filesystem->findShortestPathCode($vendorPath, getcwd(), true);
+            $baseDirFromTargetDirCode = $filesystem->findShortestPathCode($targetDir, getcwd(), true);
 
             $targetDirLoader = <<<EOF
 
     public static function autoload(\$class)
     {
-        \$dir = $baseDirFromVendorDirCode . '/';
+        \$dir = $baseDirFromTargetDirCode . '/';
         \$prefixes = array($prefixes);
         foreach (\$prefixes as \$prefix) {
             if (0 !== strpos(\$class, \$prefix)) {
@@ -136,8 +136,8 @@ EOF;
         if ($includePathFile = $this->getIncludePathsFile($packageMap, $filesystem, $relVendorPath, $vendorPath, $vendorPathCode, $appBaseDirCode)) {
             file_put_contents($targetDir.'/include_paths.php', $includePathFile);
         }
-        file_put_contents($vendorPath.'/autoload.php', $this->getAutoloadFile($suffix));
-        file_put_contents($vendorPath.'/autoload_real'.$suffix.'.php', $this->getAutoloadRealFile($vendorPathToTargetDirCode, true, true, (bool) $includePathFile, $targetDirLoader, $filesCode, $suffix));
+        file_put_contents($vendorPath.'/autoload.php', $this->getAutoloadFile($vendorPathToTargetDirCode, $suffix));
+        file_put_contents($targetDir.'/autoload_real'.$suffix.'.php', $this->getAutoloadRealFile(true, true, (bool) $includePathFile, $targetDirLoader, $filesCode, $suffix));
         copy(__DIR__.'/ClassLoader.php', $targetDir.'/ClassLoader.php');
     }
 
@@ -279,7 +279,7 @@ EOF;
         return $baseDir.var_export($path, true);
     }
 
-    protected function getAutoloadFile($suffix)
+    protected function getAutoloadFile($vendorPathToTargetDirCode, $suffix)
     {
 
 
@@ -288,20 +288,21 @@ EOF;
 
 // autoload.php generated by Composer
 
-require_once 'autoload_real$suffix.php';
+require_once $vendorPathToTargetDirCode . '/autoload_real$suffix.php';
 
 return ComposerAutoloaderInit$suffix::getLoader();
 
 AUTOLOAD;
     }
 
-    protected function getAutoloadRealFile($vendorPathToTargetDirCode, $usePSR0, $useClassMap, $useIncludePath, $targetDirLoader, $filesCode, $suffix)
+    protected function getAutoloadRealFile($usePSR0, $useClassMap, $useIncludePath, $targetDirLoader, $filesCode, $suffix)
     {
         // TODO the class ComposerAutoloaderInit should be revert to a closure
         // when APC has been fixed:
         // - https://github.com/composer/composer/issues/959
         // - https://bugs.php.net/bug.php?id=52144
         // - https://bugs.php.net/bug.php?id=61576
+        // - https://bugs.php.net/bug.php?id=59298
 
         if ($filesCode) {
             $filesCode = "\n".$filesCode;
@@ -312,7 +313,7 @@ AUTOLOAD;
 
 // autoload_real$suffix.php generated by Composer
 if (!class_exists('Composer\\\\Autoload\\\\ClassLoader', false)) {
-    require $vendorPathToTargetDirCode . '/ClassLoader.php';
+    require __DIR__ . '/ClassLoader.php';
 }
 
 class ComposerAutoloaderInit$suffix
@@ -320,14 +321,13 @@ class ComposerAutoloaderInit$suffix
     public static function getLoader()
     {
         \$loader = new \\Composer\\Autoload\\ClassLoader();
-        \$composerDir = $vendorPathToTargetDirCode;
 
 
 HEADER;
 
         if ($useIncludePath) {
             $file .= <<<'INCLUDE_PATH'
-        $includePaths = require $composerDir . '/include_paths.php';
+        $includePaths = require __DIR__ . '/include_paths.php';
         array_push($includePaths, get_include_path());
         set_include_path(join(PATH_SEPARATOR, $includePaths));
 
@@ -337,7 +337,7 @@ INCLUDE_PATH;
 
         if ($usePSR0) {
             $file .= <<<'PSR0'
-        $map = require $composerDir . '/autoload_namespaces.php';
+        $map = require __DIR__ . '/autoload_namespaces.php';
         foreach ($map as $namespace => $path) {
             $loader->add($namespace, $path);
         }
@@ -348,7 +348,7 @@ PSR0;
 
         if ($useClassMap) {
             $file .= <<<'CLASSMAP'
-        $classMap = require $composerDir . '/autoload_classmap.php';
+        $classMap = require __DIR__ . '/autoload_classmap.php';
         if ($classMap) {
             $loader->addClassMap($classMap);
         }
diff --git a/tests/Composer/Test/Autoload/AutoloadGeneratorTest.php b/tests/Composer/Test/Autoload/AutoloadGeneratorTest.php
index b821b126d..aaaecbff1 100644
--- a/tests/Composer/Test/Autoload/AutoloadGeneratorTest.php
+++ b/tests/Composer/Test/Autoload/AutoloadGeneratorTest.php
@@ -159,7 +159,7 @@ class AutoloadGeneratorTest extends TestCase
 
         $this->generator->dump($this->config, $this->repository, $package, $this->im, 'composer', 'TargetDir');
         $this->assertFileEquals(__DIR__.'/Fixtures/autoload_target_dir.php', $this->vendorDir.'/autoload.php');
-        $this->assertFileEquals(__DIR__.'/Fixtures/autoload_real_target_dir.php', $this->vendorDir.'/autoload_realTargetDir.php');
+        $this->assertFileEquals(__DIR__.'/Fixtures/autoload_real_target_dir.php', $this->vendorDir.'/composer/autoload_realTargetDir.php');
     }
 
     public function testVendorsAutoloading()
@@ -276,7 +276,7 @@ class AutoloadGeneratorTest extends TestCase
 
         $this->generator->dump($this->config, $this->repository, $package, $this->im, 'composer', 'FilesAutoload');
         $this->assertFileEquals(__DIR__.'/Fixtures/autoload_functions.php', $this->vendorDir.'/autoload.php');
-        $this->assertFileEquals(__DIR__.'/Fixtures/autoload_real_functions.php', $this->vendorDir.'/autoload_realFilesAutoload.php');
+        $this->assertFileEquals(__DIR__.'/Fixtures/autoload_real_functions.php', $this->vendorDir.'/composer/autoload_realFilesAutoload.php');
 
         include $this->vendorDir . '/autoload.php';
         $this->assertTrue(function_exists('testFilesAutoloadGeneration1'));
diff --git a/tests/Composer/Test/Autoload/Fixtures/autoload_functions.php b/tests/Composer/Test/Autoload/Fixtures/autoload_functions.php
index fd0056060..3fd5eebed 100644
--- a/tests/Composer/Test/Autoload/Fixtures/autoload_functions.php
+++ b/tests/Composer/Test/Autoload/Fixtures/autoload_functions.php
@@ -2,6 +2,6 @@
 
 // autoload.php generated by Composer
 
-require_once 'autoload_realFilesAutoload.php';
+require_once __DIR__ . '/composer' . '/autoload_realFilesAutoload.php';
 
 return ComposerAutoloaderInitFilesAutoload::getLoader();
diff --git a/tests/Composer/Test/Autoload/Fixtures/autoload_real_functions.php b/tests/Composer/Test/Autoload/Fixtures/autoload_real_functions.php
index 01cb7b9f0..90451e69c 100644
--- a/tests/Composer/Test/Autoload/Fixtures/autoload_real_functions.php
+++ b/tests/Composer/Test/Autoload/Fixtures/autoload_real_functions.php
@@ -2,7 +2,7 @@
 
 // autoload_realFilesAutoload.php generated by Composer
 if (!class_exists('Composer\\Autoload\\ClassLoader', false)) {
-    require __DIR__ . '/composer' . '/ClassLoader.php';
+    require __DIR__ . '/ClassLoader.php';
 }
 
 class ComposerAutoloaderInitFilesAutoload
@@ -10,14 +10,13 @@ class ComposerAutoloaderInitFilesAutoload
     public static function getLoader()
     {
         $loader = new \Composer\Autoload\ClassLoader();
-        $composerDir = __DIR__ . '/composer';
 
-        $map = require $composerDir . '/autoload_namespaces.php';
+        $map = require __DIR__ . '/autoload_namespaces.php';
         foreach ($map as $namespace => $path) {
             $loader->add($namespace, $path);
         }
 
-        $classMap = require $composerDir . '/autoload_classmap.php';
+        $classMap = require __DIR__ . '/autoload_classmap.php';
         if ($classMap) {
             $loader->addClassMap($classMap);
         }
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 147b3366b..1e4f7178c 100644
--- a/tests/Composer/Test/Autoload/Fixtures/autoload_real_target_dir.php
+++ b/tests/Composer/Test/Autoload/Fixtures/autoload_real_target_dir.php
@@ -2,7 +2,7 @@
 
 // autoload_realTargetDir.php generated by Composer
 if (!class_exists('Composer\\Autoload\\ClassLoader', false)) {
-    require __DIR__ . '/composer' . '/ClassLoader.php';
+    require __DIR__ . '/ClassLoader.php';
 }
 
 class ComposerAutoloaderInitTargetDir
@@ -10,14 +10,13 @@ class ComposerAutoloaderInitTargetDir
     public static function getLoader()
     {
         $loader = new \Composer\Autoload\ClassLoader();
-        $composerDir = __DIR__ . '/composer';
 
-        $map = require $composerDir . '/autoload_namespaces.php';
+        $map = require __DIR__ . '/autoload_namespaces.php';
         foreach ($map as $namespace => $path) {
             $loader->add($namespace, $path);
         }
 
-        $classMap = require $composerDir . '/autoload_classmap.php';
+        $classMap = require __DIR__ . '/autoload_classmap.php';
         if ($classMap) {
             $loader->addClassMap($classMap);
         }
@@ -31,7 +30,7 @@ class ComposerAutoloaderInitTargetDir
 
     public static function autoload($class)
     {
-        $dir = dirname(__DIR__) . '/';
+        $dir = dirname(dirname(__DIR__)) . '/';
         $prefixes = array('Main\\Foo', 'Main\\Bar');
         foreach ($prefixes as $prefix) {
             if (0 !== strpos($class, $prefix)) {
diff --git a/tests/Composer/Test/Autoload/Fixtures/autoload_target_dir.php b/tests/Composer/Test/Autoload/Fixtures/autoload_target_dir.php
index 8a75cc68a..f08c19b96 100644
--- a/tests/Composer/Test/Autoload/Fixtures/autoload_target_dir.php
+++ b/tests/Composer/Test/Autoload/Fixtures/autoload_target_dir.php
@@ -2,6 +2,6 @@
 
 // autoload.php generated by Composer
 
-require_once 'autoload_realTargetDir.php';
+require_once __DIR__ . '/composer' . '/autoload_realTargetDir.php';
 
 return ComposerAutoloaderInitTargetDir::getLoader();

From d2dc73e3617f6a0d2b7aecf127da3be4d211ed17 Mon Sep 17 00:00:00 2001
From: Victor Berchet <victor@suumit.com>
Date: Mon, 6 Aug 2012 11:33:17 +0200
Subject: [PATCH 3/3] [Autoload] Set $vendorDir et $baseDir in
 ComposerAutoloaderInitTargetDir::getLoader()

---
 src/Composer/Autoload/AutoloadGenerator.php                 | 6 ++++--
 .../Test/Autoload/Fixtures/autoload_real_functions.php      | 2 ++
 .../Test/Autoload/Fixtures/autoload_real_target_dir.php     | 2 ++
 3 files changed, 8 insertions(+), 2 deletions(-)

diff --git a/src/Composer/Autoload/AutoloadGenerator.php b/src/Composer/Autoload/AutoloadGenerator.php
index 1e62a1122..e49b16bc3 100644
--- a/src/Composer/Autoload/AutoloadGenerator.php
+++ b/src/Composer/Autoload/AutoloadGenerator.php
@@ -137,7 +137,7 @@ EOF;
             file_put_contents($targetDir.'/include_paths.php', $includePathFile);
         }
         file_put_contents($vendorPath.'/autoload.php', $this->getAutoloadFile($vendorPathToTargetDirCode, $suffix));
-        file_put_contents($targetDir.'/autoload_real'.$suffix.'.php', $this->getAutoloadRealFile(true, true, (bool) $includePathFile, $targetDirLoader, $filesCode, $suffix));
+        file_put_contents($targetDir.'/autoload_real'.$suffix.'.php', $this->getAutoloadRealFile(true, true, (bool) $includePathFile, $targetDirLoader, $filesCode, $vendorPathCode, $appBaseDirCode, $suffix));
         copy(__DIR__.'/ClassLoader.php', $targetDir.'/ClassLoader.php');
     }
 
@@ -295,7 +295,7 @@ return ComposerAutoloaderInit$suffix::getLoader();
 AUTOLOAD;
     }
 
-    protected function getAutoloadRealFile($usePSR0, $useClassMap, $useIncludePath, $targetDirLoader, $filesCode, $suffix)
+    protected function getAutoloadRealFile($usePSR0, $useClassMap, $useIncludePath, $targetDirLoader, $filesCode, $vendorPathCode, $appBaseDirCode, $suffix)
     {
         // TODO the class ComposerAutoloaderInit should be revert to a closure
         // when APC has been fixed:
@@ -321,6 +321,8 @@ class ComposerAutoloaderInit$suffix
     public static function getLoader()
     {
         \$loader = new \\Composer\\Autoload\\ClassLoader();
+        \$vendorDir = $vendorPathCode;
+        \$baseDir = $appBaseDirCode;
 
 
 HEADER;
diff --git a/tests/Composer/Test/Autoload/Fixtures/autoload_real_functions.php b/tests/Composer/Test/Autoload/Fixtures/autoload_real_functions.php
index 90451e69c..e33ff4fc9 100644
--- a/tests/Composer/Test/Autoload/Fixtures/autoload_real_functions.php
+++ b/tests/Composer/Test/Autoload/Fixtures/autoload_real_functions.php
@@ -10,6 +10,8 @@ class ComposerAutoloaderInitFilesAutoload
     public static function getLoader()
     {
         $loader = new \Composer\Autoload\ClassLoader();
+        $vendorDir = dirname(__DIR__);
+        $baseDir = dirname($vendorDir);
 
         $map = require __DIR__ . '/autoload_namespaces.php';
         foreach ($map as $namespace => $path) {
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 1e4f7178c..7ed23490b 100644
--- a/tests/Composer/Test/Autoload/Fixtures/autoload_real_target_dir.php
+++ b/tests/Composer/Test/Autoload/Fixtures/autoload_real_target_dir.php
@@ -10,6 +10,8 @@ class ComposerAutoloaderInitTargetDir
     public static function getLoader()
     {
         $loader = new \Composer\Autoload\ClassLoader();
+        $vendorDir = dirname(__DIR__);
+        $baseDir = dirname($vendorDir);
 
         $map = require __DIR__ . '/autoload_namespaces.php';
         foreach ($map as $namespace => $path) {