瀏覽代碼

Avoid outputing duplicate warnings for ambiguous class resolution, fixes #4953

Jordi Boggiano 9 年之前
父節點
當前提交
cdea645eab
共有 1 個文件被更改,包括 3 次插入3 次删除
  1. 3 3
      src/Composer/Autoload/AutoloadGenerator.php

+ 3 - 3
src/Composer/Autoload/AutoloadGenerator.php

@@ -313,9 +313,9 @@ EOF;
         return $classMap;
     }
 
-    private function generateClassMap($dir, $blacklist = null, $namespaceFilter = null)
+    private function generateClassMap($dir, $blacklist = null, $namespaceFilter = null, $showAmbiguousWarning = true)
     {
-        return ClassMapGenerator::createMap($dir, $blacklist, $this->io, $namespaceFilter);
+        return ClassMapGenerator::createMap($dir, $blacklist, $showAmbiguousWarning ? $this->io : null, $namespaceFilter);
     }
 
     public function buildPackageMap(InstallationManager $installationManager, PackageInterface $mainPackage, array $packages)
@@ -417,7 +417,7 @@ EOF;
         if (isset($autoloads['classmap'])) {
             foreach ($autoloads['classmap'] as $dir) {
                 try {
-                    $loader->addClassMap($this->generateClassMap($dir));
+                    $loader->addClassMap($this->generateClassMap($dir, null, null, false));
                 } catch (\RuntimeException $e) {
                     $this->io->writeError('<warning>'.$e->getMessage().'</warning>');
                 }