Running php-cs-fixer

Running php-cs-fixer to fix CS drift

Author: JimTools

JsonSerializer.php

@@ -14,12 +14,8 @@ public function toString(RedisMessage $message): string
             'headers' => $message->getHeaders(),
         ]);
 
-        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 $json;
@@ -28,12 +24,8 @@ public function toString(RedisMessage $message): string
     public function toMessage(string $string): RedisMessage
     {
         $data = 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 new RedisMessage($data['body'], $data['properties'], $data['headers']);

PhpRedis.php

@@ -96,18 +96,14 @@ public function connect(): void
 
         $supportedSchemes = ['redis', 'rediss', 'tcp', 'unix'];
         if (false == in_array($this->config['scheme'], $supportedSchemes, true)) {
-            throw new \LogicException(sprintf(
-                'The given scheme protocol "%s" is not supported by php extension. It must be one of "%s"',
-                $this->config['scheme'],
-                implode('", "', $supportedSchemes)
-            ));
+            throw new \LogicException(sprintf('The given scheme protocol "%s" is not supported by php extension. It must be one of "%s"', $this->config['scheme'], implode('", "', $supportedSchemes)));
         }
 
         $this->redis = new \Redis();
 
         $connectionMethod = $this->config['persistent'] ? 'pconnect' : 'connect';
 
-        $host = $this->config['scheme'] === 'rediss' ? 'tls://' . $this->config['host'] : $this->config['host'];
+        $host = 'rediss' === $this->config['scheme'] ? 'tls://'.$this->config['host'] : $this->config['host'];
 
         $result = call_user_func(
             [$this->redis, $connectionMethod],

Redis.php

@@ -7,41 +7,21 @@
 interface Redis
 {
     /**
-     * @param string $script
-     * @param array  $keys
-     * @param array  $args
-     *
      * @throws ServerException
-     *
-     * @return mixed
      */
     public function eval(string $script, array $keys = [], array $args = []);
 
     /**
-     * @param string $key
-     * @param string $value
-     * @param float  $score
-     *
      * @throws ServerException
-     *
-     * @return int
      */
     public function zadd(string $key, string $value, float $score): int;
 
     /**
-     * @param string $key
-     * @param string $value
-     *
      * @throws ServerException
-     *
-     * @return int
      */
     public function zrem(string $key, string $value): int;
 
     /**
-     * @param string $key
-     * @param string $value
-     *
      * @throws ServerException
      *
      * @return int length of the list
@@ -53,17 +33,11 @@ public function lpush(string $key, string $value): int;
      * @param int      $timeout in seconds
      *
      * @throws ServerException
-     *
-     * @return RedisResult|null
      */
     public function brpop(array $keys, int $timeout): ?RedisResult;
 
     /**
-     * @param string $key
-     *
      * @throws ServerException
-     *
-     * @return RedisResult|null
      */
     public function rpop(string $key): ?RedisResult;
 
@@ -75,8 +49,6 @@ public function connect(): void;
     public function disconnect(): void;
 
     /**
-     * @param string $key
-     *
      * @throws ServerException
      */
     public function del(string $key): void;

RedisConsumer.php

@@ -34,9 +34,6 @@ public function __construct(RedisContext $context, RedisDestination $queue)
         $this->queue = $queue;
     }
 
-    /**
-     * @return int
-     */
     public function getRedeliveryDelay(): ?int
     {
         return $this->redeliveryDelay;

RedisConsumerHelperTrait.php

@@ -15,10 +15,6 @@ abstract protected function getContext(): RedisContext;
 
     /**
      * @param RedisDestination[] $queues
-     * @param int                $timeout
-     * @param int                $redeliveryDelay
-     *
-     * @return RedisMessage|null
      */
     protected function receiveMessage(array $queues, int $timeout, int $redeliveryDelay): ?RedisMessage
     {

RedisContext.php

@@ -38,7 +38,6 @@ class RedisContext implements Context
      * Callable must return instance of Redis once called.
      *
      * @param Redis|callable $redis
-     * @param int            $redeliveryDelay
      */
     public function __construct($redis, int $redeliveryDelay)
     {
@@ -47,11 +46,7 @@ public function __construct($redis, int $redeliveryDelay)
         } elseif (is_callable($redis)) {
             $this->redisFactory = $redis;
         } else {
-            throw new \InvalidArgumentException(sprintf(
-                'The $redis argument must be either %s or callable that returns %s once called.',
-                Redis::class,
-                Redis::class
-            ));
+            throw new \InvalidArgumentException(sprintf('The $redis argument must be either %s or callable that returns %s once called.', Redis::class, Redis::class));
         }
 
         $this->redeliveryDelay = $redeliveryDelay;
@@ -159,11 +154,7 @@ public function getRedis(): Redis
         if (false == $this->redis) {
             $redis = call_user_func($this->redisFactory);
             if (false == $redis instanceof Redis) {
-                throw new \LogicException(sprintf(
-                    'The factory must return instance of %s. It returned %s',
-                    Redis::class,
-                    is_object($redis) ? get_class($redis) : gettype($redis)
-                ));
+                throw new \LogicException(sprintf('The factory must return instance of %s. It returned %s', Redis::class, is_object($redis) ? $redis::class : gettype($redis)));
             }
 
             $this->redis = $redis;

RedisMessage.php

@@ -107,7 +107,7 @@ public function isRedelivered(): bool
         return $this->redelivered;
     }
 
-    public function setCorrelationId(string $correlationId = null): void
+    public function setCorrelationId(?string $correlationId = null): void
     {
         $this->setHeader('correlation_id', $correlationId);
     }
@@ -117,7 +117,7 @@ public function getCorrelationId(): ?string
         return $this->getHeader('correlation_id');
     }
 
-    public function setMessageId(string $messageId = null): void
+    public function setMessageId(?string $messageId = null): void
     {
         $this->setHeader('message_id', $messageId);
     }
@@ -134,12 +134,12 @@ 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);
     }
 
-    public function setReplyTo(string $replyTo = null): void
+    public function setReplyTo(?string $replyTo = null): void
     {
         $this->setHeader('reply_to', $replyTo);
     }
@@ -149,17 +149,11 @@ public function getReplyTo(): ?string
         return $this->getHeader('reply_to');
     }
 
