From 0bcf3c26d9f5fa093e5d6fad8a0d1b18d6b6fcf4 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Fran=C3=A7ois=20Pluchino?=
 <francois.pluchino@opendisplay.com>
Date: Wed, 25 Jan 2012 17:08:06 +0100
Subject: [PATCH] Add .composer/autoload.php in namespace loader

---
 src/Composer/Trigger/TriggerDispatcher.php | 35 +++++++++++-----------
 1 file changed, 18 insertions(+), 17 deletions(-)

diff --git a/src/Composer/Trigger/TriggerDispatcher.php b/src/Composer/Trigger/TriggerDispatcher.php
index 5bb9514a9..a321bb5d4 100644
--- a/src/Composer/Trigger/TriggerDispatcher.php
+++ b/src/Composer/Trigger/TriggerDispatcher.php
@@ -103,11 +103,12 @@ class TriggerDispatcher
     protected function getListeners(TriggerEvent $event)
     {
         $package = $this->composer->getPackage();
+        $vendorDir = $this->composer->getInstallationManager()->getVendorPath(true);
+        $autoloadFile = $vendorDir . '/.composer/autoload.php';
         $ex = $package->getExtra();
         $al = $package->getAutoload();
         $searchListeners = array();
-        $searchNamespaces = array();
-        $listeners = array();
+        $listeners = array();
         $namespaces = array();
 
         // get classes
@@ -117,34 +118,34 @@ class TriggerDispatcher
             }
         }
 
-        // get namespaces
+        // get autoload namespaces
+        if (file_exists($autoloadFile)) {
+            $this->loader = require $autoloadFile;
+        }
+
+        $namespaces = $this->loader->getPrefixes();
+
+        // get namespaces in composer.json project
         if (isset($al['psr-0'])) {
             foreach ($al['psr-0'] as $ns => $path) {
-                $path = trim(realpath('.') . '/' . $path, '/');
-                $searchNamespaces[$ns] = $path;
+                if (!isset($namespaces[str_replace('\\', '\\\\', $ns)])) {
+                    $this->loader->add($ns, trim(realpath('.').'/'.$path, '/'));
+                }
             }
+
+            $this->loader->register();
+            $namespaces = $this->loader->getPrefixes();
         }
 
         // filter class::method have not a namespace registered
-        foreach ($searchNamespaces as $ns => $path) {
+        foreach ($namespaces as $ns => $path) {
             foreach ($searchListeners as $method) {
                 if (0 === strpos($method, $ns)) {
                     $listeners[] = $method;
-
-                    if (!in_array($ns, array_keys($namespaces))) {
-                        $namespaces[$ns] = $path;
-                    }
                 }
             }
         }
 
-        // register namespaces in class loader
-        foreach ($namespaces as $ns => $path) {
-            $this->loader->add($ns, $path);
-        }
-
-        $this->loader->register();
-
         return $listeners;
     }
 }