public-mirrors
/
composer
mirror of https://github.com/composer/composer
1
0
Fork 0
Code

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

pull/4517/merge
Jordi Boggiano 2016-02-24 13:07:04 +00:00
parent 45f6b37615
commit cdea645eab
1 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
src/Composer/Autoload/AutoloadGenerator.php
View File

@ -313,9 +313,9 @@ EOF;
return $classMap; 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) public function buildPackageMap(InstallationManager $installationManager, PackageInterface $mainPackage, array $packages)
@ -417,7 +417,7 @@ EOF;
if (isset($autoloads['classmap'])) { if (isset($autoloads['classmap'])) {
foreach ($autoloads['classmap'] as $dir) { foreach ($autoloads['classmap'] as $dir) {
try { try {
$loader->addClassMap($this->generateClassMap($dir)); $loader->addClassMap($this->generateClassMap($dir, null, null, false));
} catch (\RuntimeException $e) { } catch (\RuntimeException $e) {
$this->io->writeError('<warning>'.$e->getMessage().'</warning>'); $this->io->writeError('<warning>'.$e->getMessage().'</warning>');
} }