php-cs-fixer magic

composer · May 22, 2012 · 1bd4ccb · 1bd4ccb
1 parent 4ea9b33
commit 1bd4ccb
Show file tree

Hide file tree

Showing 90 changed files with 396 additions and 400 deletions.
diff --git a/src/Composer/Autoload/AutoloadGenerator.php b/src/Composer/Autoload/AutoloadGenerator.php
@@ -13,9 +13,7 @@
 namespace Composer\Autoload;
 
 use Composer\Installer\InstallationManager;
-use Composer\Json\JsonFile;
 use Composer\Package\AliasPackage;
-use Composer\Package\Loader\JsonLoader;
 use Composer\Package\PackageInterface;
 use Composer\Repository\RepositoryInterface;
 use Composer\Util\Filesystem;
@@ -104,6 +102,7 @@ public function dump(RepositoryInterface $localRepo, PackageInterface $mainPacka
                 return false;
             }
             require_once \$path;
+
             return true;
         }
     });
@@ -169,7 +168,7 @@ public function buildPackageMap(InstallationManager $installationManager, Packag
     /**
      * Compiles an ordered list of namespace => path mappings
      *
-     * @param array $packageMap array of array(package, installDir-relative-to-composer.json)
+     * @param  array $packageMap array of array(package, installDir-relative-to-composer.json)
      * @return array array('psr-0' => array('Ns\\Foo' => array('installDir')))
      */
     public function parseAutoloads(array $packageMap)
@@ -205,7 +204,7 @@ public function parseAutoloads(array $packageMap)
     /**
      * Registers an autoloader based on an autoload map returned by parseAutoloads
      *
-     * @param array $autoloads see parseAutoloads return value
+     * @param  array       $autoloads see parseAutoloads return value
      * @return ClassLoader
      */
     public function createLoader(array $autoloads)
@@ -278,6 +277,7 @@ protected function getPathCode(Filesystem $filesystem, $relVendorPath, $vendorPa
             $path = substr($path, strlen($vendorPath));
             $baseDir = '$vendorDir . ';
         }
+
         return $baseDir.var_export($path, true);
     }
 

diff --git a/src/Composer/Autoload/ClassLoader.php b/src/Composer/Autoload/ClassLoader.php
@@ -77,15 +77,16 @@ public function addClassMap(array $classMap)
     /**
      * Registers a set of classes
      *
-     * @param string       $prefix  The classes prefix
-     * @param array|string $paths   The location(s) of the classes
+     * @param string       $prefix The classes prefix
+     * @param array|string $paths  The location(s) of the classes
      */
     public function add($prefix, $paths)
     {
         if (!$prefix) {
             foreach ((array) $paths as $path) {
                 $this->fallbackDirs[] = $path;
             }
+
             return;
         }
         if (isset($this->prefixes[$prefix])) {
@@ -140,13 +141,14 @@ public function unregister()
     /**
      * Loads the given class or interface.
      *
-     * @param string $class The name of the class
+     * @param  string       $class The name of the class
      * @return Boolean|null True, if loaded
      */
     public function loadClass($class)
     {
         if ($file = $this->findFile($class)) {
             require $file;
+
             return true;
         }
     }

diff --git a/src/Composer/Autoload/ClassMapGenerator.php b/src/Composer/Autoload/ClassMapGenerator.php
@@ -24,7 +24,7 @@ class ClassMapGenerator
      * Generate a class map file
      *
      * @param Traversable $dirs Directories or a single path to search in
-     * @param string $file The name of the class map file
+     * @param string      $file The name of the class map file
      */
     static public function dump($dirs, $file)
     {

diff --git a/src/Composer/Command/CreateProjectCommand.php b/src/Composer/Command/CreateProjectCommand.php
@@ -135,6 +135,7 @@ public function installProject(IOInterface $io, $packageName, $directory = null,
     protected function createDownloadManager(IOInterface $io)
     {
         $factory = new Factory();
+
         return $factory->createDownloadManager($io);
     }
 }

diff --git a/src/Composer/Command/DependsCommand.php b/src/Composer/Command/DependsCommand.php
@@ -13,7 +13,6 @@
 namespace Composer\Command;
 
 use Composer\Composer;
-use Composer\Package\PackageInterface;
 use Symfony\Component\Console\Input\InputInterface;
 use Symfony\Component\Console\Input\InputArgument;
 use Symfony\Component\Console\Input\InputOption;
@@ -64,9 +63,9 @@ protected function execute(InputInterface $input, OutputInterface $output)
     /**
      * finds a list of packages which depend on another package
      *
-     * @param InputInterface $input
-     * @param OutputInterface $output
-     * @param Composer $composer
+     * @param  InputInterface            $input
+     * @param  OutputInterface           $output
+     * @param  Composer                  $composer
      * @return array
      * @throws \InvalidArgumentException
      */
@@ -117,4 +116,4 @@ private function printPackages(InputInterface $input, OutputInterface $output, a
             $output->writeln($package);
         }
     }
-}
+}
diff --git a/src/Composer/Command/Helper/DialogHelper.php b/src/Composer/Command/Helper/DialogHelper.php
@@ -13,7 +13,6 @@
 namespace Composer\Command\Helper;
 
 use Symfony\Component\Console\Helper\DialogHelper as BaseDialogHelper;
