Codestyle changes related to php-cs-fixer update

src/Client.php

@@ -346,7 +346,7 @@ public function createCommand($commandID, $arguments = [])
     }
 
     /**
-     * @param $name
+     * @param                     $name
      * @return ContainerInterface
      */
     public function __get($name)
@@ -355,8 +355,8 @@ public function __get($name)
     }
 
     /**
-     * @param $name
-     * @param $value
+     * @param        $name
+     * @param        $value
      * @return mixed
      */
     public function __set($name, $value)
@@ -365,7 +365,7 @@ public function __set($name, $value)
     }
 
     /**
-     * @param $name
+     * @param        $name
      * @return mixed
      */
     public function __isset($name)

src/Command/Redis/Container/ContainerInterface.php

@@ -18,8 +18,8 @@ interface ContainerInterface
      * Creates Redis container command with subcommand as virtual method name
      * and sends a request to the server.
      *
-     * @param $subcommandID
-     * @param $arguments
+     * @param        $subcommandID
+     * @param        $arguments
      * @return mixed
      */
     public function __call($subcommandID, $arguments);

src/Command/Redis/SORT.php

@@ -60,9 +60,9 @@ public function setArguments(array $arguments)
             }
         }
 
-        if (isset($sortParams['LIMIT']) &&
-            is_array($sortParams['LIMIT']) &&
-            count($sortParams['LIMIT']) == 2) {
+        if (isset($sortParams['LIMIT'])
+            && is_array($sortParams['LIMIT'])
+            && count($sortParams['LIMIT']) == 2) {
             $query[] = 'LIMIT';
             $query[] = $sortParams['LIMIT'][0];
             $query[] = $sortParams['LIMIT'][1];

src/Command/Traits/Keys.php

@@ -25,8 +25,8 @@ public function setArguments(array $arguments, bool $withNumkeys = true)
         $argumentsLength = count($arguments);
 
         if (
-            static::$keysArgumentPositionOffset > $argumentsLength ||
-            !is_array($arguments[static::$keysArgumentPositionOffset])
+            static::$keysArgumentPositionOffset > $argumentsLength
+            || !is_array($arguments[static::$keysArgumentPositionOffset])
         ) {
             throw new UnexpectedValueException('Wrong keys argument type or position offset');
         }

src/Configuration/Options.php

@@ -67,8 +67,8 @@ public function getDefault($option)
     public function defined($option)
     {
         return
-            array_key_exists($option, $this->options) ||
-            array_key_exists($option, $this->input)
+            array_key_exists($option, $this->options)
+            || array_key_exists($option, $this->input)
         ;
     }
 
@@ -78,8 +78,8 @@ public function defined($option)
     public function __isset($option)
     {
         return (
-            array_key_exists($option, $this->options) ||
-            array_key_exists($option, $this->input)
+            array_key_exists($option, $this->options)
+            || array_key_exists($option, $this->input)
         ) && $this->__get($option) !== null;
     }
 

src/Connection/RelayMethods.php

@@ -32,7 +32,7 @@ public function onFlushed(?callable $callback)
      * @param  string   $pattern
      * @return bool
      */
-    public function onInvalidated(?callable $callback, ?string $pattern = null)
+    public function onInvalidated(?callable $callback, string $pattern = null)
     {
         return $this->client->onInvalidated($callback, $pattern);
     }
@@ -129,7 +129,7 @@ public function maxMemory()
      * @param  ?int    $db
      * @return bool
      */
-    public function flushMemory(?string $endpointId = null, int $db = null)
+    public function flushMemory(string $endpointId = null, int $db = null)
     {
         return $this->client->flushMemory($endpointId, $db);
     }

src/PubSub/AbstractConsumer.php

@@ -32,7 +32,7 @@ abstract class AbstractConsumer implements Iterator
     public const STATUS_SUBSCRIBED = 2;  // 0b0010
     public const STATUS_PSUBSCRIBED = 4; // 0b0100
 
-    protected $position = null;
+    protected $position;
     protected $statusFlags = self::STATUS_VALID;
 
     /**

tests/PHPUnit/OneOfConstraint.php

@@ -44,7 +44,7 @@ protected function matches($other): bool
     }
 
     /**
-     * @param $other
+     * @param         $other
      * @return string
      */
     protected function failureDescription($other): string

tests/PHPUnit/PredisTestCase.php

@@ -22,7 +22,7 @@
  */
 abstract class PredisTestCase extends \PHPUnit\Framework\TestCase
 {
-    protected $redisServerVersion = null;
+    protected $redisServerVersion;
     protected $redisJsonVersion;
 
     /**
@@ -73,7 +73,7 @@ protected function sleep(float $seconds): void
      *
      * @return RedisCommandConstraint
      */
-    public function isRedisCommand($command = null, ?array $arguments = null): RedisCommandConstraint
+    public function isRedisCommand($command = null, array $arguments = null): RedisCommandConstraint
     {
         return new RedisCommandConstraint($command, $arguments);
     }
@@ -224,7 +224,7 @@ protected function getCommandFactory(): Command\Factory
      *
      * @return Client
      */
-    protected function createClient(?array $parameters = null, ?array $options = null, ?bool $flushdb = true): Client
+    protected function createClient(array $parameters = null, array $options = null, ?bool $flushdb = true): Client
     {
         $parameters = array_merge(
             $this->getDefaultParametersArray(),
@@ -300,7 +300,6 @@ protected function getMockConnectionOfType(string $interface, $parameters = null
      * the default connection parameters used by Predis or a set of connection
      * parameters specified in the optional second argument.
      *
-
      * @param array|string|null $parameters Optional connection parameters
      *
      * @return MockObject|Connection\NodeConnectionInterface
@@ -362,9 +361,9 @@ protected function getRequiredRedisServerVersion(): ?string
             $this->getName(false)
         );
 
-        if (isset($annotations['method']['requiresRedisVersion'], $annotations['method']['group']) &&
-            !empty($annotations['method']['requiresRedisVersion']) &&
-            in_array('connected', $annotations['method']['group'])
+        if (isset($annotations['method']['requiresRedisVersion'], $annotations['method']['group'])
+            && !empty($annotations['method']['requiresRedisVersion'])
+            && in_array('connected', $annotations['method']['group'])
         ) {
             return $annotations['method']['requiresRedisVersion'][0];
         }
@@ -517,9 +516,9 @@ protected function getRequiredModuleVersion(string $module): ?string
             $this->getName(false)
         );
 
-        if (isset($annotations['method'][$moduleAnnotation], $annotations['method']['group']) &&
-            !empty($annotations['method'][$moduleAnnotation]) &&
-            in_array('connected', $annotations['method']['group'], true)
+        if (isset($annotations['method'][$moduleAnnotation], $annotations['method']['group'])
+            && !empty($annotations['method'][$moduleAnnotation])
+            && in_array('connected', $annotations['method']['group'], true)
         ) {
             return $annotations['method'][$moduleAnnotation][0];
         }

tests/PHPUnit/RedisCommandConstraint.php

@@ -25,7 +25,7 @@ class RedisCommandConstraint extends \PHPUnit\Framework\Constraint\Constraint
      * @param string|CommandInterface $command   Expected command instance or command ID
      * @param ?array                  $arguments Expected command arguments
      */
-    public function __construct($command, ?array $arguments = null)
+    public function __construct($command, array $arguments = null)
     {
         if ($command instanceof CommandInterface) {
             $this->commandID = strtoupper($command->getId());

tests/Predis/Cluster/PredisStrategyTest.php

@@ -310,7 +310,7 @@ protected function getClusterStrategy(): StrategyInterface
      *
      * @return array
      */
-    protected function getExpectedCommands(?string $type = null): array
+    protected function getExpectedCommands(string $type = null): array
     {
         $commands = [
             /* commands operating on the key space */

tests/Predis/Cluster/RedisStrategyTest.php

@@ -333,7 +333,7 @@ protected function getClusterStrategy(): StrategyInterface
      *
      * @return array
      */
-    protected function getExpectedCommands(?string $type = null): array
+    protected function getExpectedCommands(string $type = null): array
     {
         $commands = [
             /* commands operating on the key space */

tests/Predis/Command/Redis/EVALSHA_RO_Test.php

@@ -61,10 +61,10 @@ public function testParseResponse(): void
     /**
      * @group connected
      * @dataProvider scriptsProvider
-     * @param string $script
-     * @param array  $keys
-     * @param array  $arguments
-     * @param $expectedResponse
+     * @param  string $script
+     * @param  array  $keys
+     * @param  array  $arguments
+     * @param         $expectedResponse
      * @return void
      * @requiresRedisVersion >= 7.0.0
      */

tests/Predis/Command/Redis/EVAL_RO_Test.php

@@ -61,11 +61,11 @@ public function testParseResponse(): void
     /**
      * @group connected
      * @dataProvider scriptsProvider
-     * @param array  $dictionary
-     * @param string $script
-     * @param array  $keys
-     * @param array  $arguments
-     * @param $expectedResponse
+     * @param  array  $dictionary
+     * @param  string $script
+     * @param  array  $keys
+     * @param  array  $arguments
+     * @param         $expectedResponse
      * @return void
      * @requiresRedisVersion >= 7.0.0
      */

tests/Predis/Command/Redis/FCALL_RO_Test.php

@@ -113,8 +113,8 @@ protected function tearDown(): void
         );
 
         if (
-            isset($annotations['method']['group']) &&
-            in_array('connected', $annotations['method']['group'], true)
+            isset($annotations['method']['group'])
+            && in_array('connected', $annotations['method']['group'], true)
         ) {
             $redis = $this->getClient();
             $redis->function->delete(self::LIB_NAME);

tests/Predis/Command/Redis/FCALL_Test.php

@@ -60,9 +60,9 @@ public function testParseResponse(): void
     /**
      * @group connected
      * @dataProvider functionsProvider
-     * @param string $function
-     * @param array  $functionArguments
-     * @param $expectedResponse
+     * @param  string $function
+     * @param  array  $functionArguments
+     * @param         $expectedResponse
      * @return void
      * @requiresRedisVersion >= 7.0.0
      */

tests/Predis/Command/Redis/LCS_Test.php

@@ -58,9 +58,9 @@ public function testParseResponse($actualResponse, $expectedResponse): void
     /**
      * @group connected
      * @dataProvider stringsProvider
-     * @param array $stringsArguments
-     * @param array $functionArguments
-     * @param $expectedResponse
+     * @param  array $stringsArguments
+     * @param  array $functionArguments
+     * @param        $expectedResponse
      * @return void
      * @requiresRedisVersion >= 7.0.0
      */

tests/Predis/Command/Redis/ZINTERCARD_Test.php

@@ -110,8 +110,8 @@ public function testThrowsExceptionOnWrongType(): void
     /**
      * @group connected
      * @dataProvider unexpectedValuesProvider
-     * @param $keys
-     * @param $limit
+     * @param         $keys
+     * @param         $limit
      * @param  string $expectedExceptionMessage
      * @return void
      * @requiresRedisVersion >= 7.0.0

tests/Predis/Command/Redis/ZINTERSTORE_Test.php

@@ -115,9 +115,9 @@ public function testThrowsExceptionOnWrongType(): void
 
     /**
      * @dataProvider unexpectedValueProvider
-     * @param string $destination
-     * @param $keys
-     * @param $weights
+     * @param  string $destination
+     * @param         $keys
+     * @param         $weights
      * @param  string $aggregate
      * @param  string $expectedExceptionMessage
      * @return void

tests/Predis/Command/Redis/ZINTER_Test.php

@@ -127,8 +127,8 @@ public function testThrowsExceptionOnWrongType(): void
 
     /**
      * @dataProvider unexpectedValueProvider
-     * @param $keys
-     * @param $weights
+     * @param         $keys
+     * @param         $weights
      * @param  string $aggregate
      * @param  bool   $withScores
      * @param  string $expectedExceptionMessage

tests/Predis/Command/Redis/ZRANGESTORE_Test.php

@@ -102,14 +102,14 @@ public function testStoresSortedSetRanges(
     /**
      * @group connected
      * @dataProvider unexpectedValuesProvider
-     * @param int|string  $min
-     * @param int|string  $max
-     * @param string|bool $by
-     * @param $rev
-     * @param $limit
-     * @param  int    $offset
-     * @param  int    $count
-     * @param  string $expectedExceptionMessage
+     * @param  int|string  $min
+     * @param  int|string  $max
+     * @param  string|bool $by
+     * @param              $rev
+     * @param              $limit
+     * @param  int         $offset
+     * @param  int         $count
+     * @param  string      $expectedExceptionMessage
      * @return void
      * @requiresRedisVersion >= 6.2.0
      */

tests/Predis/Command/Redis/ZUNIONSTORE_Test.php

@@ -115,9 +115,9 @@ public function testThrowsExceptionOnWrongType(): void
 
     /**
      * @dataProvider unexpectedValueProvider
-     * @param string $destination
-     * @param $keys
-     * @param $weights
+     * @param  string $destination
+     * @param         $keys
+     * @param         $weights
      * @param  string $aggregate
      * @param  string $expectedExceptionMessage
      * @return void

tests/Predis/Command/Redis/ZUNION_Test.php

@@ -101,8 +101,8 @@ public function testThrowsExceptionOnWrongType(): void
 
     /**
      * @dataProvider unexpectedValueProvider
-     * @param $keys
-     * @param $weights
+     * @param         $keys
+     * @param         $weights
      * @param  string $aggregate
      * @param  bool   $withScores
      * @param  string $expectedExceptionMessage

tests/Predis/Replication/ReplicationStrategyTest.php

@@ -390,7 +390,7 @@ public function testSetLuaScriptAsReadOperationWorksWithScriptCommandAndCallable
      *
      * @return array
      */
-    protected function getExpectedCommands(?string $type = null): array
+    protected function getExpectedCommands(string $type = null): array
     {
         $commands = [
             /* commands operating on the connection */