Running php-cs-fixer

Running php-cs-fixer to fix CS drift

Author: JimTools

DbalConnectionFactory.php

@@ -92,7 +92,7 @@ private function establishConnection(): Connection
         return $this->connection;
     }
 
-    private function parseDsn(string $dsn, array $config = null): array
+    private function parseDsn(string $dsn, ?array $config = null): array
     {
         $parsedDsn = Dsn::parseFirst($dsn);
 

DbalContext.php

@@ -56,9 +56,6 @@ public function __construct($connection, array $config = [])
         }
     }
 
-    /**
-     * {@inheritdoc}
-     */
     public function createMessage(string $body = '', array $properties = [], array $headers = []): Message
     {
         $message = new DbalMessage();
@@ -201,7 +198,7 @@ public function getDbalConnection(): Connection
         if (false == $this->connection) {
             $connection = call_user_func($this->connectionFactory);
             if (false == $connection instanceof Connection) {
-                throw new \LogicException(sprintf('The factory must return instance of Doctrine\DBAL\Connection. It returns %s', is_object($connection) ? get_class($connection) : gettype($connection)));
+                throw new \LogicException(sprintf('The factory must return instance of Doctrine\DBAL\Connection. It returns %s', is_object($connection) ? $connection::class : gettype($connection)));
             }
 
             $this->connection = $connection;

DbalMessage.php

@@ -67,11 +67,6 @@ class DbalMessage implements Message
      */
     private $publishedAt;
 
-    /**
-     * @param string $body
-     * @param array  $properties
-     * @param array  $headers
-     */
     public function __construct(string $body = '', array $properties = [], array $headers = [])
     {
         $this->body = $body;
@@ -144,7 +139,7 @@ public function setRedelivered(bool $redelivered): void
         $this->redelivered = $redelivered;
     }
 
-    public function setReplyTo(string $replyTo = null): void
+    public function setReplyTo(?string $replyTo = null): void
     {
         $this->setHeader('reply_to', $replyTo);
     }
@@ -159,7 +154,7 @@ public function getPriority(): ?int
         return $this->priority;
     }
 
-    public function setPriority(int $priority = null): void
+    public function setPriority(?int $priority = null): void
     {
         $this->priority = $priority;
     }
@@ -172,14 +167,11 @@ public function getDeliveryDelay(): ?int
     /**
      * Set delay in milliseconds.
      */
-    public function setDeliveryDelay(int $deliveryDelay = null): void
+    public function setDeliveryDelay(?int $deliveryDelay = null): void
     {
         $this->deliveryDelay = $deliveryDelay;
     }
 
-    /**
-     * @return int
-     */
     public function getTimeToLive(): ?int
     {
         return $this->timeToLive;
@@ -188,12 +180,12 @@ public function getTimeToLive(): ?int
     /**
      * Set time to live in milliseconds.
      */
-    public function setTimeToLive(int $timeToLive = null): void
+    public function setTimeToLive(?int $timeToLive = null): void
     {
         $this->timeToLive = $timeToLive;
     }
 
-    public function setCorrelationId(string $correlationId = null): void
+    public function setCorrelationId(?string $correlationId = null): void
     {
         $this->setHeader('correlation_id', $correlationId);
     }
@@ -203,7 +195,7 @@ public function getCorrelationId(): ?string
         return $this->getHeader('correlation_id', null);
     }
 
-    public function setMessageId(string $messageId = null): void
+    public function setMessageId(?string $messageId = null): void
     {
         $this->setHeader('message_id', $messageId);
     }
@@ -220,7 +212,7 @@ public function getTimestamp(): ?int
         return null === $value ? null : $value;
     }
 
-    public function setTimestamp(int $timestamp = null): void
+    public function setTimestamp(?int $timestamp = null): void
     {
         $this->setHeader('timestamp', $timestamp);
     }
@@ -240,7 +232,7 @@ public function getRedeliverAfter(): int
         return $this->redeliverAfter;
     }
 
-    public function setRedeliverAfter(int $redeliverAfter = null): void
+    public function setRedeliverAfter(?int $redeliverAfter = null): void
     {
         $this->redeliverAfter = $redeliverAfter;
     }
