|
@@ -267,13 +267,12 @@ EOF;
|
|
$classMap = $this->addClassMapCode($filesystem, $basePath, $vendorPath, $dir, $blacklist, null, null, $classMap, $ambiguousClasses);
|
|
$classMap = $this->addClassMapCode($filesystem, $basePath, $vendorPath, $dir, $blacklist, null, null, $classMap, $ambiguousClasses);
|
|
}
|
|
}
|
|
|
|
|
|
- foreach($ambiguousClasses as $className => $ambigiousPaths)
|
|
|
|
- {
|
|
|
|
|
|
+ foreach ($ambiguousClasses as $className => $ambigiousPaths) {
|
|
$cleanPath = str_replace(array('$vendorDir . \'', "',\n"), array($vendorPath, ''), $classMap[$className]);
|
|
$cleanPath = str_replace(array('$vendorDir . \'', "',\n"), array($vendorPath, ''), $classMap[$className]);
|
|
|
|
|
|
$this->io->writeError(
|
|
$this->io->writeError(
|
|
'<warning>Warning: Ambiguous class resolution, "'.$className.'"'.
|
|
'<warning>Warning: Ambiguous class resolution, "'.$className.'"'.
|
|
- ' was found '. (count($ambigiousPaths)+1) .'x: in "'.$cleanPath.'" and "'. implode('", "', $ambigiousPaths) .'", the first will be used.</warning>'
|
|
|
|
|
|
+ ' was found '. (count($ambigiousPaths) + 1) .'x: in "'.$cleanPath.'" and "'. implode('", "', $ambigiousPaths) .'", the first will be used.</warning>'
|
|
);
|
|
);
|
|
}
|
|
}
|
|
|
|
|
|
@@ -401,8 +400,8 @@ EOF;
|
|
/**
|
|
/**
|
|
* Compiles an ordered list of namespace => path mappings
|
|
* Compiles an ordered list of namespace => path mappings
|
|
*
|
|
*
|
|
- * @param array $packageMap array of array(package, installDir-relative-to-composer.json)
|
|
|
|
- * @param PackageInterface $mainPackage root package instance
|
|
|
|
|
|
+ * @param array $packageMap array of array(package, installDir-relative-to-composer.json)
|
|
|
|
+ * @param PackageInterface $mainPackage root package instance
|
|
* @param bool $filterOutRequireDevPackages whether to filter out require-dev packages
|
|
* @param bool $filterOutRequireDevPackages whether to filter out require-dev packages
|
|
* @return array array('psr-0' => array('Ns\\Foo' => array('installDir')))
|
|
* @return array array('psr-0' => array('Ns\\Foo' => array('installDir')))
|
|
*/
|
|
*/
|