Upgrade CS

composer.json

@@ -19,7 +19,7 @@
         "symfony/yaml": "^4.3|^5.0"
     },
     "require-dev": {
-        "cdn77/coding-standard": "^2.0",
+        "cdn77/coding-standard": "^4.0",
         "phpstan/extension-installer": "^1.0",
         "phpstan/phpstan": "0.12.7",
         "phpstan/phpstan-phpunit": "0.12.6",

phpcs.xml.dist

@@ -1,21 +1,19 @@
-<?xml version="1.0" ?>
+<?xml version="1.0"?>
 <ruleset>
-    <rule ref="Cdn77CodingStandard"/>
-
-    <arg name="basepath" value="."/>
-    <arg name="extensions" value="php"/>
-    <arg name="encoding" value="utf-8"/>
-    <arg value="s"/>
-    <arg value="n"/>
-    <arg value="p"/>
+    <arg name="basepath" value="." />
+    <arg name="extensions" value="php" />
+    <arg name="parallel" value="80" />
+    <arg name="cache" value=".phpcs-cache" />
     <arg name="colors" />
-    <arg name="parallel" value="80"/>
-    <arg name="cache" value=".phpcs-cache"/>
 
-    <file>src/</file>
-    <file>tests/</file>
+    <!-- Ignore warnings, show progress of the run and show sniff names -->
+    <arg value="nps" />
+
+    <file>src</file>
+    <file>tests</file>
 
-    <rule ref="SlevomatCodingStandard.Namespaces.ReferenceUsedNamesOnly.ReferenceViaFallbackGlobalName">
-        <severity>5</severity>
+    <rule ref="Cdn77">
+        <exclude name="SlevomatCodingStandard.TypeHints.PropertyTypeHint.MissingNativeTypeHint" />
+        <exclude name="SlevomatCodingStandard.PHP.RequireExplicitAssertion.RequiredExplicitAssertion" />
     </rule>
 </ruleset>

src/Configuration/Connection.php

@@ -56,27 +56,28 @@ public function __construct(
         $this->readWriteTimeout = $readWriteTimeout;
     }
 
-    /**
-     * @param mixed[] $configuration
-     */
+    /** @param mixed[] $configuration */
     public static function fromDI(array $configuration) : self
     {
         $dsn = new Dsn($configuration[Configuration::KEY_CONFIGURATION_DSN]);
         $new = self::fromDsn($dsn);
 
-        if (isset($configuration[Configuration::KEY_CONFIGURATION_HEARTBEAT])
+        if (
+            isset($configuration[Configuration::KEY_CONFIGURATION_HEARTBEAT])
             && ! isset($dsn->getParameters()[Configuration::KEY_CONFIGURATION_HEARTBEAT])
         ) {
             $new->heartbeat = (int) $configuration[Configuration::KEY_CONFIGURATION_HEARTBEAT];
         }
 
-        if (isset($configuration[Configuration::KEY_CONFIGURATION_CONNECTION_TIMEOUT])
+        if (
+            isset($configuration[Configuration::KEY_CONFIGURATION_CONNECTION_TIMEOUT])
             && ! isset($dsn->getParameters()[Configuration::KEY_CONFIGURATION_CONNECTION_TIMEOUT])
         ) {
             $new->connectionTimeout = (int) $configuration[Configuration::KEY_CONFIGURATION_CONNECTION_TIMEOUT];
         }
 
-        if (isset($configuration[Configuration::KEY_CONFIGURATION_READ_WRITE_TIMEOUT])
+        if (
+            isset($configuration[Configuration::KEY_CONFIGURATION_READ_WRITE_TIMEOUT])
             && ! isset($dsn->getParameters()[Configuration::KEY_CONFIGURATION_READ_WRITE_TIMEOUT])
         ) {
             $new->readWriteTimeout = (int) $configuration[Configuration::KEY_CONFIGURATION_READ_WRITE_TIMEOUT];

src/Configuration/Dsn.php

@@ -5,6 +5,7 @@
 namespace Cdn77\RabbitMQBundle\Configuration;
 
 use Cdn77\RabbitMQBundle\Exception\InvalidDsn;
+
 use function count;
 use function http_build_query;
 use function parse_str;
@@ -65,6 +66,21 @@ public function __construct(string $dsn)
         parse_str($parts['query'], $this->parameters);
     }
 
+    public function __toString() : string
+    {
+        return sprintf(
+            '%s://%s:%s@%s:%s/%s%s%s',
+            self::SCHEME,
+            $this->username,
+            $this->password,
+            $this->host,
+            $this->port,
+            $this->vhost === '/' ? '' : $this->vhost,
+            count($this->parameters) !== 0 ? '?' : '',
+            count($this->parameters) !== 0 ? http_build_query($this->parameters) : ''
+        );
+    }
+
     public function getHost() : string
     {
         return $this->host;
@@ -90,26 +106,9 @@ public function getVhost() : string
         return $this->vhost;
     }
 
-    /**
-     * @return string[]
-     */
+    /** @return string[] */
     public function getParameters() : array
     {
         return $this->parameters;
     }
-
-    public function __toString() : string
-    {
-        return sprintf(
-            '%s://%s:%s@%s:%s/%s%s%s',
-            self::SCHEME,
-            $this->username,
-            $this->password,
-            $this->host,
-            $this->port,
-            $this->vhost === '/' ? '' : $this->vhost,
-            count($this->parameters) !== 0 ? '?' : '',
-            count($this->parameters) !== 0 ? http_build_query($this->parameters) : ''
-        );
-    }
 }

src/Configuration/Topology.php

@@ -48,9 +48,7 @@ public function __construct(array $exchanges, array $exchangeBindings, array $qu
         }
     }
 
-    /**
-     * @param mixed[] $configuration
-     */
+    /** @param mixed[] $configuration */
     public static function fromDI(array $configuration) : self
     {
         $exchanges = [];
@@ -107,17 +105,13 @@ public static function fromDI(array $configuration) : self
         return new self($exchanges, $exchangesBindings, $queues, $queuesBindings);
     }
 
-    /**
-     * @return Exchange[]
-     */
+    /** @return Exchange[] */
     public function getExchanges() : array
     {
         return $this->exchanges;
     }
 
-    /**
-     * @return Queue[]
-     */
+    /** @return Queue[] */
     public function getQueues() : array
     {
         return $this->queues;

src/Console/ConsumerCommand.php

@@ -12,6 +12,7 @@
 use Symfony\Component\Console\Input\InputArgument;
 use Symfony\Component\Console\Input\InputInterface;
 use Symfony\Component\Console\Output\OutputInterface;
+
 use function assert;
 use function is_string;
 use function strtolower;

src/ConsumerRunner.php

@@ -12,6 +12,7 @@
 use Cdn77\RabbitMQBundle\RabbitMQ\Connection;
 use Cdn77\RabbitMQBundle\RabbitMQ\Consumer\Configuration;
 use Cdn77\RabbitMQBundle\RabbitMQ\Consumer\Consumer;
+
 use function microtime;
 
 final class ConsumerRunner

src/DependencyInjection/Configuration.php

@@ -8,6 +8,8 @@
 use Symfony\Component\Config\Definition\Builder\TreeBuilder;
 use Symfony\Component\Config\Definition\ConfigurationInterface;
 
+use function assert;
+
 final class Configuration implements ConfigurationInterface
 {
     public const KEY_BINDING_EXCHANGE = 'exchange';
@@ -41,8 +43,8 @@ public function getConfigTreeBuilder() : TreeBuilder
     {
         $treeBuilder = new TreeBuilder(RabbitMQExtension::ALIAS);
 
-        /** @var ArrayNodeDefinition $rootNode */
         $rootNode = $treeBuilder->getRootNode();
+        assert($rootNode instanceof ArrayNodeDefinition);
 
         $this->configureConnection($rootNode);
         $this->configureExchanges($rootNode);
@@ -72,13 +74,13 @@ private function configureConnection(ArrayNodeDefinition $rootNode) : void
 
     private function configureExchanges(ArrayNodeDefinition $rootNode) : void
     {
-        /** @var ArrayNodeDefinition $exchangesNode */
         $exchangesNode = $rootNode->children()
             ->arrayNode(self::KEY_CONFIGURATION_EXCHANGES)
             ->useAttributeAsKey(self::KEY_EXCHANGE_NAME)
             ->normalizeKeys(false)
             ->defaultValue([])
             ->prototype('array');
+        assert($exchangesNode instanceof ArrayNodeDefinition);
 
         $exchangesNode->children()
             ->scalarNode(self::KEY_EXCHANGE_TYPE);
@@ -106,13 +108,13 @@ private function configureExchanges(ArrayNodeDefinition $rootNode) : void
 
     private function configureQueues(ArrayNodeDefinition $rootNode) : void
     {
-        /** @var ArrayNodeDefinition $queuesNode */
         $queuesNode = $rootNode->children()
             ->arrayNode(self::KEY_CONFIGURATION_QUEUES)
             ->useAttributeAsKey(self::KEY_QUEUE_NAME)
             ->normalizeKeys(false)
             ->defaultValue([])
             ->prototype('array');
+        assert($queuesNode instanceof ArrayNodeDefinition);
 
         $queuesNode->children()
             ->booleanNode(self::KEY_QUEUE_DURABLE)
@@ -137,24 +139,24 @@ private function configureQueues(ArrayNodeDefinition $rootNode) : void
 
     private function configureExchangeBindings(ArrayNodeDefinition $exchangesNode) : void
     {
-        /** @var ArrayNodeDefinition $exchangesBindingsNode */
         $exchangesBindingsNode = $exchangesNode->children()
             ->arrayNode(self::KEY_EXCHANGE_BINDINGS)
             ->normalizeKeys(false)
             ->defaultValue([])
             ->prototype('array');
+        assert($exchangesBindingsNode instanceof ArrayNodeDefinition);
 
         $this->configureBindingNode($exchangesBindingsNode);
     }
 
     private function configureQueueBindings(ArrayNodeDefinition $queuesNode) : void
     {
-        /** @var ArrayNodeDefinition $queueBindingsNode */
         $queueBindingsNode = $queuesNode->children()
             ->arrayNode(self::KEY_QUEUE_BINDINGS)
             ->normalizeKeys(false)
             ->defaultValue([])
             ->prototype('array');
+        assert($queueBindingsNode instanceof ArrayNodeDefinition);
 
         $this->configureBindingNode($queueBindingsNode);
     }

src/Exception/CannotCreateChannel.php

@@ -5,6 +5,7 @@
 namespace Cdn77\RabbitMQBundle\Exception;
 
 use RuntimeException;
+
 use function sprintf;
 
 final class CannotCreateChannel extends RuntimeException implements Exception

src/Exception/ConfigurationFailed.php

@@ -8,6 +8,7 @@
 use Cdn77\RabbitMQBundle\RabbitMQ\Exchange;
 use Cdn77\RabbitMQBundle\RabbitMQ\Queue;
 use RuntimeException;
+
 use function sprintf;
 
 final class ConfigurationFailed extends RuntimeException implements Exception

src/Exception/ConsumerFailed.php

@@ -5,6 +5,7 @@
 namespace Cdn77\RabbitMQBundle\Exception;
 
 use InvalidArgumentException;
+
 use function sprintf;
 
 final class ConsumerFailed extends InvalidArgumentException implements Exception

src/Exception/InvalidDsn.php

@@ -5,6 +5,7 @@
 namespace Cdn77\RabbitMQBundle\Exception;
 
 use LogicException;
+
 use function sprintf;
 
 final class InvalidDsn extends LogicException implements Exception

src/Exception/OperationFailed.php

@@ -5,6 +5,7 @@
 namespace Cdn77\RabbitMQBundle\Exception;
 
 use RuntimeException;
+
 use function sprintf;
 
 final class OperationFailed extends RuntimeException implements Exception

src/RabbitMQ/Binding.php

@@ -17,19 +17,15 @@ final class Binding
     /** @var mixed[] */
     private $arguments;
 
-    /**
-     * @param mixed[] $arguments
-     */
+    /** @param mixed[] $arguments */
     public function __construct(Bindable $bindable, string $routingKey, array $arguments = [])
     {
         $this->bindable = $bindable;
         $this->routingKey = $routingKey;
         $this->arguments = $arguments;
     }
 
-    /**
-     * @param mixed[] $configuration
-     */
+    /** @param mixed[] $configuration */
     public static function fromConfiguration(Bindable $bindable, array $configuration) : self
     {
         return new self(
@@ -49,9 +45,7 @@ public function getRoutingKey() : string
         return $this->routingKey;
     }
 
-    /**
-     * @return mixed[]
-     */
+    /** @return mixed[] */
     public function getArguments() : array
     {
         return $this->arguments;

src/RabbitMQ/Exchange.php

@@ -29,9 +29,7 @@ final class Exchange implements Bindable
     /** @var Binding[] */
     private $bindings = [];
 
-    /**
-     * @param mixed[] $arguments
-     */
+    /** @param mixed[] $arguments */
     public function __construct(
         string $name,
         ExchangeType $exchangeType,
@@ -48,9 +46,7 @@ public function __construct(
         $this->arguments = $arguments;
     }
 
-    /**
-     * @param mixed[] $configuration
-     */
+    /** @param mixed[] $configuration */
     public static function fromConfiguration(string $name, array $configuration) : self
     {
         return new self(
@@ -83,9 +79,7 @@ public function getExchangeType() : ExchangeType
         return $this->exchangeType;
     }
 
-    /**
-     * @return Binding[]
-     */
+    /** @return Binding[] */
     public function getBindings() : array
     {
         return $this->bindings;
@@ -101,9 +95,7 @@ public function isInternal() : bool
         return $this->internal;
     }
 
-    /**
-     * @return mixed[]
-     */
+    /** @return mixed[] */
     public function getArguments() : array
     {
         return $this->arguments;

src/RabbitMQ/Message.php

@@ -14,9 +14,7 @@ class Message
     /** @var mixed[] */
     public $headers;
 
-    /**
-     * @param mixed[] $headers
-     */
+    /** @param mixed[] $headers */
     public function __construct(string $body, array $headers = [])
     {
         $this->body = $body;
@@ -28,9 +26,7 @@ public function __construct(string $body, array $headers = [])
         $this->headers = $headers;
     }
 
-    /**
-     * @param mixed[] $headers
-     */
+    /** @param mixed[] $headers */
     public static function json(string $body, array $headers = []) : self
     {
         return new self($body, ['Content-Type' => 'application/json'] + $headers);