From aff7745231fc2fd83238edd10ef949da054d0bd7 Mon Sep 17 00:00:00 2001
From: Jordi Boggiano <j.boggiano@seld.be>
Date: Mon, 23 Apr 2012 10:56:46 +0200
Subject: [PATCH] Fix target-dir autoloader

---
 src/Composer/Autoload/AutoloadGenerator.php                 | 6 +++---
 .../Composer/Test/Autoload/Fixtures/autoload_target_dir.php | 4 ++--
 2 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/src/Composer/Autoload/AutoloadGenerator.php b/src/Composer/Autoload/AutoloadGenerator.php
index c94004c20..3d8c7b752 100644
--- a/src/Composer/Autoload/AutoloadGenerator.php
+++ b/src/Composer/Autoload/AutoloadGenerator.php
@@ -88,12 +88,12 @@ EOF;
             $prefixes = implode(', ', array_map(function ($prefix) {
                 return var_export($prefix, true);
             }, array_keys($mainAutoload['psr-0'])));
-            $baseDirFromTargetDirCode = $filesystem->findShortestPathCode(realpath($targetDir), getcwd(), true);
+            $baseDirFromVendorDirCode = $filesystem->findShortestPathCode($vendorPath, getcwd(), true);
 
             $targetDirLoader = <<<EOF
     spl_autoload_register(function(\$class) {
-        static \$dir = $baseDirFromTargetDirCode . '/';
-        static \$prefixes = array($prefixes);
+        \$dir = $baseDirFromVendorDirCode . '/';
+        \$prefixes = array($prefixes);
         foreach (\$prefixes as \$prefix) {
             if (0 !== strpos(\$class, \$prefix)) {
                 continue;
diff --git a/tests/Composer/Test/Autoload/Fixtures/autoload_target_dir.php b/tests/Composer/Test/Autoload/Fixtures/autoload_target_dir.php
index 8b90f937c..16d187d27 100644
--- a/tests/Composer/Test/Autoload/Fixtures/autoload_target_dir.php
+++ b/tests/Composer/Test/Autoload/Fixtures/autoload_target_dir.php
@@ -20,8 +20,8 @@ return call_user_func(function() {
     }
 
     spl_autoload_register(function($class) {
-        static $dir = dirname(dirname(__DIR__)) . '/';
-        static $prefixes = array('Main\\Foo', 'Main\\Bar');
+        $dir = dirname(__DIR__) . '/';
+        $prefixes = array('Main\\Foo', 'Main\\Bar');
         foreach ($prefixes as $prefix) {
             if (0 !== strpos($class, $prefix)) {
                 continue;