Jordi Boggiano 12 lat temu
rodzic
commit
ee0cd07468

+ 1 - 1
src/Composer/Command/SearchCommand.php

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

+ 1 - 1
src/Composer/Command/ShowCommand.php

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

+ 0 - 6
src/Composer/Command/ValidateCommand.php

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

+ 1 - 1
src/Composer/Console/Application.php

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

+ 2 - 2
src/Composer/Downloader/FileDownloader.php

@@ -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
-     * @return string url
+     * @param  string           $url     download url
+     * @return string           url
      *
      *
      * @throws \RuntimeException If any problem with the url
      * @throws \RuntimeException If any problem with the url
      */
      */

+ 2 - 2
src/Composer/Downloader/VcsDownloader.php

@@ -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  bool              $stash if true (update) the changes can be stashed and reapplied after an update,
+     * @param string $path
+     * @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
      */
      */

+ 9 - 9
src/Composer/Installer.php

@@ -112,15 +112,15 @@ class Installer
     /**
     /**
      * Constructor
      * Constructor
      *
      *
-     * @param IOInterface         $io
-     * @param Config              $config
-     * @param RootPackageInterface    $package
-     * @param DownloadManager     $downloadManager
-     * @param RepositoryManager   $repositoryManager
-     * @param Locker              $locker
-     * @param InstallationManager $installationManager
-     * @param EventDispatcher     $eventDispatcher
-     * @param AutoloadGenerator   $autoloadGenerator
+     * @param IOInterface          $io
+     * @param Config               $config
+     * @param RootPackageInterface $package
+     * @param DownloadManager      $downloadManager
+     * @param RepositoryManager    $repositoryManager
+     * @param Locker               $locker
+     * @param InstallationManager  $installationManager
+     * @param EventDispatcher      $eventDispatcher
+     * @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)
     {
     {

+ 0 - 2
src/Composer/Package/CompletePackage.php

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

+ 1 - 1
src/Composer/Package/Locker.php

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

+ 0 - 2
src/Composer/Package/RootPackage.php

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

+ 4 - 4
src/Composer/Package/Version/VersionParser.php

@@ -171,10 +171,10 @@ class VersionParser
     }
     }
 
 
     /**
     /**
-     * @param string $source source package name
-     * @param string $sourceVersion source package version (pretty version ideally)
-     * @param string $description link description (e.g. requires, replaces, ..)
-     * @param array $links array of package name => constraint mappings
+     * @param  string $source        source package name
+     * @param  string $sourceVersion source package version (pretty version ideally)
+     * @param  string $description   link description (e.g. requires, replaces, ..)
+     * @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)

+ 1 - 1
src/Composer/Repository/PearRepository.php

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

+ 3 - 3
src/Composer/Repository/RepositoryInterface.php

@@ -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 string   $class
-     * @return bool false if the process was interrupted, true otherwise
+     * @param  callable $callback
+     * @param  string   $class
+     * @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');
 
 

+ 1 - 1
src/Composer/Util/ConfigValidator.php

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