From e6f21137ad9830e4b9614bc94eab0c302cdfb29a Mon Sep 17 00:00:00 2001 From: Niels Keurentjes Date: Thu, 7 Apr 2016 00:52:50 +0200 Subject: [PATCH] Undefined or default return points fixed. --- src/Composer/Command/ExecCommand.php | 2 +- src/Composer/Command/RunScriptCommand.php | 2 +- src/Composer/Command/ShowCommand.php | 2 +- src/Composer/Downloader/HgDownloader.php | 2 +- src/Composer/Downloader/SvnDownloader.php | 2 +- src/Composer/Factory.php | 3 ++- src/Composer/Package/Archiver/BaseExcludeFilter.php | 2 +- src/Composer/Package/Archiver/GitExcludeFilter.php | 7 ++----- src/Composer/Repository/ArrayRepository.php | 1 + src/Composer/Repository/RepositoryManager.php | 1 + src/Composer/Util/TlsHelper.php | 3 ++- 11 files changed, 14 insertions(+), 13 deletions(-) diff --git a/src/Composer/Command/ExecCommand.php b/src/Composer/Command/ExecCommand.php index 0938f6659..34d1362e5 100644 --- a/src/Composer/Command/ExecCommand.php +++ b/src/Composer/Command/ExecCommand.php @@ -69,7 +69,7 @@ EOT ); } - return; + return 0; } $binary = $input->getArgument('binary'); diff --git a/src/Composer/Command/RunScriptCommand.php b/src/Composer/Command/RunScriptCommand.php index 296c658fa..6742f9034 100644 --- a/src/Composer/Command/RunScriptCommand.php +++ b/src/Composer/Command/RunScriptCommand.php @@ -70,7 +70,7 @@ EOT if ($input->getOption('list')) { return $this->listScripts(); } elseif (!$input->getArgument('script')) { - throw new \RunTimeException('Missing required argument "script"'); + throw new \RuntimeException('Missing required argument "script"'); } $script = $input->getArgument('script'); diff --git a/src/Composer/Command/ShowCommand.php b/src/Composer/Command/ShowCommand.php index a76fec042..fbc704d61 100644 --- a/src/Composer/Command/ShowCommand.php +++ b/src/Composer/Command/ShowCommand.php @@ -89,7 +89,7 @@ EOT if ($input->getOption('tree') && ($input->getOption('all') || $input->getOption('available'))) { $io->writeError('The --tree (-t) option is not usable in combination with --all or --available (-a)'); - return; + return 0; } // init repos diff --git a/src/Composer/Downloader/HgDownloader.php b/src/Composer/Downloader/HgDownloader.php index 6041d1dc6..dc1d35464 100644 --- a/src/Composer/Downloader/HgDownloader.php +++ b/src/Composer/Downloader/HgDownloader.php @@ -69,7 +69,7 @@ class HgDownloader extends VcsDownloader public function getLocalChanges(PackageInterface $package, $path) { if (!is_dir($path.'/.hg')) { - return; + return null; } $this->process->execute('hg st', $output, realpath($path)); diff --git a/src/Composer/Downloader/SvnDownloader.php b/src/Composer/Downloader/SvnDownloader.php index b71e22b31..a21f35858 100644 --- a/src/Composer/Downloader/SvnDownloader.php +++ b/src/Composer/Downloader/SvnDownloader.php @@ -73,7 +73,7 @@ class SvnDownloader extends VcsDownloader public function getLocalChanges(PackageInterface $package, $path) { if (!$this->hasMetadataRepository($path)) { - return; + return null; } $this->process->execute('svn status --ignore-externals', $output, $path); diff --git a/src/Composer/Factory.php b/src/Composer/Factory.php index 720a2f066..c05a57036 100644 --- a/src/Composer/Factory.php +++ b/src/Composer/Factory.php @@ -25,6 +25,7 @@ use Composer\Util\Platform; use Composer\Util\ProcessExecutor; use Composer\Util\RemoteFilesystem; use Composer\Util\Silencer; +use Seld\JsonLint\DuplicateKeyException; use Symfony\Component\Console\Formatter\OutputFormatterStyle; use Composer\EventDispatcher\EventDispatcher; use Composer\Autoload\AutoloadGenerator; @@ -270,7 +271,7 @@ class Factory $jsonParser = new JsonParser; try { $jsonParser->parse(file_get_contents($localConfig), JsonParser::DETECT_KEY_CONFLICTS); - } catch (\Seld\JsonLint\DuplicateKeyException $e) { + } catch (DuplicateKeyException $e) { $details = $e->getDetails(); $io->writeError('Key '.$details['key'].' is a duplicate in '.$localConfig.' at line '.$details['line'].''); } diff --git a/src/Composer/Package/Archiver/BaseExcludeFilter.php b/src/Composer/Package/Archiver/BaseExcludeFilter.php index c94c52a6b..99ba24431 100644 --- a/src/Composer/Package/Archiver/BaseExcludeFilter.php +++ b/src/Composer/Package/Archiver/BaseExcludeFilter.php @@ -83,7 +83,7 @@ abstract class BaseExcludeFilter $line = trim($line); if (!$line || 0 === strpos($line, '#')) { - return; + return null; } return call_user_func($lineParser, $line); diff --git a/src/Composer/Package/Archiver/GitExcludeFilter.php b/src/Composer/Package/Archiver/GitExcludeFilter.php index 926bb4d69..004ceb8ca 100644 --- a/src/Composer/Package/Archiver/GitExcludeFilter.php +++ b/src/Composer/Package/Archiver/GitExcludeFilter.php @@ -69,12 +69,9 @@ class GitExcludeFilter extends BaseExcludeFilter { $parts = preg_split('#\s+#', $line); - if (count($parts) != 2) { - return null; - } - - if ($parts[1] === 'export-ignore') { + if (count($parts) == 2 && $parts[1] === 'export-ignore') { return $this->generatePattern($parts[0]); } + return null; } } diff --git a/src/Composer/Repository/ArrayRepository.php b/src/Composer/Repository/ArrayRepository.php index 852515493..89cedaed0 100644 --- a/src/Composer/Repository/ArrayRepository.php +++ b/src/Composer/Repository/ArrayRepository.php @@ -56,6 +56,7 @@ class ArrayRepository extends BaseRepository } } } + return null; } /** diff --git a/src/Composer/Repository/RepositoryManager.php b/src/Composer/Repository/RepositoryManager.php index 649c66cd9..f3c5912b0 100644 --- a/src/Composer/Repository/RepositoryManager.php +++ b/src/Composer/Repository/RepositoryManager.php @@ -58,6 +58,7 @@ class RepositoryManager return $package; } } + return null; } /** diff --git a/src/Composer/Util/TlsHelper.php b/src/Composer/Util/TlsHelper.php index 1afb4bb21..137511a70 100644 --- a/src/Composer/Util/TlsHelper.php +++ b/src/Composer/Util/TlsHelper.php @@ -70,7 +70,7 @@ final class TlsHelper } if (!isset($info['subject']['commonName'])) { - return; + return null; } $commonName = strtolower($info['subject']['commonName']); @@ -82,6 +82,7 @@ final class TlsHelper if (0 === strpos($name, 'DNS:')) { return strtolower(ltrim(substr($name, 4))); } + return null; }, $subjectAltNames)); $subjectAltNames = array_values($subjectAltNames); }