-    /**
-     * @return int
-     */
     public function getAttempts(): int
     {
         return (int) $this->getHeader('attempts', 0);
     }
 
-    /**
-     * @return int
-     */
     public function getTimeToLive(): ?int
     {
         return $this->getHeader('time_to_live');
@@ -168,7 +162,7 @@ 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->setHeader('time_to_live', $timeToLive);
     }
@@ -181,38 +175,26 @@ public function getDeliveryDelay(): ?int
     /**
      * Set delay in milliseconds.
      */
-    public function setDeliveryDelay(int $deliveryDelay = null): void
+    public function setDeliveryDelay(?int $deliveryDelay = null): void
     {
         $this->setHeader('delivery_delay', $deliveryDelay);
     }
 
-    /**
-     * @return string
-     */
     public function getReservedKey(): ?string
     {
         return $this->reservedKey;
     }
 
-    /**
-     * @param string $reservedKey
-     */
     public function setReservedKey(string $reservedKey)
     {
         $this->reservedKey = $reservedKey;
     }
 
-    /**
-     * @return string
-     */
     public function getKey(): ?string
     {
         return $this->key;
     }
 
-    /**
-     * @param string $key
-     */
     public function setKey(string $key): void
     {
         $this->key = $key;

RedisProducer.php

@@ -29,9 +29,6 @@ class RedisProducer implements Producer
      */
     private $deliveryDelay;
 
-    /**
-     * @param RedisContext $context
-     */
     public function __construct(RedisContext $context)
     {
         $this->context = $context;
@@ -74,7 +71,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;
 
@@ -89,7 +86,7 @@ public function getDeliveryDelay(): ?int
     /**
      * @return RedisProducer
      */
-    public function setPriority(int $priority = null): Producer
+    public function setPriority(?int $priority = null): Producer
     {
         if (null === $priority) {
             return $this;
@@ -106,7 +103,7 @@ public function getPriority(): ?int
     /**
      * @return self
      */
-    public function setTimeToLive(int $timeToLive = null): Producer
+    public function setTimeToLive(?int $timeToLive = null): Producer
     {
         $this->timeToLive = $timeToLive;
 

RedisSubscriptionConsumer.php

@@ -28,26 +28,17 @@ class RedisSubscriptionConsumer implements SubscriptionConsumer
      */
     private $redeliveryDelay = 300;
 
-    /**
-     * @param RedisContext $context
-     */
     public function __construct(RedisContext $context)
     {
         $this->context = $context;
         $this->subscribers = [];
     }
 
-    /**
-     * @return int
-     */
     public function getRedeliveryDelay(): ?int
     {
         return $this->redeliveryDelay;
     }
 
-    /**
-     * @param int $delay
-     */
     public function setRedeliveryDelay(int $delay): void
     {
         $this->redeliveryDelay = $delay;
@@ -89,7 +80,7 @@ public function consume(int $timeout = 0): void
     public function subscribe(Consumer $consumer, callable $callback): void
     {
         if (false == $consumer instanceof RedisConsumer) {
-            throw new \InvalidArgumentException(sprintf('The consumer must be instance of "%s" got "%s"', RedisConsumer::class, get_class($consumer)));
+            throw new \InvalidArgumentException(sprintf('The consumer must be instance of "%s" got "%s"', RedisConsumer::class, $consumer::class));
         }
 
         $queueName = $consumer->getQueue()->getQueueName();
@@ -111,7 +102,7 @@ public function subscribe(Consumer $consumer, callable $callback): void
     public function unsubscribe(Consumer $consumer): void
     {
         if (false == $consumer instanceof RedisConsumer) {
-            throw new \InvalidArgumentException(sprintf('The consumer must be instance of "%s" got "%s"', RedisConsumer::class, get_class($consumer)));
+            throw new \InvalidArgumentException(sprintf('The consumer must be instance of "%s" got "%s"', RedisConsumer::class, $consumer::class));
         }
 
         $queueName = $consumer->getQueue()->getQueueName();

SerializerAwareTrait.php

@@ -11,9 +11,6 @@ trait SerializerAwareTrait
      */
     private $serializer;
 
-    /**
-     * @param Serializer $serializer
-     */
     public function setSerializer(Serializer $serializer)
     {
         $this->serializer = $serializer;

Tests/Functional/CommonUseCasesTrait.php

@@ -91,7 +91,7 @@ public function testConsumerReceiveMessageWithZeroTimeout()
 
         $consumer = $this->getContext()->createConsumer($topic);
 
-        //guard
+        // guard
         $this->assertNull($consumer->receive(1000));
 
         $message = $this->getContext()->createMessage(__METHOD__);

Tests/Functional/PRedisCommonUseCasesTest.php

@@ -32,9 +32,6 @@ protected function tearDown(): void
         $this->context->close();
     }
 
-    /**
-     * {@inheritdoc}
-     */
     protected function getContext()
     {
         return $this->context;

Tests/Functional/PRedisConsumptionUseCasesTest.php

@@ -32,9 +32,6 @@ protected function tearDown(): void
         $this->context->close();
     }
 
-    /**
-     * {@inheritdoc}
-     */
     protected function getContext()
     {
         return $this->context;