From 6e90c0be5193ba0bd3bdafcb442175ccbc9ea9ed Mon Sep 17 00:00:00 2001 From: Jordi Boggiano Date: Fri, 22 Jun 2012 20:08:26 +0200 Subject: [PATCH] CS fixes --- src/Composer/Command/CreateProjectCommand.php | 1 - src/Composer/Installer/ProjectInstaller.php | 1 - src/Composer/Package/LinkConstraint/MultiConstraint.php | 1 + src/Composer/Package/LinkConstraint/SpecificConstraint.php | 1 + src/Composer/Package/Locker.php | 6 +++--- src/Composer/Package/Version/VersionParser.php | 1 + 6 files changed, 6 insertions(+), 5 deletions(-) diff --git a/src/Composer/Command/CreateProjectCommand.php b/src/Composer/Command/CreateProjectCommand.php index 7f65da7f0..675accd5f 100644 --- a/src/Composer/Command/CreateProjectCommand.php +++ b/src/Composer/Command/CreateProjectCommand.php @@ -146,4 +146,3 @@ EOT return $factory->createDownloadManager($io); } } - diff --git a/src/Composer/Installer/ProjectInstaller.php b/src/Composer/Installer/ProjectInstaller.php index fc857d137..f91fd4405 100644 --- a/src/Composer/Installer/ProjectInstaller.php +++ b/src/Composer/Installer/ProjectInstaller.php @@ -95,4 +95,3 @@ class ProjectInstaller implements InstallerInterface return $this->installPath; } } - diff --git a/src/Composer/Package/LinkConstraint/MultiConstraint.php b/src/Composer/Package/LinkConstraint/MultiConstraint.php index 3b9a88323..836d565a0 100644 --- a/src/Composer/Package/LinkConstraint/MultiConstraint.php +++ b/src/Composer/Package/LinkConstraint/MultiConstraint.php @@ -53,6 +53,7 @@ class MultiConstraint implements LinkConstraintInterface if ($this->prettyString) { return $this->prettyString; } + return $this->__toString(); } diff --git a/src/Composer/Package/LinkConstraint/SpecificConstraint.php b/src/Composer/Package/LinkConstraint/SpecificConstraint.php index b58929b39..eda09c6ec 100644 --- a/src/Composer/Package/LinkConstraint/SpecificConstraint.php +++ b/src/Composer/Package/LinkConstraint/SpecificConstraint.php @@ -43,6 +43,7 @@ abstract class SpecificConstraint implements LinkConstraintInterface if ($this->prettyString) { return $this->prettyString; } + return $this->__toString(); } diff --git a/src/Composer/Package/Locker.php b/src/Composer/Package/Locker.php index 1f64209a8..cadf921f2 100644 --- a/src/Composer/Package/Locker.php +++ b/src/Composer/Package/Locker.php @@ -35,10 +35,10 @@ class Locker /** * Initializes packages locker. * - * @param JsonFile $lockFile lockfile loader - * @param RepositoryManager $repositoryManager repository manager instance + * @param JsonFile $lockFile lockfile loader + * @param RepositoryManager $repositoryManager repository manager instance * @param InstallationManager $installationManager installation manager instance - * @param string $hash unique hash of the current composer configuration + * @param string $hash unique hash of the current composer configuration */ public function __construct(JsonFile $lockFile, RepositoryManager $repositoryManager, InstallationManager $installationManager, $hash) { diff --git a/src/Composer/Package/Version/VersionParser.php b/src/Composer/Package/Version/VersionParser.php index 90784a76c..058ad1ee8 100644 --- a/src/Composer/Package/Version/VersionParser.php +++ b/src/Composer/Package/Version/VersionParser.php @@ -192,6 +192,7 @@ class VersionParser } $constraint->setPrettyString($prettyConstraint); + return $constraint; }