From fc3c7838b2ada9ee7a376a56d2eb07b405d98fd3 Mon Sep 17 00:00:00 2001 From: Jordi Boggiano Date: Sun, 7 Dec 2014 13:54:29 +0000 Subject: [PATCH] CS fixes --- src/Composer/Autoload/ClassLoader.php | 1 + src/Composer/Config.php | 2 +- src/Composer/Console/Application.php | 3 ++- src/Composer/Package/BasePackage.php | 1 - src/Composer/Package/CompletePackage.php | 2 +- tests/Composer/Test/AllFunctionalTest.php | 2 +- 6 files changed, 6 insertions(+), 5 deletions(-) diff --git a/src/Composer/Autoload/ClassLoader.php b/src/Composer/Autoload/ClassLoader.php index 4a56396af..70d78bc3f 100644 --- a/src/Composer/Autoload/ClassLoader.php +++ b/src/Composer/Autoload/ClassLoader.php @@ -59,6 +59,7 @@ class ClassLoader if (!empty($this->prefixesPsr0)) { return call_user_func_array('array_merge', $this->prefixesPsr0); } + return array(); } diff --git a/src/Composer/Config.php b/src/Composer/Config.php index bd5d86895..176c228eb 100644 --- a/src/Composer/Config.php +++ b/src/Composer/Config.php @@ -300,7 +300,7 @@ class Config * This should be used to read COMPOSER_ environment variables * that overload config values. * - * @param string $var + * @param string $var * @return string|boolean */ private function getComposerEnv($var) diff --git a/src/Composer/Console/Application.php b/src/Composer/Console/Application.php index 6ce2d6682..940864683 100644 --- a/src/Composer/Console/Application.php +++ b/src/Composer/Console/Application.php @@ -99,7 +99,8 @@ class Application extends BaseApplication if ($name = $this->getCommandName($input)) { try { $commandName = $this->find($name)->getName(); - } catch (\InvalidArgumentException $e) {} + } catch (\InvalidArgumentException $e) { + } } if ($commandName !== 'self-update' && $commandName !== 'selfupdate') { if (time() > COMPOSER_DEV_WARNING_TIME) { diff --git a/src/Composer/Package/BasePackage.php b/src/Composer/Package/BasePackage.php index 677d5074d..965e5ddc8 100644 --- a/src/Composer/Package/BasePackage.php +++ b/src/Composer/Package/BasePackage.php @@ -56,7 +56,6 @@ abstract class BasePackage implements PackageInterface protected $repository; protected $transportOptions; - /** * All descendants' constructors should call this parent constructor * diff --git a/src/Composer/Package/CompletePackage.php b/src/Composer/Package/CompletePackage.php index 27c9abeca..0de1609d0 100644 --- a/src/Composer/Package/CompletePackage.php +++ b/src/Composer/Package/CompletePackage.php @@ -194,6 +194,6 @@ class CompletePackage extends Package implements CompletePackageInterface */ public function getReplacementPackage() { - return is_string($this->abandoned)? $this->abandoned : null; + return is_string($this->abandoned) ? $this->abandoned : null; } } diff --git a/tests/Composer/Test/AllFunctionalTest.php b/tests/Composer/Test/AllFunctionalTest.php index 39f0c23d6..4a23c5717 100644 --- a/tests/Composer/Test/AllFunctionalTest.php +++ b/tests/Composer/Test/AllFunctionalTest.php @@ -63,7 +63,7 @@ class AllFunctionalTest extends \PHPUnit_Framework_TestCase if (defined('HHVM_VERSION')) { $this->markTestSkipped('Building the phar does not work on HHVM.'); } - + $fs = new Filesystem; $fs->removeDirectory(dirname(self::$pharPath)); $fs->ensureDirectoryExists(dirname(self::$pharPath));