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

Merge remote-tracking branch 'pborreli/typos'

pull/1266/merge
Jordi Boggiano 2012-10-25 15:11:46 +02:00
parent f3bfeb3608 83fd3967f0
commit b88d9167d1
31 changed files with 63 additions and 41 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
src/Composer/Command/CreateProjectCommand.php
View File

@ -199,7 +199,7 @@ EOT
if (!$keepVcs && $installedFromVcs
&& (
!$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();
@ -216,7 +216,7 @@ EOT
}
}
} 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>');
}
}

10
src/Composer/Command/ShowCommand.php
View File

@ -146,6 +146,10 @@ EOT
/**
* finds a package by name and version if provided
*
* @param RepositoryInterface $installedRepo
* @param RepositoryInterface $repos
* @param string $name
* @param string $version
* @return array array(CompletePackageInterface, array of versions)
* @throws \InvalidArgumentException
*/
@ -267,7 +271,11 @@ EOT
/**
* print link objects
*
* @param string $linkType
* @param InputInterface $input
* @param OutputInterface $output
* @param CompletePackageInterface $package
* @param string $linkType
* @param string $title
*/
protected function printLinks(InputInterface $input, OutputInterface $output, CompletePackageInterface $package, $linkType, $title = null)
{

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

@ -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.';

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

@ -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.';
}

3
src/Composer/DependencyResolver/RuleSetGenerator.php
View File

