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

fix typo (#10331)

pull/10334/head
Wataru Kurashima 2021-12-04 15:48:28 +09:00 committed by GitHub
parent 128a2648fb
commit 10f8edb816
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
3 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -356,12 +356,12 @@ EOF;
}
}
foreach ($ambiguousClasses as $className => $ambigiousPaths) {
foreach ($ambiguousClasses as $className => $ambiguousPaths) {
$cleanPath = str_replace(array('$vendorDir . \'', '$baseDir . \'', "',\n"), array($vendorPath, $basePath, ''), $classMap[$className]);
$this->io->writeError(
'<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($ambiguousPaths) + 1) .'x: in "'.$cleanPath.'" and "'. implode('", "', $ambiguousPaths) .'", the first will be used.</warning>'
);
}

2
src/Composer/DependencyResolver/PoolBuilder.php
View File

@ -414,7 +414,7 @@ class PoolBuilder
}
}
// if propogateUpdate is false we are loading a fixed or locked package, root aliases do not apply as they are
// if propagateUpdate is false we are loading a fixed or locked package, root aliases do not apply as they are
// manually loaded as separate packages in this case
if ($propagateUpdate && isset($this->rootAliases[$name][$package->getVersion()])) {
$alias = $this->rootAliases[$name][$package->getVersion()];

2
src/Composer/Util/Filesystem.php
View File

@ -176,7 +176,7 @@ class Filesystem
* @param string $directory
* @param bool $fallbackToPhp
*
* @return bool|null Returns null, when no edge case was hit. Otherwise a bool whether removal was successfull
* @return bool|null Returns null, when no edge case was hit. Otherwise a bool whether removal was successful
*/
private function removeEdgeCases($directory, $fallbackToPhp = true)
{