From 0b4a9235f494134e1e0d1cc66c95efade9f8a926 Mon Sep 17 00:00:00 2001 From: Jordi Boggiano Date: Tue, 24 Feb 2015 14:22:54 +0000 Subject: [PATCH] CS fixes --- src/Composer/Autoload/AutoloadGenerator.php | 2 +- src/Composer/Installer.php | 3 --- src/Composer/Package/Loader/ArrayLoader.php | 2 +- src/Composer/Package/Loader/RootPackageLoader.php | 4 ++-- src/Composer/Package/Loader/ValidatingArrayLoader.php | 2 +- src/Composer/Repository/Vcs/GitDriver.php | 2 +- tests/Composer/Test/Autoload/AutoloadGeneratorTest.php | 1 + tests/Composer/Test/IO/ConsoleIOTest.php | 3 ++- tests/Composer/Test/InstallerTest.php | 3 +-- tests/Composer/Test/Mock/FactoryMock.php | 1 - .../Composer/Test/Package/Loader/RootPackageLoaderTest.php | 6 ++++-- tests/Composer/Test/Util/GitHubTest.php | 1 + 12 files changed, 15 insertions(+), 15 deletions(-) diff --git a/src/Composer/Autoload/AutoloadGenerator.php b/src/Composer/Autoload/AutoloadGenerator.php index c88c34b41..3326861c1 100644 --- a/src/Composer/Autoload/AutoloadGenerator.php +++ b/src/Composer/Autoload/AutoloadGenerator.php @@ -383,7 +383,7 @@ EOF; } if (!$filesCode) { - return FALSE; + return false; } return <<versionParser->parseNumericAliasPrefix($sourceBranch)) + if (($sourcePrefix = $this->versionParser->parseNumericAliasPrefix($sourceBranch)) && ($targetPrefix = $this->versionParser->parseNumericAliasPrefix($targetBranch)) && (stripos($targetPrefix, $sourcePrefix) !== 0) ) { diff --git a/src/Composer/Package/Loader/RootPackageLoader.php b/src/Composer/Package/Loader/RootPackageLoader.php index 90c8ce3b9..6fe8899fb 100644 --- a/src/Composer/Package/Loader/RootPackageLoader.php +++ b/src/Composer/Package/Loader/RootPackageLoader.php @@ -279,13 +279,13 @@ class RootPackageLoader extends ArrayLoader $length = PHP_INT_MAX; $nonFeatureBranches = ''; - if(!empty($config['non-feature-branches'])) { + if (!empty($config['non-feature-branches'])) { $nonFeatureBranches = implode('|', $config['non-feature-branches']); } foreach ($branches as $candidate) { // return directly, if branch is configured to be non-feature branch - if($candidate === $branch && preg_match('{^(' . $nonFeatureBranches . ')$}', $candidate)) { + if ($candidate === $branch && preg_match('{^(' . $nonFeatureBranches . ')$}', $candidate)) { return $version; } diff --git a/src/Composer/Package/Loader/ValidatingArrayLoader.php b/src/Composer/Package/Loader/ValidatingArrayLoader.php index 9a6f4dd32..65655c4a6 100644 --- a/src/Composer/Package/Loader/ValidatingArrayLoader.php +++ b/src/Composer/Package/Loader/ValidatingArrayLoader.php @@ -256,7 +256,7 @@ class ValidatingArrayLoader implements LoaderInterface } // If using numeric aliases ensure the alias is a valid subversion - if(($sourcePrefix = $this->versionParser->parseNumericAliasPrefix($sourceBranch)) + if (($sourcePrefix = $this->versionParser->parseNumericAliasPrefix($sourceBranch)) && ($targetPrefix = $this->versionParser->parseNumericAliasPrefix($targetBranch)) && (stripos($targetPrefix, $sourcePrefix) !== 0) ) { diff --git a/src/Composer/Repository/Vcs/GitDriver.php b/src/Composer/Repository/Vcs/GitDriver.php index 298639bc0..a859a6869 100644 --- a/src/Composer/Repository/Vcs/GitDriver.php +++ b/src/Composer/Repository/Vcs/GitDriver.php @@ -242,7 +242,7 @@ class GitDriver extends VcsDriver } $process = new ProcessExecutor($io); - if($process->execute('git ls-remote --heads ' . ProcessExecutor::escape($url), $output) === 0) { + if ($process->execute('git ls-remote --heads ' . ProcessExecutor::escape($url), $output) === 0) { return true; } diff --git a/tests/Composer/Test/Autoload/AutoloadGeneratorTest.php b/tests/Composer/Test/Autoload/AutoloadGeneratorTest.php index 2ad1e4729..05b89e4d5 100644 --- a/tests/Composer/Test/Autoload/AutoloadGeneratorTest.php +++ b/tests/Composer/Test/Autoload/AutoloadGeneratorTest.php @@ -106,6 +106,7 @@ class AutoloadGeneratorTest extends TestCase $ret = $ret(); } } + return $ret; })); diff --git a/tests/Composer/Test/IO/ConsoleIOTest.php b/tests/Composer/Test/IO/ConsoleIOTest.php index c83ec6296..417ff260c 100644 --- a/tests/Composer/Test/IO/ConsoleIOTest.php +++ b/tests/Composer/Test/IO/ConsoleIOTest.php @@ -56,9 +56,10 @@ class ConsoleIOTest extends TestCase $outputMock->expects($this->once()) ->method('write') ->with( - $this->callback(function($messages){ + $this->callback(function ($messages) { $result = preg_match("[(.*)/(.*) First line]", $messages[0]) > 0; $result &= preg_match("[(.*)/(.*) Second line]", $messages[1]) > 0; + return $result; }), $this->equalTo(false) diff --git a/tests/Composer/Test/InstallerTest.php b/tests/Composer/Test/InstallerTest.php index 2c77f9bc3..0ec1f5972 100644 --- a/tests/Composer/Test/InstallerTest.php +++ b/tests/Composer/Test/InstallerTest.php @@ -330,8 +330,7 @@ class InstallerTest extends TestCase ); $section = null; - foreach ($tokens as $i => $token) - { + foreach ($tokens as $i => $token) { if (null === $section && empty($token)) { continue; // skip leading blank } diff --git a/tests/Composer/Test/Mock/FactoryMock.php b/tests/Composer/Test/Mock/FactoryMock.php index 52c3fbf2e..cb4c5ee25 100644 --- a/tests/Composer/Test/Mock/FactoryMock.php +++ b/tests/Composer/Test/Mock/FactoryMock.php @@ -14,7 +14,6 @@ namespace Composer\Test\Mock; use Composer\Composer; use Composer\Config; use Composer\Factory; -use Composer\Repository; use Composer\Repository\RepositoryManager; use Composer\Repository\WritableRepositoryInterface; use Composer\Installer; diff --git a/tests/Composer/Test/Package/Loader/RootPackageLoaderTest.php b/tests/Composer/Test/Package/Loader/RootPackageLoaderTest.php index b03f0239c..07aaf7034 100644 --- a/tests/Composer/Test/Package/Loader/RootPackageLoaderTest.php +++ b/tests/Composer/Test/Package/Loader/RootPackageLoaderTest.php @@ -169,9 +169,10 @@ class RootPackageLoaderTest extends \PHPUnit_Framework_TestCase $self = $this; /* Can do away with this mock object when https://github.com/sebastianbergmann/phpunit-mock-objects/issues/81 is fixed */ - $processExecutor = new ProcessExecutorMock(function($command, &$output = null, $cwd = null) use ($self) { + $processExecutor = new ProcessExecutorMock(function ($command, &$output = null, $cwd = null) use ($self) { if (0 === strpos($command, 'git rev-list')) { $output = ""; + return 0; } @@ -207,9 +208,10 @@ class RootPackageLoaderTest extends \PHPUnit_Framework_TestCase $self = $this; /* Can do away with this mock object when https://github.com/sebastianbergmann/phpunit-mock-objects/issues/81 is fixed */ - $processExecutor = new ProcessExecutorMock(function($command, &$output = null, $cwd = null) use ($self) { + $processExecutor = new ProcessExecutorMock(function ($command, &$output = null, $cwd = null) use ($self) { if (0 === strpos($command, 'git rev-list')) { $output = ""; + return 0; } diff --git a/tests/Composer/Test/Util/GitHubTest.php b/tests/Composer/Test/Util/GitHubTest.php index 4a1f3a35a..1f30c44a0 100644 --- a/tests/Composer/Test/Util/GitHubTest.php +++ b/tests/Composer/Test/Util/GitHubTest.php @@ -166,6 +166,7 @@ class GitHubTest extends \PHPUnit_Framework_TestCase return true; } } + return false; }) )