1
0
Fork 0
pull/1231/head
Jordi Boggiano 2012-10-18 10:35:06 +02:00
parent 852c369575
commit ee0cd07468
14 changed files with 26 additions and 36 deletions

View File

@ -120,7 +120,7 @@ EOT
* tries to find a token within the name/keywords/description * tries to find a token within the name/keywords/description
* *
* @param CompletePackageInterface $package * @param CompletePackageInterface $package
* @param string $token * @param string $token
* @return boolean * @return boolean
*/ */
private function matchPackage(CompletePackageInterface $package, $token) private function matchPackage(CompletePackageInterface $package, $token)

View File

@ -146,7 +146,7 @@ EOT
/** /**
* finds a package by name and version if provided * finds a package by name and version if provided
* *
* @return array array(CompletePackageInterface, array of versions) * @return array array(CompletePackageInterface, array of versions)
* @throws \InvalidArgumentException * @throws \InvalidArgumentException
*/ */
protected function getPackage(RepositoryInterface $installedRepo, RepositoryInterface $repos, $name, $version = null) protected function getPackage(RepositoryInterface $installedRepo, RepositoryInterface $repos, $name, $version = null)

View File

@ -16,12 +16,6 @@ use Composer\Util\ConfigValidator;
use Symfony\Component\Console\Input\InputInterface; use Symfony\Component\Console\Input\InputInterface;
use Symfony\Component\Console\Input\InputArgument; use Symfony\Component\Console\Input\InputArgument;
use Symfony\Component\Console\Output\OutputInterface; use Symfony\Component\Console\Output\OutputInterface;
use Composer\Json\JsonFile;
use Composer\Json\JsonValidationException;
use Composer\Package\Loader\ValidatingArrayLoader;
use Composer\Package\Loader\ArrayLoader;
use Composer\Util\RemoteFilesystem;
use Composer\Util\SpdxLicenseIdentifier;
/** /**
* ValidateCommand * ValidateCommand

View File

@ -108,7 +108,7 @@ class Application extends BaseApplication
} }
/** /**
* @param InputInterface $input * @param InputInterface $input
* @throws \RuntimeException * @throws \RuntimeException
*/ */
private function switchWorkingDir(InputInterface $input) private function switchWorkingDir(InputInterface $input)

View File

@ -124,8 +124,8 @@ class FileDownloader implements DownloaderInterface
* Process the download url * Process the download url
* *
* @param PackageInterface $package package the url is coming from * @param PackageInterface $package package the url is coming from
* @param string $url download url * @param string $url download url
* @return string url * @return string url
* *
* @throws \RuntimeException If any problem with the url * @throws \RuntimeException If any problem with the url
*/ */

View File

@ -135,8 +135,8 @@ abstract class VcsDownloader implements DownloaderInterface
/** /**
* Prompt the user to check if changes should be stashed/removed or the operation aborted * Prompt the user to check if changes should be stashed/removed or the operation aborted
* *
* @param string $path * @param string $path
* @param bool $stash if true (update) the changes can be stashed and reapplied after an update, * @param bool $stash 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 * 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 * @throws \RuntimeException in case the operation must be aborted
*/ */

View File

@ -112,15 +112,15 @@ class Installer
/** /**
* Constructor * Constructor
* *
* @param IOInterface $io * @param IOInterface $io
* @param Config $config * @param Config $config
* @param RootPackageInterface $package * @param RootPackageInterface $package
* @param DownloadManager $downloadManager * @param DownloadManager $downloadManager
* @param RepositoryManager $repositoryManager * @param RepositoryManager $repositoryManager
* @param Locker $locker * @param Locker $locker
* @param InstallationManager $installationManager * @param InstallationManager $installationManager
* @param EventDispatcher $eventDispatcher * @param EventDispatcher $eventDispatcher
* @param AutoloadGenerator $autoloadGenerator * @param AutoloadGenerator $autoloadGenerator
*/ */
public function __construct(IOInterface $io, Config $config, RootPackageInterface $package, DownloadManager $downloadManager, RepositoryManager $repositoryManager, Locker $locker, InstallationManager $installationManager, EventDispatcher $eventDispatcher, AutoloadGenerator $autoloadGenerator) public function __construct(IOInterface $io, Config $config, RootPackageInterface $package, DownloadManager $downloadManager, RepositoryManager $repositoryManager, Locker $locker, InstallationManager $installationManager, EventDispatcher $eventDispatcher, AutoloadGenerator $autoloadGenerator)
{ {

View File

@ -12,8 +12,6 @@
namespace Composer\Package; namespace Composer\Package;
use Composer\Package\Version\VersionParser;
/** /**
* Package containing additional metadata that is not used by the solver * Package containing additional metadata that is not used by the solver
* *

View File

@ -108,7 +108,7 @@ class Locker
/** /**
* Searches and returns an array of locked packages, retrieved from registered repositories. * Searches and returns an array of locked packages, retrieved from registered repositories.
* *
* @param bool $dev true to retrieve the locked dev packages * @param bool $dev true to retrieve the locked dev packages
* @return \Composer\Repository\RepositoryInterface * @return \Composer\Repository\RepositoryInterface
*/ */
public function getLockedRepository($dev = false) public function getLockedRepository($dev = false)

View File

@ -12,8 +12,6 @@
namespace Composer\Package; namespace Composer\Package;
use Composer\Package\Version\VersionParser;
/** /**
* The root package represents the project's composer.json and contains additional metadata * The root package represents the project's composer.json and contains additional metadata
* *

View File

@ -171,10 +171,10 @@ class VersionParser
} }
/** /**
* @param string $source source package name * @param string $source source package name
* @param string $sourceVersion source package version (pretty version ideally) * @param string $sourceVersion source package version (pretty version ideally)
* @param string $description link description (e.g. requires, replaces, ..) * @param string $description link description (e.g. requires, replaces, ..)
* @param array $links array of package name => constraint mappings * @param array $links array of package name => constraint mappings
* @return Link[] * @return Link[]
*/ */
public function parseLinks($source, $sourceVersion, $description, $links) public function parseLinks($source, $sourceVersion, $description, $links)

View File

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

View File

@ -59,9 +59,9 @@ interface RepositoryInterface extends \Countable
* *
* If the callback returns false, the process stops * If the callback returns false, the process stops
* *
* @param callable $callback * @param callable $callback
* @param string $class * @param string $class
* @return bool false if the process was interrupted, true otherwise * @return bool false if the process was interrupted, true otherwise
*/ */
public function filterPackages($callback, $class = 'Composer\Package\Package'); public function filterPackages($callback, $class = 'Composer\Package\Package');

View File

@ -111,4 +111,4 @@ class ConfigValidator
return array($errors, $publishErrors, $warnings); return array($errors, $publishErrors, $warnings);
} }
} }