@@ -250,7 +242,7 @@ public function getPublishedAt(): ?int
         return $this->publishedAt;
     }
 
-    public function setPublishedAt(int $publishedAt = null): void
+    public function setPublishedAt(?int $publishedAt = null): void
     {
         $this->publishedAt = $publishedAt;
     }

DbalProducer.php

@@ -81,7 +81,7 @@ public function send(Destination $destination, Message $message): void
         $delay = $message->getDeliveryDelay();
         if ($delay) {
             if (!is_int($delay)) {
-                throw new \LogicException(sprintf('Delay must be integer but got: "%s"', is_object($delay) ? get_class($delay) : gettype($delay)));
+                throw new \LogicException(sprintf('Delay must be integer but got: "%s"', is_object($delay) ? $delay::class : gettype($delay)));
             }
 
             if ($delay <= 0) {
@@ -94,7 +94,7 @@ public function send(Destination $destination, Message $message): void
         $timeToLive = $message->getTimeToLive();
         if ($timeToLive) {
             if (!is_int($timeToLive)) {
-                throw new \LogicException(sprintf('TimeToLive must be integer but got: "%s"', is_object($timeToLive) ? get_class($timeToLive) : gettype($timeToLive)));
+                throw new \LogicException(sprintf('TimeToLive must be integer but got: "%s"', is_object($timeToLive) ? $timeToLive::class : gettype($timeToLive)));
             }
 
             if ($timeToLive <= 0) {
@@ -128,7 +128,7 @@ public function send(Destination $destination, Message $message): void
         }
     }
 
-    public function setDeliveryDelay(int $deliveryDelay = null): Producer
+    public function setDeliveryDelay(?int $deliveryDelay = null): Producer
     {
         $this->deliveryDelay = $deliveryDelay;
 
@@ -140,7 +140,7 @@ public function getDeliveryDelay(): ?int
         return $this->deliveryDelay;
     }
 
-    public function setPriority(int $priority = null): Producer
+    public function setPriority(?int $priority = null): Producer
     {
         $this->priority = $priority;
 
@@ -152,7 +152,7 @@ public function getPriority(): ?int
         return $this->priority;
     }
 
-    public function setTimeToLive(int $timeToLive = null): Producer
+    public function setTimeToLive(?int $timeToLive = null): Producer
     {
         $this->timeToLive = $timeToLive;
 

DbalSubscriptionConsumer.php

@@ -25,7 +25,7 @@ class DbalSubscriptionConsumer implements SubscriptionConsumer
     private $subscribers;
 
     /**
-     * @var \Doctrine\DBAL\Connection
+     * @var Connection
      */
     private $dbal;
 
@@ -139,7 +139,7 @@ public function consume(int $timeout = 0): void
     public function subscribe(Consumer $consumer, callable $callback): void
     {
         if (false == $consumer instanceof DbalConsumer) {
-            throw new \InvalidArgumentException(sprintf('The consumer must be instance of "%s" got "%s"', DbalConsumer::class, get_class($consumer)));
+            throw new \InvalidArgumentException(sprintf('The consumer must be instance of "%s" got "%s"', DbalConsumer::class, $consumer::class));
         }
 
         $queueName = $consumer->getQueue()->getQueueName();
@@ -160,7 +160,7 @@ public function subscribe(Consumer $consumer, callable $callback): void
     public function unsubscribe(Consumer $consumer): void
     {
         if (false == $consumer instanceof DbalConsumer) {
-            throw new \InvalidArgumentException(sprintf('The consumer must be instance of "%s" got "%s"', DbalConsumer::class, get_class($consumer)));
+            throw new \InvalidArgumentException(sprintf('The consumer must be instance of "%s" got "%s"', DbalConsumer::class, $consumer::class));
         }
 
         $queueName = $consumer->getQueue()->getQueueName();

JSON.php

@@ -14,10 +14,7 @@ class JSON
     public static function decode($string)
     {
         if (!is_string($string)) {
-            throw new \InvalidArgumentException(sprintf(
-                'Accept only string argument but got: "%s"',
-                is_object($string) ? get_class($string) : gettype($string)
-            ));
+            throw new \InvalidArgumentException(sprintf('Accept only string argument but got: "%s"', is_object($string) ? $string::class : gettype($string)));
         }
 
         // PHP7 fix - empty string and null cause syntax error
@@ -26,32 +23,22 @@ public static function decode($string)
         }
 
         $decoded = json_decode($string, true);
-        if (JSON_ERROR_NONE !== json_last_error()) {
-            throw new \InvalidArgumentException(sprintf(
-                'The malformed json given. Error %s and message %s',
-                json_last_error(),
-                json_last_error_msg()
-            ));
+        if (\JSON_ERROR_NONE !== json_last_error()) {
+            throw new \InvalidArgumentException(sprintf('The malformed json given. Error %s and message %s', json_last_error(), json_last_error_msg()));
         }
 
         return $decoded;
     }
 
     /**
-     * @param mixed $value
-     *
      * @return string
      */
     public static function encode($value)
     {
-        $encoded = json_encode($value, JSON_UNESCAPED_UNICODE);
-
-        if (JSON_ERROR_NONE !== json_last_error()) {
-            throw new \InvalidArgumentException(sprintf(
-                'Could not encode value into json. Error %s and message %s',
-                json_last_error(),
-                json_last_error_msg()
-            ));
+        $encoded = json_encode($value, \JSON_UNESCAPED_UNICODE);
+
+        if (\JSON_ERROR_NONE !== json_last_error()) {
+            throw new \InvalidArgumentException(sprintf('Could not encode value into json. Error %s and message %s', json_last_error(), json_last_error_msg()));
         }
 
         return $encoded;

Tests/DbalConnectionFactoryConfigTest.php

@@ -41,9 +41,6 @@ public function testThrowIfDsnCouldNotBeParsed()
 
     /**
      * @dataProvider provideConfigs
-     *
-     * @param mixed $config
-     * @param mixed $expectedConfig
      */
     public function testShouldParseConfigurationAsExpected($config, $expectedConfig)
     {

Tests/DbalConsumerTest.php

@@ -265,7 +265,7 @@ public function isRedelivered(): bool
         throw new \BadMethodCallException('This should not be called directly');
     }
 
-    public function setCorrelationId(string $correlationId = null): void
+    public function setCorrelationId(?string $correlationId = null): void
     {
     }
 
@@ -274,7 +274,7 @@ public function getCorrelationId(): ?string
         throw new \BadMethodCallException('This should not be called directly');
     }
 
-    public function setMessageId(string $messageId = null): void
+    public function setMessageId(?string $messageId = null): void
     {
     }
 
@@ -288,11 +288,11 @@ public function getTimestamp(): ?int
         throw new \BadMethodCallException('This should not be called directly');
     }
 
-    public function setTimestamp(int $timestamp = null): void
+    public function setTimestamp(?int $timestamp = null): void
     {
     }
 
-    public function setReplyTo(string $replyTo = null): void
+    public function setReplyTo(?string $replyTo = null): void
     {
     }
 

Tests/Functional/DbalConsumerTest.php

@@ -117,15 +117,15 @@ public function testShouldDeleteExpiredMessage()
 
         $this->context->getDbalConnection()->insert(
             $this->context->getTableName(), [
-            'id' => 'id',
-            'published_at' => '123',
-            'body' => 'expiredMessage',
-            'headers' => json_encode([]),
-            'properties' => json_encode([]),
-            'queue' => __METHOD__,
-            'redelivered' => 0,
-            'time_to_live' => time() - 10000,
-        ]);
+                'id' => 'id',
+                'published_at' => '123',
+                'body' => 'expiredMessage',
+                'headers' => json_encode([]),
+                'properties' => json_encode([]),
+                'queue' => __METHOD__,
+                'redelivered' => 0,
+                'time_to_live' => time() - 10000,
+            ]);
 
         $message = $context->createMessage('notExpiredMessage');
         $message->setRedelivered(false);

Tests/Spec/DbalConnectionFactoryTest.php

@@ -7,9 +7,6 @@
 
 class DbalConnectionFactoryTest extends ConnectionFactorySpec
 {
-    /**
-     * {@inheritdoc}
-     */
     protected function createConnectionFactory()
     {
         return new DbalConnectionFactory();