Running php-cs-fixer

Running php-cs-fixer to fix CS drift

Author: JimTools

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;

MongodbConnectionFactory.php

@@ -89,15 +89,15 @@ public static function parseDsn(string $dsn): array
         // see: https://github.com/php-enqueue/enqueue-dev/issues/1027
         if (isset($parsedUrl['path']) && '/' !== $parsedUrl['path']) {
             $pathParts = explode('/', $parsedUrl['path']);
-            //DB name
+            // DB name
             if ($pathParts[1]) {
                 $config['dbname'] = $pathParts[1];
             }
         }
         if (isset($parsedUrl['query'])) {
             $queryParts = null;
             parse_str($parsedUrl['query'], $queryParts);
-            //get enqueue attributes values
+            // get enqueue attributes values
             if (!empty($queryParts['polling_interval'])) {
                 $config['polling_interval'] = (int) $queryParts['polling_interval'];
             }

MongodbMessage.php

@@ -65,7 +65,7 @@ public function __construct(string $body = '', array $properties = [], array $he
         $this->redelivered = false;
     }
 
-    public function setId(string $id = null): void
+    public function setId(?string $id = null): void
     {
         $this->id = $id;
     }
@@ -135,7 +135,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);
     }
@@ -150,7 +150,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;
     }
@@ -163,7 +163,7 @@ public function getDeliveryDelay(): ?int
     /**
      * In milliseconds.
      */
-    public function setDeliveryDelay(int $deliveryDelay = null): void
+    public function setDeliveryDelay(?int $deliveryDelay = null): void
     {
         $this->deliveryDelay = $deliveryDelay;
     }
@@ -176,12 +176,12 @@ public function getTimeToLive(): ?int
     /**
      * 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);
     }
@@ -191,7 +191,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);
     }
@@ -208,7 +208,7 @@ public function getTimestamp(): ?int
         return null === $value ? null : (int) $value;
     }
 
-    public function setTimestamp(int $timestamp = null): void
+    public function setTimestamp(?int $timestamp = null): void
     {
         $this->setHeader('timestamp', $timestamp);
     }
@@ -221,7 +221,7 @@ public function getPublishedAt(): ?int
     /**
      * In milliseconds.
      */
-    public function setPublishedAt(int $publishedAt = null): void
+    public function setPublishedAt(?int $publishedAt = null): void
     {
         $this->publishedAt = $publishedAt;
     }

MongodbProducer.php

@@ -77,7 +77,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) {
@@ -90,7 +90,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) {
@@ -111,7 +111,7 @@ public function send(Destination $destination, Message $message): void
     /**
      * @return self
      */
-    public function setDeliveryDelay(int $deliveryDelay = null): Producer
+    public function setDeliveryDelay(?int $deliveryDelay = null): Producer
     {
         $this->deliveryDelay = $deliveryDelay;
 
@@ -126,7 +126,7 @@ public function getDeliveryDelay(): ?int
     /**
      * @return self
      */
-    public function setPriority(int $priority = null): Producer
+    public function setPriority(?int $priority = null): Producer
     {
         $this->priority = $priority;
 
@@ -141,7 +141,7 @@ public function getPriority(): ?int
     /**
      * @return self
      */
-    public function setTimeToLive(int $timeToLive = null): Producer
+    public function setTimeToLive(?int $timeToLive = null): Producer
     {
         $this->timeToLive = $timeToLive;
 

MongodbSubscriptionConsumer.php

@@ -21,9 +21,6 @@ class MongodbSubscriptionConsumer implements SubscriptionConsumer
      */
     private $subscribers;
 
-    /**
-     * @param MongodbContext $context
-     */
     public function __construct(MongodbContext $context)
     {
         $this->context = $context;
@@ -92,7 +89,7 @@ public function consume(int $timeout = 0): void
     public function subscribe(Consumer $consumer, callable $callback): void
     {
         if (false == $consumer instanceof MongodbConsumer) {
-            throw new \InvalidArgumentException(sprintf('The consumer must be instance of "%s" got "%s"', MongodbConsumer::class, get_class($consumer)));
+            throw new \InvalidArgumentException(sprintf('The consumer must be instance of "%s" got "%s"', MongodbConsumer::class, $consumer::class));
         }
 
         $queueName = $consumer->getQueue()->getQueueName();
@@ -113,7 +110,7 @@ public function subscribe(Consumer $consumer, callable $callback): void
     public function unsubscribe(Consumer $consumer): void
     {
         if (false == $consumer instanceof MongodbConsumer) {
-            throw new \InvalidArgumentException(sprintf('The consumer must be instance of "%s" got "%s"', MongodbConsumer::class, get_class($consumer)));
+            throw new \InvalidArgumentException(sprintf('The consumer must be instance of "%s" got "%s"', MongodbConsumer::class, $consumer::class));
         }
 
         $queueName = $consumer->getQueue()->getQueueName();

Tests/MongodbConsumerTest.php

@@ -181,7 +181,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
     {
     }
 
@@ -190,7 +190,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
     {
     }
 
@@ -204,11 +204,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/Spec/MongodbConnectionFactoryTest.php

@@ -10,9 +10,6 @@
  */
 class MongodbConnectionFactoryTest extends ConnectionFactorySpec
 {
-    /**
-     * {@inheritdoc}
-     */
     protected function createConnectionFactory()
     {
         return new MongodbConnectionFactory();

Tests/Spec/MongodbContextTest.php

@@ -13,9 +13,6 @@ class MongodbContextTest extends ContextSpec
 {
     use MongodbExtensionTrait;
 
-    /**
-     * {@inheritdoc}
-     */
     protected function createContext()
     {
         return $this->buildMongodbContext();

Tests/Spec/MongodbMessageTest.php

@@ -10,9 +10,6 @@
  */
 class MongodbMessageTest extends MessageSpec
 {
-    /**
-     * {@inheritdoc}
-     */
     protected function createMessage()
     {
         return new MongodbMessage();

Tests/Spec/MongodbProducerTest.php

@@ -13,9 +13,6 @@ class MongodbProducerTest extends ProducerSpec
 {
     use MongodbExtensionTrait;
 
-    /**
-     * {@inheritdoc}
-     */
     protected function createProducer()
     {
         return $this->buildMongodbContext()->createProducer();