diff --git a/src/Composer/Command/CreateProjectCommand.php b/src/Composer/Command/CreateProjectCommand.php index 1208a404e..9a06174e6 100644 --- a/src/Composer/Command/CreateProjectCommand.php +++ b/src/Composer/Command/CreateProjectCommand.php @@ -199,7 +199,7 @@ EOT if (!$keepVcs && $installedFromVcs && ( !$io->isInteractive() - || $io->askConfirmation('Do you want to remove the exisitng VCS (.git, .svn..) history? [Y,n]? ', true) + || $io->askConfirmation('Do you want to remove the existing VCS (.git, .svn..) history? [Y,n]? ', true) ) ) { $finder = new Finder(); @@ -216,7 +216,7 @@ EOT } } } catch (\Exception $e) { - $io->write('An error occured while removing the VCS metadata: '.$e->getMessage().''); + $io->write('An error occurred while removing the VCS metadata: '.$e->getMessage().''); } } diff --git a/src/Composer/DependencyResolver/Problem.php b/src/Composer/DependencyResolver/Problem.php index ec68b28db..51af36e80 100644 --- a/src/Composer/DependencyResolver/Problem.php +++ b/src/Composer/DependencyResolver/Problem.php @@ -85,7 +85,7 @@ class Problem if (0 === stripos($job['packageName'], 'lib-')) { $lib = substr($job['packageName'], 4); - return "\n - The requested linked library ".$job['packageName'].$this->constraintToText($job['constraint']).' has the wrong version instaled or is missing from your system, make sure to have the extension providing it.'; + return "\n - The requested linked library ".$job['packageName'].$this->constraintToText($job['constraint']).' has the wrong version installed or is missing from your system, make sure to have the extension providing it.'; } return "\n - The requested package ".$job['packageName'].$this->constraintToText($job['constraint']).' could not be found.'; diff --git a/src/Composer/DependencyResolver/Rule.php b/src/Composer/DependencyResolver/Rule.php index f1b9b408c..d249f6d37 100644 --- a/src/Composer/DependencyResolver/Rule.php +++ b/src/Composer/DependencyResolver/Rule.php @@ -203,7 +203,7 @@ class Rule // handle linked libs $lib = substr($targetName, 4); - $text .= ' -> the requested linked library '.$lib.' has the wrong version instaled or is missing from your system, make sure to have the extension providing it.'; + $text .= ' -> the requested linked library '.$lib.' has the wrong version installed or is missing from your system, make sure to have the extension providing it.'; } else { $text .= ' -> no matching package found.'; } diff --git a/src/Composer/DependencyResolver/RuleWatchGraph.php b/src/Composer/DependencyResolver/RuleWatchGraph.php index 72b288e15..59c2d6ef5 100644 --- a/src/Composer/DependencyResolver/RuleWatchGraph.php +++ b/src/Composer/DependencyResolver/RuleWatchGraph.php @@ -34,7 +34,7 @@ class RuleWatchGraph * * Assertions are skipped because they only depend on a single package and * have no alternative literal that could be true, so there is no need to - * watch chnages in any literals. + * watch changes in any literals. * * @param RuleWatchNode $node The rule node to be inserted into the graph */ @@ -59,7 +59,7 @@ class RuleWatchGraph * If a decision, e.g. +A has been made, then all rules containing -A, e.g. * (-A|+B|+C) now need to satisfy at least one of the other literals, so * that the rule as a whole becomes true, since with +A applied the rule - * is now (false|+B|+C) so essentialy (+B|+C). + * is now (false|+B|+C) so essentially (+B|+C). * * This means that all rules watching the literal -A need to be updated to * watch 2 other literals which can still be satisfied instead. So literals diff --git a/src/Composer/DependencyResolver/Solver.php b/src/Composer/DependencyResolver/Solver.php index 2ad3965fe..943fad684 100644 --- a/src/Composer/DependencyResolver/Solver.php +++ b/src/Composer/DependencyResolver/Solver.php @@ -551,7 +551,7 @@ class Solver /*------------------------------------------------------------------- * enable/disable learnt rules * - * we have enabled or disabled some of our rules. We now reenable all + * we have enabled or disabled some of our rules. We now re-enable all * of our learnt rules except the ones that were learnt from rules that * are now disabled. */ diff --git a/src/Composer/Downloader/DownloadManager.php b/src/Composer/Downloader/DownloadManager.php index 86cfe3d1c..42f822c00 100644 --- a/src/Composer/Downloader/DownloadManager.php +++ b/src/Composer/Downloader/DownloadManager.php @@ -85,7 +85,7 @@ class DownloadManager * * @return DownloaderInterface * - * @throws UnexpectedValueException if downloader for provided type is not registeterd + * @throws UnexpectedValueException if downloader for provided type is not registered */ public function getDownloader($type) { diff --git a/src/Composer/Installer.php b/src/Composer/Installer.php index a3898a95e..f1349bcaa 100644 --- a/src/Composer/Installer.php +++ b/src/Composer/Installer.php @@ -708,7 +708,7 @@ class Installer } /** - * wether to run in drymode or not + * Whether to run in drymode or not * * @param boolean $dryRun * @return Installer @@ -747,7 +747,7 @@ class Installer } /** - * Wether or not generated autoloader are optimized + * Whether or not generated autoloader are optimized * * @param bool $optimizeAutoloader * @return Installer diff --git a/src/Composer/Repository/Pear/PackageDependencyParser.php b/src/Composer/Repository/Pear/PackageDependencyParser.php index aa198ceb4..515993d03 100644 --- a/src/Composer/Repository/Pear/PackageDependencyParser.php +++ b/src/Composer/Repository/Pear/PackageDependencyParser.php @@ -250,7 +250,7 @@ class PackageDependencyParser /** * Parses version constraint * - * @param array $data array containing serveral 'min', 'max', 'has', 'exclude' and other keys. + * @param array $data array containing several 'min', 'max', 'has', 'exclude' and other keys. * @return string */ private function parse20VersionConstraint(array $data) diff --git a/src/Composer/Repository/Pear/PackageInfo.php b/src/Composer/Repository/Pear/PackageInfo.php index 5fd5956d3..d579187e5 100644 --- a/src/Composer/Repository/Pear/PackageInfo.php +++ b/src/Composer/Repository/Pear/PackageInfo.php @@ -69,7 +69,7 @@ class PackageInfo } /** - * @return string the package short escription + * @return string the package short description */ public function getShortDescription() { diff --git a/src/Composer/Repository/RepositoryManager.php b/src/Composer/Repository/RepositoryManager.php index cb4a616d8..ea0dca137 100644 --- a/src/Composer/Repository/RepositoryManager.php +++ b/src/Composer/Repository/RepositoryManager.php @@ -89,7 +89,7 @@ class RepositoryManager * @param string $type repository type * @param string $config repository configuration * @return RepositoryInterface - * @throws InvalidArgumentException if repository for provided type is not registeterd + * @throws InvalidArgumentException if repository for provided type is not registered */ public function createRepository($type, $config) { diff --git a/src/Composer/Repository/VcsRepository.php b/src/Composer/Repository/VcsRepository.php index 048a085f7..d26e37613 100644 --- a/src/Composer/Repository/VcsRepository.php +++ b/src/Composer/Repository/VcsRepository.php @@ -145,7 +145,7 @@ class VcsRepository extends ArrayRepository if (isset($data['version'])) { $data['version_normalized'] = $this->versionParser->normalize($data['version']); } else { - // auto-versionned package, read value from tag + // auto-versioned package, read value from tag $data['version'] = $tag; $data['version_normalized'] = $parsedTag; } @@ -200,7 +200,7 @@ class VcsRepository extends ArrayRepository continue; } - // branches are always auto-versionned, read value from branch name + // branches are always auto-versioned, read value from branch name $data['version'] = $branch; $data['version_normalized'] = $parsedBranch; diff --git a/src/Composer/Script/Event.php b/src/Composer/Script/Event.php index 239d494c8..2252ad966 100644 --- a/src/Composer/Script/Event.php +++ b/src/Composer/Script/Event.php @@ -41,7 +41,7 @@ class Event * Constructor. * * @param string $name The event name - * @param Composer $composer The composer objet + * @param Composer $composer The composer object * @param IOInterface $io The IOInterface object */ public function __construct($name, Composer $composer, IOInterface $io)