-use Symfony\Component\Console\Output\OutputInterface;
 
 class DialogHelper extends BaseDialogHelper
 {
@@ -23,8 +22,8 @@ class DialogHelper extends BaseDialogHelper
      *  "Do you want to continue [yes]:"
      *
      * @param string $question The question you want to ask
-     * @param mixed $default Default value to add to message, if false no default will be shown
-     * @param string $sep Separation char for between message and user input
+     * @param mixed  $default  Default value to add to message, if false no default will be shown
+     * @param string $sep      Separation char for between message and user input
      *
      * @return string
      */
@@ -34,4 +33,4 @@ public function getQuestion($question, $default = null, $sep = ':')
             sprintf('<info>%s</info> [<comment>%s</comment>]%s ', $question, $default, $sep) :
             sprintf('<info>%s</info>%s ', $question, $sep);
     }
-}
+}
diff --git a/src/Composer/Command/InitCommand.php b/src/Composer/Command/InitCommand.php
@@ -333,6 +333,7 @@ protected function getGitConfig()
             foreach ($matches as $match) {
                 $this->gitConfig[$match[1]] = $match[2];
             }
+
             return $this->gitConfig;
         }
 
@@ -389,4 +390,4 @@ protected function addVendorIgnore($ignoreFile, $vendor = 'vendor')
 
         file_put_contents($ignoreFile, $contents . $vendor. "\n");
     }
-}
+}
diff --git a/src/Composer/Command/SearchCommand.php b/src/Composer/Command/SearchCommand.php
@@ -118,8 +118,8 @@ protected function execute(InputInterface $input, OutputInterface $output)
     /**
      * tries to find a token within the name/keywords/description
      *
-     * @param PackageInterface $package
-     * @param string $token
+     * @param  PackageInterface $package
+     * @param  string           $token
      * @return boolean
      */
     private function matchPackage(PackageInterface $package, $token)

diff --git a/src/Composer/Command/ShowCommand.php b/src/Composer/Command/ShowCommand.php
@@ -89,6 +89,7 @@ protected function execute(InputInterface $input, OutputInterface $output)
             $this->printLinks($input, $output, $package, 'provides');
             $this->printLinks($input, $output, $package, 'conflicts');
             $this->printLinks($input, $output, $package, 'replaces');
+
             return;
         }
 
@@ -125,7 +126,7 @@ protected function execute(InputInterface $input, OutputInterface $output)
     /**
      * finds a package by name and version if provided
      *
-     * @param InputInterface $input
+     * @param  InputInterface            $input
      * @return PackageInterface
      * @throws \InvalidArgumentException
      */
