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

Ignore ambiguous classes in tests/fixtures dirs, fixes #2858

pull/2189/merge
Jordi Boggiano 2014-03-31 21:36:48 +02:00
parent 355dc67038
commit 8974a1ac92
2 changed files with 2 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/Composer/Autoload/ClassMapGenerator.php
View File

@ -84,7 +84,7 @@ class ClassMapGenerator
foreach ($classes as $class) { foreach ($classes as $class) {
if (!isset($map[$class])) { if (!isset($map[$class])) {
$map[$class] = $filePath; $map[$class] = $filePath;
} elseif ($io && $map[$class] !== $filePath) { } elseif ($io && $map[$class] !== $filePath && preg_match('{/(test|fixture)s?/}i', strtr($map[$class].' '.$filePath, '\\', '/'))) {
$io->write( $io->write(
'<warning>Warning: Ambiguous class resolution, "'.$class.'"'. '<warning>Warning: Ambiguous class resolution, "'.$class.'"'.
' was found in both "'.$map[$class].'" and "'.$filePath.'", the first will be used.</warning>' ' was found in both "'.$map[$class].'" and "'.$filePath.'", the first will be used.</warning>'

1
tests/Composer/Test/Autoload/ClassMapGeneratorTest.php
View File

@ -102,6 +102,7 @@ class ClassMapGeneratorTest extends \PHPUnit_Framework_TestCase
$find->invoke(null, __DIR__.'/no-file'); $find->invoke(null, __DIR__.'/no-file');
} }
public function testAmbiguousReference() public function testAmbiguousReference()
{ {
$this->checkIfFinderIsAvailable(); $this->checkIfFinderIsAvailable();