Codestyle fixes

.php-cs-fixer.dist.php

@@ -25,6 +25,7 @@ return (new PhpCsFixer\Config)
         'single_line_throw' => false,
         'concat_space' => ['spacing' => 'one'],
         'increment_style' => false,
+        'trailing_comma_in_multiline' => ['after_heredoc' => true, 'elements' => ['array_destructuring', 'arrays']]
     ])
     ->setFinder(
         PhpCsFixer\Finder::create()

tests/Predis/Command/CommandTest.php

@@ -174,7 +174,7 @@ class CommandTest extends PredisTestCase
      */
     public function testSerializeCommand(): void
     {
-        $command = new class() extends Command {
+        $command = new class extends Command {
             public function getId()
             {
                 return 'Test';

tests/Predis/Command/PrefixableCommandTest.php

@@ -20,7 +20,7 @@ class PrefixableCommandTest extends PredisTestCase
 
     protected function setUp(): void
     {
-        $this->testClass = new class() extends PrefixableCommand {
+        $this->testClass = new class extends PrefixableCommand {
             public function getId()
             {
                 return 'test';

tests/Predis/Command/Redis/AbstractCommand/BZPOPBaseTest.php

@@ -26,7 +26,7 @@ class BZPOPBaseTest extends PredisTestCase
     {
         parent::setUp();
 
-        $this->testCommand = new class() extends BZPOPBase {
+        $this->testCommand = new class extends BZPOPBase {
             public function getId(): string
             {
                 return 'test';

tests/Predis/Command/Traits/AggregateTest.php

@@ -22,7 +22,7 @@ class AggregateTest extends PredisTestCase
 
     protected function setUp(): void
     {
-        $this->testClass = new class() extends RedisCommand {
+        $this->testClass = new class extends RedisCommand {
             use Aggregate;
 
             public static $aggregateArgumentPositionOffset = 0;

tests/Predis/Command/Traits/BitByteTest.php

@@ -21,7 +21,7 @@ class BitByteTest extends PredisTestCase
 
     protected function setUp(): void
     {
-        $this->testClass = new class() extends RedisCommand {
+        $this->testClass = new class extends RedisCommand {
             use BitByte;
 
             public function getId()

tests/Predis/Command/Traits/BloomFilters/BucketSizeTest.php

@@ -24,7 +24,7 @@ class BucketSizeTest extends PredisTestCase
     {
         parent::setUp();
 
-        $this->testClass = new class() extends RedisCommand {
+        $this->testClass = new class extends RedisCommand {
             use BucketSize;
 
             public static $bucketSizeArgumentPositionOffset = 0;

tests/Predis/Command/Traits/BloomFilters/CapacityTest.php

@@ -24,7 +24,7 @@ class CapacityTest extends PredisTestCase
     {
         parent::setUp();
 
-        $this->testClass = new class() extends RedisCommand {
+        $this->testClass = new class extends RedisCommand {
             use Capacity;
 
             public static $capacityArgumentPositionOffset = 0;

tests/Predis/Command/Traits/BloomFilters/ErrorTest.php

@@ -24,7 +24,7 @@ class ErrorTest extends PredisTestCase
     {
         parent::setUp();
 
-        $this->testClass = new class() extends RedisCommand {
+        $this->testClass = new class extends RedisCommand {
             use Error;
 
             public static $errorArgumentPositionOffset = 0;

tests/Predis/Command/Traits/BloomFilters/ExpansionTest.php

@@ -22,7 +22,7 @@ class ExpansionTest extends PredisTestCase
 
     protected function setUp(): void
     {
-        $this->testClass = new class() extends RedisCommand {
+        $this->testClass = new class extends RedisCommand {
             use Expansion;
 
             public static $expansionArgumentPositionOffset = 0;

tests/Predis/Command/Traits/BloomFilters/ItemsTest.php

@@ -23,7 +23,7 @@ class ItemsTest extends PredisTestCase
     {
         parent::setUp();
 
-        $this->testClass = new class() extends RedisCommand {
+        $this->testClass = new class extends RedisCommand {
             use Items;
 
             public static $itemsArgumentPositionOffset = 0;

tests/Predis/Command/Traits/BloomFilters/MaxIterationsTest.php

@@ -24,7 +24,7 @@ class MaxIterationsTest extends PredisTestCase
     {
         parent::setUp();
 
-        $this->testClass = new class() extends RedisCommand {
+        $this->testClass = new class extends RedisCommand {
             use MaxIterations;
 
             public static $maxIterationsArgumentPositionOffset = 0;

tests/Predis/Command/Traits/BloomFilters/NoCreateTest.php

@@ -24,7 +24,7 @@ class NoCreateTest extends PredisTestCase
     {
         parent::setUp();
 
-        $this->testClass = new class() extends RedisCommand {
+        $this->testClass = new class extends RedisCommand {
             use NoCreate;
 
             public static $noCreateArgumentPositionOffset = 0;

tests/Predis/Command/Traits/By/ByArgumentTest.php

@@ -23,7 +23,7 @@ class ByArgumentTest extends PredisTestCase
     {
         parent::setUp();
 
-        $this->testClass = new class() extends RedisCommand {
+        $this->testClass = new class extends RedisCommand {
             use ByArgument;
 
             public static $byArgumentPositionOffset = 0;

tests/Predis/Command/Traits/By/GeoByTest.php

@@ -26,7 +26,7 @@ class GeoByTest extends PredisTestCase
     {
         parent::setUp();
 
-        $this->testClass = new class() extends RedisCommand {
+        $this->testClass = new class extends RedisCommand {
             use GeoBy;
 
             public function getId()

tests/Predis/Command/Traits/ByLexByScoreTest.php

@@ -25,7 +25,7 @@ class ByLexByScoreTest extends PredisTestCase
     {
         parent::setUp();
 
-        $this->testClass = new class() extends RedisCommand {
+        $this->testClass = new class extends RedisCommand {
             use ByLexByScore;
 
             public static $byLexByScoreArgumentPositionOffset = 0;

tests/Predis/Command/Traits/CountTest.php

@@ -24,7 +24,7 @@ class CountTest extends PredisTestCase
     {
         parent::setUp();
 
-        $this->testClass = new class() extends RedisCommand {
+        $this->testClass = new class extends RedisCommand {
             use Count;
 
             public static $countArgumentPositionOffset = 2;

tests/Predis/Command/Traits/DbTest.php

@@ -24,7 +24,7 @@ class DbTest extends PredisTestCase
     {
         parent::setUp();
 
-        $this->testClass = new class() extends RedisCommand {
+        $this->testClass = new class extends RedisCommand {
             use DB;
 
             public static $dbArgumentPositionOffset = 0;

tests/Predis/Command/Traits/From/GeoFromTest.php

@@ -26,7 +26,7 @@ class GeoFromTest extends PredisTestCase
     {
         parent::setUp();
 
-        $this->testClass = new class() extends RedisCommand {
+        $this->testClass = new class extends RedisCommand {
             use GeoFrom;
 
             public function getId()

tests/Predis/Command/Traits/Get/GetTest.php

@@ -24,7 +24,7 @@ class GetTest extends PredisTestCase
     {
         parent::setUp();
 
-        $this->testClass = new class() extends RedisCommand {
+        $this->testClass = new class extends RedisCommand {
             use Get;
 
             public static $getArgumentPositionOffset = 0;

tests/Predis/Command/Traits/Json/IndentTest.php

@@ -22,7 +22,7 @@ class IndentTest extends PredisTestCase
 
     protected function setUp(): void
     {
-        $this->testClass = new class() extends RedisCommand {
+        $this->testClass = new class extends RedisCommand {
             use Indent;
 
             public static $indentArgumentPositionOffset = 0;

tests/Predis/Command/Traits/Json/NewlineTest.php

@@ -22,7 +22,7 @@ class NewlineTest extends PredisTestCase
 
     protected function setUp(): void
     {
-        $this->testClass = new class() extends RedisCommand {
+        $this->testClass = new class extends RedisCommand {
             use Newline;
 
             public static $newlineArgumentPositionOffset = 0;

tests/Predis/Command/Traits/Json/NxXxArgumentTest.php

@@ -22,7 +22,7 @@ class NxXxArgumentTest extends PredisTestCase
 
     protected function setUp(): void
     {
-        $this->testClass = new class() extends RedisCommand {
+        $this->testClass = new class extends RedisCommand {
             use NxXxArgument;
 
             public static $nxXxArgumentPositionOffset = 0;

tests/Predis/Command/Traits/Json/SpaceTest.php

@@ -22,7 +22,7 @@ class SpaceTest extends PredisTestCase
 
     protected function setUp(): void
     {
-        $this->testClass = new class() extends RedisCommand {
+        $this->testClass = new class extends RedisCommand {
             use Space;
 
             public static $spaceArgumentPositionOffset = 0;

tests/Predis/Command/Traits/KeysTest.php

@@ -24,7 +24,7 @@ class KeysTest extends PredisTestCase
     {
         parent::setUp();
 
-        $this->testClass = new class() extends RedisCommand {
+        $this->testClass = new class extends RedisCommand {
             use Keys;
 
             public static $keysArgumentPositionOffset = 0;

tests/Predis/Command/Traits/LeftRightTest.php

@@ -22,7 +22,7 @@ class LeftRightTest extends PredisTestCase
 
     protected function setUp(): void
     {
-        $this->testClass = new class() extends RedisCommand {
+        $this->testClass = new class extends RedisCommand {
             use LeftRight;
 
             public static $leftRightArgumentPositionOffset = 0;

tests/Predis/Command/Traits/Limit/LimitObjectTest.php

@@ -24,7 +24,7 @@ class LimitObjectTest extends PredisTestCase
     {
         parent::setUp();
 
-        $this->testClass = new class() extends RedisCommand {
+        $this->testClass = new class extends RedisCommand {
             use LimitObject;
 
             public function getId()

tests/Predis/Command/Traits/Limit/LimitTest.php

@@ -24,7 +24,7 @@ class LimitTest extends PredisTestCase
     {
         parent::setUp();
 
-        $this->testClass = new class() extends RedisCommand {
+        $this->testClass = new class extends RedisCommand {
             use Limit;
 
             public static $limitArgumentPositionOffset = 0;

tests/Predis/Command/Traits/MinMaxModifierTest.php

@@ -24,7 +24,7 @@ class MinMaxModifierTest extends PredisTestCase
     {
         parent::setUp();
 
-        $this->testClass = new class() extends RedisCommand {
+        $this->testClass = new class extends RedisCommand {
             use MinMaxModifier;
 
             public function getId()

tests/Predis/Command/Traits/ReplaceTest.php

@@ -23,7 +23,7 @@ class ReplaceTest extends PredisTestCase
     {
         parent::setUp();
 
-        $this->testClass = new class() extends RedisCommand {
+        $this->testClass = new class extends RedisCommand {
             use Replace;
 
             public function getId()

tests/Predis/Command/Traits/RevTest.php

@@ -24,7 +24,7 @@ class RevTest extends PredisTestCase
     {
         parent::setUp();
 
-        $this->testClass = new class() extends RedisCommand {
+        $this->testClass = new class extends RedisCommand {
             use Rev;
 
             public static $revArgumentPositionOffset = 0;

tests/Predis/Command/Traits/StoredistTest.php

@@ -24,7 +24,7 @@ class StoredistTest extends PredisTestCase
     {
         parent::setUp();
 
-        $this->testClass = new class() extends RedisCommand {
+        $this->testClass = new class extends RedisCommand {
             use Storedist;
 
             public static $storeDistArgumentPositionOffset = 0;

tests/Predis/Command/Traits/TimeoutTest.php

@@ -24,7 +24,7 @@ class TimeoutTest extends PredisTestCase
     {
         parent::setUp();
 
-        $this->testClass = new class() extends RedisCommand {
+        $this->testClass = new class extends RedisCommand {
             use Timeout;
 
             public static $timeoutArgumentPositionOffset = 0;

tests/Predis/Command/Traits/To/ServerToTest.php

@@ -24,7 +24,7 @@ class ServerToTest extends PredisTestCase
     {
         parent::setUp();
 
-        $this->testClass = new class() extends RedisCommand {
+        $this->testClass = new class extends RedisCommand {
             use ServerTo;
 
             public static $toArgumentPositionOffset = 0;

tests/Predis/Command/Traits/WeightsTest.php

@@ -22,7 +22,7 @@ class WeightsTest extends PredisTestCase
 
     protected function setUp(): void
     {
-        $this->testClass = new class() extends RedisCommand {
+        $this->testClass = new class extends RedisCommand {
             use Weights;
 
             public static $weightsArgumentPositionOffset = 0;

tests/Predis/Command/Traits/With/WithCoordTest.php

@@ -24,7 +24,7 @@ class WithCoordTest extends PredisTestCase
     {
         parent::setUp();
 
-        $this->testClass = new class() extends RedisCommand {
+        $this->testClass = new class extends RedisCommand {
             use WithCoord;
 
             public static $withCoordArgumentPositionOffset = 0;

tests/Predis/Command/Traits/With/WithDistTest.php

@@ -24,7 +24,7 @@ class WithDistTest extends PredisTestCase
     {
         parent::setUp();
 
-        $this->testClass = new class() extends RedisCommand {
+        $this->testClass = new class extends RedisCommand {
             use WithDist;
 
             public static $withDistArgumentPositionOffset = 0;

tests/Predis/Command/Traits/With/WithHashTest.php

@@ -24,7 +24,7 @@ class WithHashTest extends PredisTestCase
     {
         parent::setUp();
 
-        $this->testClass = new class() extends RedisCommand {
+        $this->testClass = new class extends RedisCommand {
             use WithHash;
 
             public static $withHashArgumentPositionOffset = 0;

tests/Predis/Command/Traits/With/WithScoresTest.php

@@ -26,7 +26,7 @@ class WithScoresTest extends PredisTestCase
     {
         parent::setUp();
 
-        $this->testClass = new class() extends RedisCommand {
+        $this->testClass = new class extends RedisCommand {
             use WithScores;
 
             public function getId()

tests/Predis/Connection/RelayConnectionTest.php

@@ -17,11 +17,11 @@ use Predis\ClientException;
 use Predis\Command\RawCommand;
 use Predis\NotSupportedException;
 use Predis\Response\Error as ErrorResponse;
-use PredisTestCase;
-use Relay\Relay;
 use Predis\Response\ErrorInterface as ErrorResponseInterface;
+use PredisTestCase;
 use ReflectionClass;
 use Relay\Exception as RelayException;
+use Relay\Relay;
 
 /**
  * @group ext-relay