From 80a75e995918aeeeebe08f3c2f4ff10a4760d626 Mon Sep 17 00:00:00 2001 From: Simon Berger Date: Fri, 11 Sep 2020 23:13:42 +0200 Subject: [PATCH] Minor code improvements --- src/Composer/Command/DiagnoseCommand.php | 3 +-- src/Composer/Command/SelfUpdateCommand.php | 6 ++---- src/Composer/Downloader/FileDownloader.php | 2 +- src/Composer/Platform/HhvmDetector.php | 2 +- src/Composer/Repository/Vcs/PerforceDriver.php | 4 +--- src/Composer/Util/Perforce.php | 8 ++------ .../Fixtures/classmap/BackslashLineEndingString.php | 4 ++-- tests/Composer/Test/Util/BitbucketTest.php | 2 +- tests/Composer/Test/Util/GitHubTest.php | 2 +- tests/Composer/Test/Util/GitLabTest.php | 2 +- 10 files changed, 13 insertions(+), 22 deletions(-) diff --git a/src/Composer/Command/DiagnoseCommand.php b/src/Composer/Command/DiagnoseCommand.php index 664324098..f0622b69f 100644 --- a/src/Composer/Command/DiagnoseCommand.php +++ b/src/Composer/Command/DiagnoseCommand.php @@ -729,8 +729,7 @@ EOT private function checkConnectivity() { if (!ini_get('allow_url_fopen')) { - $result = 'Skipped because allow_url_fopen is missing.'; - return $result; + return 'Skipped because allow_url_fopen is missing.'; } return true; diff --git a/src/Composer/Command/SelfUpdateCommand.php b/src/Composer/Command/SelfUpdateCommand.php index d0bc4ec95..38a1abdc6 100644 --- a/src/Composer/Command/SelfUpdateCommand.php +++ b/src/Composer/Command/SelfUpdateCommand.php @@ -453,13 +453,11 @@ TAGSPUBKEY protected function getOldInstallationFinder($rollbackDir) { - $finder = Finder::create() + return Finder::create() ->depth(0) ->files() ->name('*' . self::OLD_INSTALL_EXT) ->in($rollbackDir); - - return $finder; } /** @@ -562,7 +560,7 @@ EOT; $io->writeError('Operation succeeded.'); } else { $io->writeError('Operation failed (file not written). '.$helpMessage.''); - }; + } return $result; } diff --git a/src/Composer/Downloader/FileDownloader.php b/src/Composer/Downloader/FileDownloader.php index 9fa498af8..2219f7c95 100644 --- a/src/Composer/Downloader/FileDownloader.php +++ b/src/Composer/Downloader/FileDownloader.php @@ -338,7 +338,7 @@ class FileDownloader implements DownloaderInterface, ChangeReportInterface $this->io->writeError(" - " . UpdateOperation::format($initial, $target) . ": ", false); $promise = $this->remove($initial, $path, false); - if (!$promise instanceof PromiseInterface) { + if ($promise === null || !$promise instanceof PromiseInterface) { $promise = \React\Promise\resolve(); } $self = $this; diff --git a/src/Composer/Platform/HhvmDetector.php b/src/Composer/Platform/HhvmDetector.php index ac63d047b..b05fa6a8a 100644 --- a/src/Composer/Platform/HhvmDetector.php +++ b/src/Composer/Platform/HhvmDetector.php @@ -35,7 +35,7 @@ class HhvmDetector public function getVersion() { if (null !== self::$hhvmVersion) { - return self::$hhvmVersion ?: null; + return self::$hhvmVersion; } self::$hhvmVersion = defined('HHVM_VERSION') ? HHVM_VERSION : null; diff --git a/src/Composer/Repository/Vcs/PerforceDriver.php b/src/Composer/Repository/Vcs/PerforceDriver.php index 47d0fb3c4..38a3ab65e 100644 --- a/src/Composer/Repository/Vcs/PerforceDriver.php +++ b/src/Composer/Repository/Vcs/PerforceDriver.php @@ -116,14 +116,12 @@ class PerforceDriver extends VcsDriver */ public function getSource($identifier) { - $source = array( + return array( 'type' => 'perforce', 'url' => $this->repoConfig['url'], 'reference' => $identifier, 'p4user' => $this->perforce->getUser(), ); - - return $source; } /** diff --git a/src/Composer/Util/Perforce.php b/src/Composer/Util/Perforce.php index d5a89ef15..96472452f 100644 --- a/src/Composer/Util/Perforce.php +++ b/src/Composer/Util/Perforce.php @@ -426,9 +426,7 @@ class Perforce { $index = strpos($identifier, '@'); if ($index === false) { - $path = $identifier. '/' . $file; - - return $path; + return $identifier. '/' . $file; } $path = substr($identifier, 0, $index) . '/' . $file . substr($identifier, $index); @@ -475,9 +473,7 @@ class Perforce $lastCommitArr = explode(' ', $lastCommit); $lastCommitNum = $lastCommitArr[1]; - $branches = array('master' => $possibleBranches[$this->p4Branch] . '@'. $lastCommitNum); - - return $branches; + return array('master' => $possibleBranches[$this->p4Branch] . '@'. $lastCommitNum); } public function getTags() diff --git a/tests/Composer/Test/Autoload/Fixtures/classmap/BackslashLineEndingString.php b/tests/Composer/Test/Autoload/Fixtures/classmap/BackslashLineEndingString.php index 6c8b94c9b..a86f424cb 100644 --- a/tests/Composer/Test/Autoload/Fixtures/classmap/BackslashLineEndingString.php +++ b/tests/Composer/Test/Autoload/Fixtures/classmap/BackslashLineEndingString.php @@ -3,14 +3,14 @@ namespace Foo; class SlashedA { - function foo() { + public function foo() { return sprintf("foo\ bar"); } } class SlashedB { - function bar() { + public function bar() { print "baz"; } } diff --git a/tests/Composer/Test/Util/BitbucketTest.php b/tests/Composer/Test/Util/BitbucketTest.php index a52b32cab..539918c63 100644 --- a/tests/Composer/Test/Util/BitbucketTest.php +++ b/tests/Composer/Test/Util/BitbucketTest.php @@ -324,7 +324,7 @@ class BitbucketTest extends TestCase $this->token ) ) - ); + ) ; $this->setExpectationsForStoringAccessToken(true); diff --git a/tests/Composer/Test/Util/GitHubTest.php b/tests/Composer/Test/Util/GitHubTest.php index 37683395f..1de64b67e 100644 --- a/tests/Composer/Test/Util/GitHubTest.php +++ b/tests/Composer/Test/Util/GitHubTest.php @@ -51,7 +51,7 @@ class GitHubTest extends TestCase $this->equalTo($url = sprintf('https://api.%s/', $this->origin)), $this->anything() ) - ->willReturn(new Response(array('url' => $url), 200, array(), '{}')); + ->willReturn(new Response(array('url' => $url), 200, array(), '{}')) ; $config = $this->getConfigMock(); diff --git a/tests/Composer/Test/Util/GitLabTest.php b/tests/Composer/Test/Util/GitLabTest.php index 7a3643bd7..7c671afc0 100644 --- a/tests/Composer/Test/Util/GitLabTest.php +++ b/tests/Composer/Test/Util/GitLabTest.php @@ -57,7 +57,7 @@ class GitLabTest extends TestCase $this->equalTo($url = sprintf('http://%s/oauth/token', $this->origin)), $this->anything() ) - ->willReturn(new Response(array('url' => $url), 200, array(), sprintf('{"access_token": "%s", "token_type": "bearer", "expires_in": 7200}', $this->token))); + ->willReturn(new Response(array('url' => $url), 200, array(), sprintf('{"access_token": "%s", "token_type": "bearer", "expires_in": 7200}', $this->token))) ; $config = $this->getConfigMock();