@@ -192,6 +193,7 @@ protected function printVersions(InputInterface $input, OutputInterface $output,
     {
         if ($input->getArgument('version')) {
             $output->writeln('<info>version</info>  : ' . $package->getPrettyVersion());
+
             return;
         }
 

diff --git a/src/Composer/Command/ValidateCommand.php b/src/Composer/Command/ValidateCommand.php
@@ -47,7 +47,7 @@ protected function configure()
     }
 
     /**
-     * @param InputInterface $input
+     * @param InputInterface  $input
      * @param OutputInterface $output
      *
      * @return int

diff --git a/src/Composer/Compiler.php b/src/Composer/Compiler.php
@@ -27,7 +27,7 @@ class Compiler
      * Compiles composer into a single phar file
      *
      * @throws \RuntimeException
-     * @param string $pharFile The full path to the file to create
+     * @param  string            $pharFile The full path to the file to create
      */
     public function compile($pharFile = 'composer.phar')
     {
@@ -135,7 +135,7 @@ private function addComposerBin($phar)
     /**
      * Removes whitespace from a PHP source string while preserving line numbers.
      *
-     * @param string $source A PHP string
+     * @param  string $source A PHP string
      * @return string The PHP string with the whitespace removed
      */
     private function stripWhitespace($source)

diff --git a/src/Composer/Config.php b/src/Composer/Config.php
@@ -46,7 +46,7 @@ public function merge(array $config)
     /**
      * Returns a setting
      *
-     * @param string $key
+     * @param  string $key
      * @return mixed
      */
     public function get($key)
@@ -57,6 +57,7 @@ public function get($key)
             case 'process-timeout':
                 // convert foo-bar to COMPOSER_FOO_BAR and check if it exists since it overrides the local config
                 $env = 'COMPOSER_' . strtoupper(strtr($key, '-', '_'));
+
                 return $this->process(getenv($env) ?: $this->config[$key]);
 
             case 'home':
@@ -70,7 +71,7 @@ public function get($key)
     /**
      * Checks whether a setting exists
      *
-     * @param string $key
+     * @param  string  $key
      * @return Boolean
      */
     public function has($key)
@@ -87,6 +88,7 @@ public function has($key)
     private function process($value)
     {
         $config = $this;
+
         return preg_replace_callback('#\{\$(.+)\}#', function ($match) use ($config) {
             return $config->get($match[1]);
         }, $value);

diff --git a/src/Composer/DependencyResolver/DefaultPolicy.php b/src/Composer/DependencyResolver/DefaultPolicy.php
@@ -12,7 +12,6 @@
 
 namespace Composer\DependencyResolver;
 
-use Composer\Repository\RepositoryInterface;
 use Composer\Package\PackageInterface;
 use Composer\Package\AliasPackage;
 use Composer\Package\LinkConstraint\VersionConstraint;
@@ -179,7 +178,7 @@ protected function pruneToBestVersion(Pool $pool, $literals)
             if ($this->versionCompare($package, $bestPackage, '>')) {
                 $bestPackage = $package;
                 $bestLiterals = array($literal);
-            } else if ($this->versionCompare($package, $bestPackage, '==')) {
+            } elseif ($this->versionCompare($package, $bestPackage, '==')) {
                 $bestLiterals[] = $literal;
             }
         }
@@ -199,7 +198,7 @@ protected function selectNewestPackages(array $installedMap, array $literals)
             if ($this->versionCompare($literal->getPackage(), $maxPackage, '>')) {
                 $maxPackage = $literal->getPackage();
                 $maxLiterals = array($literal);
-            } else if ($this->versionCompare($literal->getPackage(), $maxPackage, '==')) {
+            } elseif ($this->versionCompare($literal->getPackage(), $maxPackage, '==')) {
                 $maxLiterals[] = $literal;
             }
         }

diff --git a/src/Composer/DependencyResolver/Operation/InstallOperation.php b/src/Composer/DependencyResolver/Operation/InstallOperation.php
@@ -26,8 +26,8 @@ class InstallOperation extends SolverOperation
     /**
      * Initializes operation.
      *
-     * @param   PackageInterface    $package    package instance
-     * @param   string              $reason     operation reason
+     * @param PackageInterface $package package instance
+     * @param string           $reason  operation reason
      */
     public function __construct(PackageInterface $package, $reason = null)
     {
@@ -39,7 +39,7 @@ public function __construct(PackageInterface $package, $reason = null)
     /**
      * Returns package instance.
      *
-     * @return  PackageInterface
+     * @return PackageInterface
      */
     public function getPackage()
     {
@@ -49,7 +49,7 @@ public function getPackage()
     /**
      * Returns job type.
      *
-     * @return  string
+     * @return string
      */
     public function getJobType()
     {

diff --git a/src/Composer/DependencyResolver/Operation/MarkAliasInstalledOperation.php b/src/Composer/DependencyResolver/Operation/MarkAliasInstalledOperation.php
@@ -26,8 +26,8 @@ class MarkAliasInstalledOperation extends SolverOperation
     /**
      * Initializes operation.
      *
-     * @param   PackageInterface    $package    package instance
-     * @param   string              $reason     operation reason
+     * @param PackageInterface $package package instance
+     * @param string           $reason  operation reason
      */
     public function __construct(AliasPackage $package, $reason = null)
     {
@@ -39,7 +39,7 @@ public function __construct(AliasPackage $package, $reason = null)
     /**
      * Returns package instance.
      *
-     * @return  PackageInterface
+     * @return PackageInterface
      */
     public function getPackage()
     {
@@ -49,7 +49,7 @@ public function getPackage()
     /**
      * Returns job type.
      *
-     * @return  string
+     * @return string
      */
     public function getJobType()
     {

diff --git a/src/Composer/DependencyResolver/Operation/MarkAliasUninstalledOperation.php b/src/Composer/DependencyResolver/Operation/MarkAliasUninstalledOperation.php
@@ -26,8 +26,8 @@ class MarkAliasUninstalledOperation extends SolverOperation
     /**
      * Initializes operation.
      *
-     * @param   PackageInterface    $package    package instance
-     * @param   string              $reason     operation reason
+     * @param PackageInterface $package package instance
+     * @param string           $reason  operation reason
      */
     public function __construct(AliasPackage $package, $reason = null)
     {
@@ -39,7 +39,7 @@ public function __construct(AliasPackage $package, $reason = null)
     /**
      * Returns package instance.
      *
-     * @return  PackageInterface
+     * @return PackageInterface
      */
     public function getPackage()
     {
@@ -49,7 +49,7 @@ public function getPackage()
     /**
      * Returns job type.
      *
-     * @return  string
+     * @return string
      */
     public function getJobType()
     {

diff --git a/src/Composer/DependencyResolver/Operation/OperationInterface.php b/src/Composer/DependencyResolver/Operation/OperationInterface.php
@@ -12,7 +12,6 @@
 
 namespace Composer\DependencyResolver\Operation;
 
-use Composer\Package\PackageInterface;
 
 /**
  * Solver operation interface.
@@ -24,14 +23,14 @@ interface OperationInterface
     /**
      * Returns job type.
      *
-     * @return  string
+     * @return string
      */
     function getJobType();
 
     /**
      * Returns operation reason.
      *
-     * @return  string
+     * @return string
      */
     function getReason();