1
0
Fork 0

Fixed typos

pull/1256/head
Pascal Borreli 2012-10-24 23:14:04 +00:00
parent f3bfeb3608
commit 5eead93250
12 changed files with 16 additions and 16 deletions

View File

@ -199,7 +199,7 @@ EOT
if (!$keepVcs && $installedFromVcs if (!$keepVcs && $installedFromVcs
&& ( && (
!$io->isInteractive() !$io->isInteractive()
|| $io->askConfirmation('<info>Do you want to remove the exisitng VCS (.git, .svn..) history?</info> [<comment>Y,n</comment>]? ', true) || $io->askConfirmation('<info>Do you want to remove the existing VCS (.git, .svn..) history?</info> [<comment>Y,n</comment>]? ', true)
) )
) { ) {
$finder = new Finder(); $finder = new Finder();
@ -216,7 +216,7 @@ EOT
} }
} }
} catch (\Exception $e) { } catch (\Exception $e) {
$io->write('<error>An error occured while removing the VCS metadata: '.$e->getMessage().'</error>'); $io->write('<error>An error occurred while removing the VCS metadata: '.$e->getMessage().'</error>');
} }
} }

View File

@ -85,7 +85,7 @@ class Problem
if (0 === stripos($job['packageName'], 'lib-')) { if (0 === stripos($job['packageName'], 'lib-')) {
$lib = substr($job['packageName'], 4); $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.'; return "\n - The requested package ".$job['packageName'].$this->constraintToText($job['constraint']).' could not be found.';

View File

@ -203,7 +203,7 @@ class Rule
// handle linked libs // handle linked libs
$lib = substr($targetName, 4); $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 { } else {
$text .= ' -> no matching package found.'; $text .= ' -> no matching package found.';
} }

View File

@ -34,7 +34,7 @@ class RuleWatchGraph
* *
* Assertions are skipped because they only depend on a single package and * 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 * 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 * @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. * 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 * (-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 * 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 * 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 * watch 2 other literals which can still be satisfied instead. So literals

View File

@ -551,7 +551,7 @@ class Solver
/*------------------------------------------------------------------- /*-------------------------------------------------------------------
* enable/disable learnt rules * 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 * of our learnt rules except the ones that were learnt from rules that
* are now disabled. * are now disabled.
*/ */

View File

@ -85,7 +85,7 @@ class DownloadManager
* *
* @return DownloaderInterface * @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) public function getDownloader($type)
{ {

View File

@ -708,7 +708,7 @@ class Installer
} }
/** /**
* wether to run in drymode or not * Whether to run in drymode or not
* *
* @param boolean $dryRun * @param boolean $dryRun
* @return Installer * @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 * @param bool $optimizeAutoloader
* @return Installer * @return Installer

View File

@ -250,7 +250,7 @@ class PackageDependencyParser
/** /**
* Parses version constraint * 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 * @return string
*/ */
private function parse20VersionConstraint(array $data) private function parse20VersionConstraint(array $data)

View File

@ -69,7 +69,7 @@ class PackageInfo
} }
/** /**
* @return string the package short escription * @return string the package short description
*/ */
public function getShortDescription() public function getShortDescription()
{ {

View File

@ -89,7 +89,7 @@ class RepositoryManager
* @param string $type repository type * @param string $type repository type
* @param string $config repository configuration * @param string $config repository configuration
* @return RepositoryInterface * @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) public function createRepository($type, $config)
{ {

View File

@ -145,7 +145,7 @@ class VcsRepository extends ArrayRepository
if (isset($data['version'])) { if (isset($data['version'])) {
$data['version_normalized'] = $this->versionParser->normalize($data['version']); $data['version_normalized'] = $this->versionParser->normalize($data['version']);
} else { } else {
// auto-versionned package, read value from tag // auto-versioned package, read value from tag
$data['version'] = $tag; $data['version'] = $tag;
$data['version_normalized'] = $parsedTag; $data['version_normalized'] = $parsedTag;
} }
@ -200,7 +200,7 @@ class VcsRepository extends ArrayRepository
continue; 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'] = $branch;
$data['version_normalized'] = $parsedBranch; $data['version_normalized'] = $parsedBranch;

View File

@ -41,7 +41,7 @@ class Event
* Constructor. * Constructor.
* *
* @param string $name The event name * @param string $name The event name
* @param Composer $composer The composer objet * @param Composer $composer The composer object
* @param IOInterface $io The IOInterface object * @param IOInterface $io The IOInterface object
*/ */
public function __construct($name, Composer $composer, IOInterface $io) public function __construct($name, Composer $composer, IOInterface $io)