From c4a3c1e5f5bebc21fc5cfb0813a02dd55445b8e0 Mon Sep 17 00:00:00 2001 From: ADmad Date: Fri, 23 Oct 2020 20:57:32 +0530 Subject: [PATCH] Fix errors reported by static analysers. --- .travis.yml | 6 +++++- src/Command/WorkerCommand.php | 18 ++++++------------ 2 files changed, 11 insertions(+), 13 deletions(-) diff --git a/.travis.yml b/.travis.yml index d2770d3..47275da 100644 --- a/.travis.yml +++ b/.travis.yml @@ -28,7 +28,11 @@ script: - if [[ $DEFAULT == 1 && $TRAVIS_PHP_VERSION != 7.3 ]]; then vendor/bin/phpunit; fi - if [[ $DEFAULT == 1 && $TRAVIS_PHP_VERSION == 7.3 ]]; then vendor/bin/phpunit --coverage-clover=clover.xml; fi - - if [[ $STATIC_ANALYSIS == 1 ]]; then composer stan; fi + - | + if [[ $STATIC_ANALYSIS == 1 ]]; then + vendor/bin/phpstan analyse src/ + vendor/bin/psalm.phar + fi - if [[ $PHPCS == 1 ]]; then composer cs-check; fi after_success: diff --git a/src/Command/WorkerCommand.php b/src/Command/WorkerCommand.php index 24bb271..65c6e00 100644 --- a/src/Command/WorkerCommand.php +++ b/src/Command/WorkerCommand.php @@ -85,13 +85,6 @@ protected function getQueueExtension(Arguments $args, LoggerInterface $logger): { $maxIterations = (int)$args->getOption('max-iterations'); $maxRuntime = (int)$args->getOption('max-runtime'); - if ($maxIterations === null) { - $maxIterations = 0; - } - - if ($maxRuntime === null) { - $maxRuntime = 0; - } return new QueueExtension($maxIterations, $maxRuntime, $logger); } @@ -104,12 +97,12 @@ protected function getQueueExtension(Arguments $args, LoggerInterface $logger): */ protected function getLogger(Arguments $args): LoggerInterface { - $logger = new NullLogger(); + $logger = null; if (!empty($args->getOption('verbose'))) { - $logger = Log::engine($args->getOption('logger')); + $logger = Log::engine((string)$args->getOption('logger')); } - return $logger; + return $logger ?? new NullLogger(); } /** @@ -123,7 +116,7 @@ public function execute(Arguments $args, ConsoleIo $io) $processor = new Processor($logger); $extension = $this->getQueueExtension($args, $logger); - $config = $args->getOption('config'); + $config = (string)$args->getOption('config'); if (!Configure::check(sprintf('Queue.%s', $config))) { $io->error(sprintf('Configuration key "%s" was not found', $config)); $this->abort(); @@ -137,13 +130,14 @@ public function execute(Arguments $args, ConsoleIo $io) $this->abort(); } + /** @var \Cake\Event\EventListenerInterface $listener */ $listener = new $listenerClassName(); $processor->getEventManager()->on($listener); $extension->getEventManager()->on($listener); } $url = Configure::read(sprintf('Queue.%s.url', $config)); $client = new SimpleClient($url, $logger); - $client->bindTopic($args->getOption('queue'), $processor); + $client->bindTopic((string)$args->getOption('queue'), $processor); $client->consume($extension); } }