Upgrade phpstan level (#27)

andreea-anamaria · web-flow · commit 157b7344f912 · 2020-06-26T10:54:13.000+03:00
* Upgrade phpstan to level 5
diff --git a/DependencyInjection/Configuration.php b/DependencyInjection/Configuration.php
@@ -31,7 +31,8 @@ public function __construct($name)
     public function getConfigTreeBuilder()
     {
         $tree = new TreeBuilder($this->name);
-        $rootNode = \method_exists('Symfony\Component\Config\Definition\Builder\TreeBuilder', 'getRootNode') ? $tree->getRootNode() : $tree->root($this->name);
+        /** @var ArrayNodeDefinition $rootNode */
+        $rootNode = $tree->getRootNode();
 
         $rootNode
             ->children()
diff --git a/RabbitMq/AMQPConnectionFactory.php b/RabbitMq/AMQPConnectionFactory.php
@@ -4,12 +4,11 @@
 
 use OldSound\RabbitMqBundle\Provider\ConnectionParametersProviderInterface;
 use PhpAmqpLib\Connection\AbstractConnection;
-use PhpAmqpLib\Connection\AMQPSocketConnection;
 use Symfony\Component\Config\Definition\Exception\InvalidConfigurationException;
 
 class AMQPConnectionFactory
 {
-    /** @var \ReflectionClass */
+    /** @var string */
     private $class;
 
     /** @var array */
diff --git a/RabbitMq/BaseAmqp.php b/RabbitMq/BaseAmqp.php
@@ -50,9 +50,9 @@ abstract class BaseAmqp
     );
 
     /**
-     * @var EventDispatcherInterface
+     * @var EventDispatcherInterface|null
      */
-    protected $eventDispatcher;
+    protected $eventDispatcher = null;
 
     /**
      * @param AbstractConnection   $conn
@@ -268,23 +268,16 @@ public function setEventDispatcher(EventDispatcherInterface $eventDispatcher)
      */
     protected function dispatchEvent($eventName, AMQPEvent $event)
     {
-        if ($this->getEventDispatcher()) {
-            if ($this->getEventDispatcher() instanceof ContractsEventDispatcherInterface) {
-                $this->getEventDispatcher()->dispatch(
-                    $event,
-                    $eventName
-                );
-            } else {
-                $this->getEventDispatcher()->dispatch(
-                    $eventName,
-                    $event
-                );
-            }
+        if ($this->getEventDispatcher() instanceof ContractsEventDispatcherInterface) {
+            $this->getEventDispatcher()->dispatch(
+                $event,
+                $eventName
+            );
         }
     }
 
     /**
-     * @return EventDispatcherInterface
+     * @return EventDispatcherInterface|null
      */
     public function getEventDispatcher()
     {
diff --git a/RabbitMq/BaseConsumer.php b/RabbitMq/BaseConsumer.php
@@ -24,9 +24,6 @@ abstract class BaseConsumer extends BaseAmqp implements DequeuerInterface
     /** @var int */
     protected $idleTimeoutExitCode;
 
-    /**
-     * @param $callback
-     */
     public function setCallback($callback)
     {
         $this->callback = $callback;
@@ -42,6 +39,7 @@ public function getCallback()
 
     /**
      * @param int $msgAmount
+     * @throws \ErrorException
      */
     public function start($msgAmount = 0)
     {
diff --git a/RabbitMq/BatchConsumer.php b/RabbitMq/BatchConsumer.php
@@ -191,8 +191,8 @@ protected function handleProcessMessages($processFlags = null)
     }
 
     /**
-     * @param   int     $deliveryTag
-     * @param   mixed   $processFlag
+     * @param   string|int     $deliveryTag
+     * @param   mixed          $processFlag
      *
      * @return  void
      */
@@ -293,7 +293,7 @@ private function addMessage(AMQPMessage $message)
     /**
      * @param   int     $deliveryTag
      *
-     * @return  AMQPMessage
+     * @return  AMQPMessage|null
      */
     private function getMessage($deliveryTag)
     {
@@ -313,7 +313,7 @@ private function getMessage($deliveryTag)
     private function getMessageChannel($deliveryTag)
     {
         $message = $this->getMessage($deliveryTag);
-        if (!$message) {
+        if ($message === null) {
             throw new AMQPRuntimeException(sprintf('Unknown delivery_tag %d!', $deliveryTag));
         }
 
diff --git a/RabbitMq/Binding.php b/RabbitMq/Binding.php
@@ -59,7 +59,7 @@ public function getDestination()
     }
 
     /**
-     * @param bool $destination
+     * @param string $destination
      */
     public function setDestination($destination)
     {
@@ -75,7 +75,7 @@ public function getDestinationIsExchange()
     }
 
     /**
-     * @param string $destinationIsExchange
+     * @param bool $destinationIsExchange
      */
     public function setDestinationIsExchange($destinationIsExchange)
     {
diff --git a/RabbitMq/Consumer.php b/RabbitMq/Consumer.php
@@ -17,7 +17,7 @@ class Consumer extends BaseConsumer
     const TIMEOUT_TYPE_GRACEFUL_MAX_EXECUTION = 'graceful-max-execution';
 
     /**
-     * @var int $memoryLimit
+     * @var int|null $memoryLimit
      */
     protected $memoryLimit = null;
 
@@ -45,7 +45,7 @@ public function setMemoryLimit($memoryLimit)
     /**
      * Get the memory limit
      *
-     * @return int
+     * @return int|null
      */
     public function getMemoryLimit()
     {
diff --git a/RabbitMq/DequeuerInterface.php b/RabbitMq/DequeuerInterface.php
@@ -14,7 +14,7 @@ public function forceStopConsumer();
     /**
      * Set idle timeout
      *
-     * @param $idleTimeout
+     * @param int $idleTimeout
      *
      * @return void
      */
diff --git a/RabbitMq/MultipleConsumer.php b/RabbitMq/MultipleConsumer.php
@@ -13,7 +13,7 @@ class MultipleConsumer extends Consumer
     /**
      * Queues provider
      *
-     * @var QueuesProviderInterface
+     * @var QueuesProviderInterface|null
      */
     protected $queuesProvider = null;
     
diff --git a/Tests/RabbitMq/AMQPConnectionFactoryTest.php b/Tests/RabbitMq/AMQPConnectionFactoryTest.php
@@ -336,7 +336,7 @@ public function testConnectionsParametersProvider()
     /**
      * Preparing ConnectionParametersProviderInterface instance
      *
-     * @return MockObject
+     * @return ConnectionParametersProviderInterface|MockObject
      */
     private function prepareConnectionParametersProvider()
     {
diff --git a/Tests/RabbitMq/BaseAmqpTest.php b/Tests/RabbitMq/BaseAmqpTest.php
@@ -50,29 +50,20 @@ public function testDispatchEvent()
         $baseAmqpConsumer = $this->getMockBuilder('OldSound\RabbitMqBundle\RabbitMq\BaseAmqp')
             ->disableOriginalConstructor()
             ->getMock();
-        if (is_subclass_of('AMQPEvent', 'ContractsBaseEvent')) {
-            $eventDispatcher = $this->getMockBuilder('Symfony\Contracts\EventDispatcher\EventDispatcherInterface')
-                ->disableOriginalConstructor()
-                ->getMock();
-        } else {
-            $eventDispatcher = $this->getMockBuilder('Symfony\Component\EventDispatcher\EventDispatcherInterface')
-                ->disableOriginalConstructor()
-                ->getMock();
-        }
+
+        $eventDispatcher = $this->getMockBuilder('Symfony\Contracts\EventDispatcher\EventDispatcherInterface')
+            ->disableOriginalConstructor()
+            ->getMock();
+
         $baseAmqpConsumer->expects($this->atLeastOnce())
             ->method('getEventDispatcher')
             ->willReturn($eventDispatcher);
-        if ($eventDispatcher instanceof ContractsEventDispatcherInterface) {
-            $eventDispatcher->expects($this->once())
-                ->method('dispatch')
-                ->with(new AMQPEvent(), AMQPEvent::ON_CONSUME)
-                ->willReturn(new AMQPEvent());
-        } else {
-            $eventDispatcher->expects($this->once())
-                ->method('dispatch')
-                ->with(AMQPEvent::ON_CONSUME, new AMQPEvent())
-                ->willReturn(true);
-        }
+
+        $eventDispatcher->expects($this->once())
+            ->method('dispatch')
+            ->with(new AMQPEvent(), AMQPEvent::ON_CONSUME)
+            ->willReturn(new AMQPEvent());
+
         $this->invokeMethod('dispatchEvent', $baseAmqpConsumer, array(AMQPEvent::ON_CONSUME, new AMQPEvent()));
     }
 
diff --git a/Tests/RabbitMq/ConsumerTest.php b/Tests/RabbitMq/ConsumerTest.php
diff --git a/composer.json b/composer.json
diff --git a/phpstan.neon.dist b/phpstan.neon.dist

Original file line number	Diff line number	Diff line change
`@@ -31,7 +31,8 @@ public function __construct($name)`
`31`	`31`	`public function getConfigTreeBuilder()`
`32`	`32`	`{`
`33`	`33`	`$tree = new TreeBuilder($this->name);`
`34`		`- $rootNode = \method_exists('Symfony\Component\Config\Definition\Builder\TreeBuilder', 'getRootNode') ? $tree->getRootNode() : $tree->root($this->name);`
	`34`	`+ /** @var ArrayNodeDefinition $rootNode */`
	`35`	`+ $rootNode = $tree->getRootNode();`
`35`	`36`
`36`	`37`	`$rootNode`
`37`	`38`	`->children()`
Original file line number	Diff line number	Diff line change
`@@ -191,8 +191,8 @@ protected function handleProcessMessages($processFlags = null)`
`191`	`191`	`}`
`192`	`192`
`193`	`193`	`/**`
`194`		`- * @param int $deliveryTag`
`195`		`- * @param mixed $processFlag`
	`194`	`+ * @param string\|int $deliveryTag`
	`195`	`+ * @param mixed $processFlag`
`196`	`196`	`*`
`197`	`197`	`* @return void`
`198`	`198`	`*/`
`@@ -293,7 +293,7 @@ private function addMessage(AMQPMessage $message)`
`293`	`293`	`/**`
`294`	`294`	`* @param int $deliveryTag`
`295`	`295`	`*`
`296`		`- * @return AMQPMessage`
	`296`	`+ * @return AMQPMessage\|null`
`297`	`297`	`*/`
`298`	`298`	`private function getMessage($deliveryTag)`
`299`	`299`	`{`
`@@ -313,7 +313,7 @@ private function getMessage($deliveryTag)`
`313`	`313`	`private function getMessageChannel($deliveryTag)`
`314`	`314`	`{`
`315`	`315`	`$message = $this->getMessage($deliveryTag);`
`316`		`- if (!$message) {`
	`316`	`+ if ($message === null) {`
`317`	`317`	`throw new AMQPRuntimeException(sprintf('Unknown delivery_tag %d!', $deliveryTag));`
`318`	`318`	`}`
`319`	`319`
Original file line number	Diff line number	Diff line change
`@@ -59,7 +59,7 @@ public function getDestination()`
`59`	`59`	`}`
`60`	`60`
`61`	`61`	`/**`
`62`		`- * @param bool $destination`
	`62`	`+ * @param string $destination`
`63`	`63`	`*/`
`64`	`64`	`public function setDestination($destination)`
`65`	`65`	`{`
`@@ -75,7 +75,7 @@ public function getDestinationIsExchange()`
`75`	`75`	`}`
`76`	`76`
`77`	`77`	`/**`
`78`		`- * @param string $destinationIsExchange`
	`78`	`+ * @param bool $destinationIsExchange`
`79`	`79`	`*/`
`80`	`80`	`public function setDestinationIsExchange($destinationIsExchange)`
`81`	`81`	`{`
Original file line number	Diff line number	Diff line change
`@@ -14,7 +14,7 @@ public function forceStopConsumer();`
`14`	`14`	`/**`
`15`	`15`	`* Set idle timeout`
`16`	`16`	`*`
`17`		`- * @param $idleTimeout`
	`17`	`+ * @param int $idleTimeout`
`18`	`18`	`*`
`19`	`19`	`* @return void`
`20`	`20`	`*/`
Original file line number	Diff line number	Diff line change
`@@ -13,7 +13,7 @@ class MultipleConsumer extends Consumer`
`13`	`13`	`/**`
`14`	`14`	`* Queues provider`
`15`	`15`	`*`
`16`		`- * @var QueuesProviderInterface`
	`16`	`+ * @var QueuesProviderInterface\|null`
`17`	`17`	`*/`
`18`	`18`	`protected $queuesProvider = null;`
`19`	`19`
Original file line number	Diff line number	Diff line change
`@@ -336,7 +336,7 @@ public function testConnectionsParametersProvider()`
`336`	`336`	`/**`
`337`	`337`	`* Preparing ConnectionParametersProviderInterface instance`
`338`	`338`	`*`
`339`		`- * @return MockObject`
	`339`	`+ * @return ConnectionParametersProviderInterface\|MockObject`
`340`	`340`	`*/`
`341`	`341`	`private function prepareConnectionParametersProvider()`
`342`	`342`	`{`