@ -106,7 +106,7 @@ class RuleSetGenerator
* and B the provider.
*
* @param PackageInterface $issuer The package declaring the conflict
* @param Package $provider The package causing the conflict
* @param PackageInterface $provider The package causing the conflict
* @param int $reason A RULE_* constant describing the
* reason for generating this rule
* @param mixed $reasonData Any data, e.g. the package name, that
@ -226,7 +226,6 @@ class RuleSetGenerator
*
* @param PackageInterface $package Rules for this package's updates are to
* be added
* @param bool $allowAll Whether downgrades are allowed
*/
private function addRulesForUpdatePackages(PackageInterface $package)
{

4
src/Composer/DependencyResolver/RuleWatchGraph.php
View File

@ -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

3
src/Composer/DependencyResolver/Solver.php
View File

@ -204,6 +204,7 @@ class Solver
* Evaluates each term affected by the decision (linked through watches)
* If we find unit rules we make new decisions based on them
*
* @param integer $level
* @return Rule|null A rule on conflict, otherwise null.
*/
protected function propagate($level)
@ -551,7 +552,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.
*/

2
src/Composer/Downloader/DownloadManager.php
View File

@ -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)
{

5
src/Composer/Downloader/FileDownloader.php
View File

@ -37,7 +37,10 @@ class FileDownloader implements DownloaderInterface
/**
* Constructor.
*
* @param IOInterface $io The IO instance
* @param IOInterface $io The IO instance
* @param Config $config The config
* @param RemoteFilesystem $rfs The remote filesystem
* @param Filesystem $filesystem The filesystem
*/
public function __construct(IOInterface $io, Config $config, RemoteFilesystem $rfs = null, Filesystem $filesystem = null)
{

5
src/Composer/Downloader/PearPackageExtractor.php
View File

@ -127,8 +127,9 @@ class PearPackageExtractor
/**
* Builds list of copy and list of remove actions that would transform extracted PEAR tarball into installed package.
*
* @param $source string path to extracted files.
* @param $role string package file types to extract.
* @param string $source string path to extracted files
* @param array $roles array [role => roleRoot] relative root for files having that role
* @param array $vars list of values can be used for replacement tasks
* @return array array of 'source' => 'target', where source is location of file in the tarball (relative to source
* path, and target is destination of file (also relative to $source path)
* @throws \RuntimeException

2
src/Composer/Downloader/VcsDownloader.php
View File

@ -136,7 +136,7 @@ abstract class VcsDownloader implements DownloaderInterface
* Prompt the user to check if changes should be stashed/removed or the operation aborted
*
* @param string $path
* @param bool $stash if true (update) the changes can be stashed and reapplied after an update,
* @param bool $update if true (update) the changes can be stashed and reapplied after an update,
* if false (remove) the changes should be assumed to be lost if the operation is not aborted
* @throws \RuntimeException in case the operation must be aborted
*/

3
src/Composer/Factory.php
View File

@ -225,7 +225,8 @@ class Factory
}
/**
* @param IO\IOInterface $io
* @param IO\IOInterface $io
* @param Config $config
* @return Downloader\DownloadManager
*/
public function createDownloadManager(IOInterface $io, Config $config)

4
src/Composer/Installer.php
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
* @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

2
src/Composer/Installer/InstallationManager.php
View File

@ -137,7 +137,7 @@ class InstallationManager
* Executes update operation.
*
* @param RepositoryInterface $repo repository in which to check
* @param InstallOperation $operation operation instance
* @param UpdateOperation $operation operation instance
*/
public function update(RepositoryInterface $repo, UpdateOperation $operation)
{

3
src/Composer/Installer/InstallerInstaller.php
View File

@ -29,8 +29,11 @@ class InstallerInstaller extends LibraryInstaller
private static $classCounter = 0;
/**
* Initializes Installer installer.
*
* @param IOInterface $io
* @param Composer $composer
* @param string $type
*/
public function __construct(IOInterface $io, Composer $composer, $type = 'library')
{

1
src/Composer/Installer/LibraryInstaller.php
View File

@ -40,6 +40,7 @@ class LibraryInstaller implements InstallerInterface
*
* @param IOInterface $io
* @param Composer $composer
* @param string $type
*/
public function __construct(IOInterface $io, Composer $composer, $type = 'library')
{

6
src/Composer/Package/Link.php
View File

@ -26,14 +26,16 @@ class Link
protected $target;
protected $constraint;
protected $description;
protected $prettyConstraint;
/**
* Creates a new package link.
*
* @param string $source
* @param string $target
* @param LinkConstraintInterface $constraint Constraint applying to the target of this link
* @param string $description Used to create a descriptive string representation
* @param LinkConstraintInterface $constraint Constraint applying to the target of this link
* @param string $description Used to create a descriptive string representation
* @param string $prettyConstraint
*/
public function __construct($source, $target, LinkConstraintInterface $constraint = null, $description = 'relates to', $prettyConstraint = null)
{

8
src/Composer/Package/Locker.php
View File

@ -213,9 +213,11 @@ class Locker
/**
* Locks provided data into lockfile.
*
* @param array $packages array of packages
* @param mixed $packages array of dev packages or null if installed without --dev
* @param array $aliases array of aliases
* @param array $packages array of packages
* @param mixed $devPackages array of dev packages or null if installed without --dev
* @param array $aliases array of aliases
* @param string $minimumStability
* @param array $stabilityFlags
*
* @return bool
*/

2
src/Composer/Package/PackageInterface.php
View File

@ -97,7 +97,7 @@ interface PackageInterface
/**
* Returns source from which this package was installed (source/dist).
*
* @param string $type source/dist
* @return string source/dist
*/
public function getInstallationSource();

2
src/Composer/Package/Version/VersionParser.php
View File

@ -150,7 +150,7 @@ class VersionParser
/**
* Normalizes a branch name to be able to perform comparisons on it
*
* @param string $version
* @param string $name
* @return array
*/
public function normalizeBranch($name)

2
src/Composer/Repository/Pear/PackageDependencyParser.php
View File

@ -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)

2
src/Composer/Repository/Pear/PackageInfo.php
View File

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

2
src/Composer/Repository/Pear/ReleaseInfo.php
View File

@ -24,7 +24,7 @@ class ReleaseInfo
/**
* @param string $stability
* @param DependencyInfo $dependencies
* @param DependencyInfo $dependencyInfo
*/
public function __construct($stability, $dependencyInfo)
{

3
src/Composer/Repository/PearRepository.php
View File

@ -83,7 +83,8 @@ class PearRepository extends ArrayRepository
/**
* Builds CompletePackages from PEAR package definition data.
*
* @param ChannelInfo $channelInfo
* @param ChannelInfo $channelInfo
* @param VersionParser $versionParser
* @return CompletePackage
*/
private function buildComposerPackages(ChannelInfo $channelInfo, VersionParser $versionParser)

2
src/Composer/Repository/RepositoryManager.php
View File

@ -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)
{

4
src/Composer/Repository/Vcs/VcsDriverInterface.php
View File

@ -84,9 +84,9 @@ interface VcsDriverInterface
/**
* Checks if this driver can handle a given url
*
* @param IOInterface $io IO instance
* @param IOInterface $io IO instance
* @param string $url
* @param bool $shallow unless true, only shallow checks (url matching typically) should be done
* @param bool $deep unless true, only shallow checks (url matching typically) should be done
* @return bool
*/
public static function supports(IOInterface $io, $url, $deep = false);

4
src/Composer/Repository/VcsRepository.php
View File

@ -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;

2
src/Composer/Script/Event.php
View File

@ -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)

5
src/Composer/Script/EventDispatcher.php
View File

@ -40,8 +40,9 @@ class EventDispatcher
/**
* Constructor.
*
* @param Composer $composer The composer instance
* @param IOInterface $io The IOInterface instance
* @param Composer $composer The composer instance
* @param IOInterface $io The IOInterface instance
* @param ProcessExecutor $process
*/
public function __construct(Composer $composer, IOInterface $io, ProcessExecutor $process = null)
{

3
src/Composer/Util/RemoteFilesystem.php
View File

@ -35,7 +35,8 @@ class RemoteFilesystem
/**
* Constructor.
*
* @param IOInterface $io The IO instance
* @param IOInterface $io The IO instance
* @param array $options The options
*/
public function __construct(IOInterface $io, $options = array())
{

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

@ -224,8 +224,6 @@ class Svn
/**
* Detect Svn Auth.
*
* @param string $url
*
* @return bool
*/
protected function hasAuth()