Codestyle updates (#1485)

vladvildanov · web-flow · commit 1726db0f4761 · 2024-10-22T09:16:07.000-07:00
diff --git a/.github/workflows/tests.yml b/.github/workflows/tests.yml
@@ -108,7 +108,7 @@ jobs:
         uses: actions/checkout@v3
 
       - name: Run Redis cluster
-        uses: isbang/compose-action@v1.4.1
+        uses: hoverkraft-tech/compose-action@v2.0.1
         with:
           compose-file: .github/workflows/cluster/docker-compose.yml
 
diff --git a/.php-cs-fixer.dist.php b/.php-cs-fixer.dist.php
@@ -25,6 +25,7 @@
         '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()
diff --git a/tests/Predis/Command/Redis/AbstractCommand/BZPOPBaseTest.php b/tests/Predis/Command/Redis/AbstractCommand/BZPOPBaseTest.php
@@ -26,7 +26,7 @@ protected function setUp(): void
     {
         parent::setUp();
 
-        $this->testCommand = new class() extends BZPOPBase {
+        $this->testCommand = new class extends BZPOPBase {
             public function getId(): string
             {
                 return 'test';
diff --git a/tests/Predis/Command/Redis/Search/FTCONFIG_Test.php b/tests/Predis/Command/Redis/Search/FTCONFIG_Test.php
@@ -91,7 +91,7 @@ public function testParseResponse(): void
      * @group connected
      * @group relay-resp3
      * @return void
-     * @requiresRediSearchVersion >= 1.0.0
+     * @requiresRedisVersion <= 7.3.0
      */
     public function testSetGivenRediSearchConfigurationParameter(): void
     {
@@ -104,7 +104,7 @@ public function testSetGivenRediSearchConfigurationParameter(): void
      * @group connected
      * @group relay-resp3
      * @return void
-     * @requiresRediSearchVersion >= 1.0.0
+     * @requiresRedisVersion <= 7.3.0
      */
     public function testGetReturnsGivenRediSearchConfigurationParameter(): void
     {
@@ -118,7 +118,7 @@ public function testGetReturnsGivenRediSearchConfigurationParameter(): void
      * @group connected
      * @group relay-resp3
      * @return void
-     * @requiresRediSearchVersion >= 1.0.0
+     * @requiresRedisVersion <= 7.3.0
      */
     public function testHelpReturnsGivenRediSearchConfigurationDescription(): void
     {
@@ -141,7 +141,7 @@ public function testHelpReturnsGivenRediSearchConfigurationDescription(): void
      * @group connected
      * @group relay-resp3
      * @return void
-     * @requiresRediSearchVersion >= 1.0.0
+     * @requiresRedisVersion <= 7.3.0
      */
     public function testSetThrowsExceptionOnNonExistingOption(): void
     {
diff --git a/tests/Predis/Command/Traits/AggregateTest.php b/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;
diff --git a/tests/Predis/Command/Traits/BitByteTest.php b/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()
diff --git a/tests/Predis/Command/Traits/BloomFilters/BucketSizeTest.php b/tests/Predis/Command/Traits/BloomFilters/BucketSizeTest.php
@@ -24,7 +24,7 @@ protected function setUp(): void
     {
         parent::setUp();
 
-        $this->testClass = new class() extends RedisCommand {
+        $this->testClass = new class extends RedisCommand {
             use BucketSize;
 
             public static $bucketSizeArgumentPositionOffset = 0;
diff --git a/tests/Predis/Command/Traits/BloomFilters/CapacityTest.php b/tests/Predis/Command/Traits/BloomFilters/CapacityTest.php
@@ -24,7 +24,7 @@ protected function setUp(): void
     {
         parent::setUp();
 
-        $this->testClass = new class() extends RedisCommand {
+        $this->testClass = new class extends RedisCommand {
             use Capacity;
 
             public static $capacityArgumentPositionOffset = 0;
diff --git a/tests/Predis/Command/Traits/BloomFilters/ErrorTest.php b/tests/Predis/Command/Traits/BloomFilters/ErrorTest.php
@@ -24,7 +24,7 @@ protected function setUp(): void
     {
         parent::setUp();
 
-        $this->testClass = new class() extends RedisCommand {
+        $this->testClass = new class extends RedisCommand {
             use Error;
 
             public static $errorArgumentPositionOffset = 0;
diff --git a/tests/Predis/Command/Traits/BloomFilters/ExpansionTest.php b/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;
diff --git a/tests/Predis/Command/Traits/BloomFilters/ItemsTest.php b/tests/Predis/Command/Traits/BloomFilters/ItemsTest.php
@@ -23,7 +23,7 @@ protected function setUp(): void
     {
         parent::setUp();
 
-        $this->testClass = new class() extends RedisCommand {
+        $this->testClass = new class extends RedisCommand {
             use Items;
 
             public static $itemsArgumentPositionOffset = 0;
diff --git a/tests/Predis/Command/Traits/BloomFilters/MaxIterationsTest.php b/tests/Predis/Command/Traits/BloomFilters/MaxIterationsTest.php
@@ -24,7 +24,7 @@ protected function setUp(): void
     {
         parent::setUp();
 
-        $this->testClass = new class() extends RedisCommand {
+        $this->testClass = new class extends RedisCommand {
             use MaxIterations;
 
             public static $maxIterationsArgumentPositionOffset = 0;
diff --git a/tests/Predis/Command/Traits/BloomFilters/NoCreateTest.php b/tests/Predis/Command/Traits/BloomFilters/NoCreateTest.php
@@ -24,7 +24,7 @@ protected function setUp(): void
     {
         parent::setUp();
 
-        $this->testClass = new class() extends RedisCommand {
+        $this->testClass = new class extends RedisCommand {
             use NoCreate;
 
             public static $noCreateArgumentPositionOffset = 0;
diff --git a/tests/Predis/Command/Traits/By/ByArgumentTest.php b/tests/Predis/Command/Traits/By/ByArgumentTest.php
@@ -23,7 +23,7 @@ protected function setUp(): void
     {
         parent::setUp();
 
-        $this->testClass = new class() extends RedisCommand {
+        $this->testClass = new class extends RedisCommand {
             use ByArgument;
 
             public static $byArgumentPositionOffset = 0;
diff --git a/tests/Predis/Command/Traits/By/GeoByTest.php b/tests/Predis/Command/Traits/By/GeoByTest.php
@@ -26,7 +26,7 @@ protected function setUp(): void
     {
         parent::setUp();
 
-        $this->testClass = new class() extends RedisCommand {
+        $this->testClass = new class extends RedisCommand {
             use GeoBy;
 
             public function getId()
diff --git a/tests/Predis/Command/Traits/ByLexByScoreTest.php b/tests/Predis/Command/Traits/ByLexByScoreTest.php
@@ -25,7 +25,7 @@ protected function setUp(): void
     {
         parent::setUp();
 
-        $this->testClass = new class() extends RedisCommand {
+        $this->testClass = new class extends RedisCommand {
             use ByLexByScore;
 
             public static $byLexByScoreArgumentPositionOffset = 0;
diff --git a/tests/Predis/Command/Traits/CountTest.php b/tests/Predis/Command/Traits/CountTest.php
@@ -24,7 +24,7 @@ protected function setUp(): void
     {
         parent::setUp();
 
-        $this->testClass = new class() extends RedisCommand {
+        $this->testClass = new class extends RedisCommand {
             use Count;
 
             public static $countArgumentPositionOffset = 2;
diff --git a/tests/Predis/Command/Traits/DbTest.php b/tests/Predis/Command/Traits/DbTest.php
@@ -24,7 +24,7 @@ protected function setUp(): void
     {
         parent::setUp();
 
-        $this->testClass = new class() extends RedisCommand {
+        $this->testClass = new class extends RedisCommand {
             use DB;
 
             public static $dbArgumentPositionOffset = 0;
diff --git a/tests/Predis/Command/Traits/From/GeoFromTest.php b/tests/Predis/Command/Traits/From/GeoFromTest.php
@@ -26,7 +26,7 @@ protected function setUp(): void
     {
         parent::setUp();
 
-        $this->testClass = new class() extends RedisCommand {
+        $this->testClass = new class extends RedisCommand {
             use GeoFrom;
 
             public function getId()
diff --git a/tests/Predis/Command/Traits/Get/GetTest.php b/tests/Predis/Command/Traits/Get/GetTest.php
@@ -24,7 +24,7 @@ protected function setUp(): void
     {
         parent::setUp();
 
-        $this->testClass = new class() extends RedisCommand {
+        $this->testClass = new class extends RedisCommand {
             use Get;
 
             public static $getArgumentPositionOffset = 0;
diff --git a/tests/Predis/Command/Traits/Json/IndentTest.php b/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;
diff --git a/tests/Predis/Command/Traits/Json/NewlineTest.php b/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;
diff --git a/tests/Predis/Command/Traits/Json/NxXxArgumentTest.php b/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;
diff --git a/tests/Predis/Command/Traits/Json/SpaceTest.php b/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;
diff --git a/tests/Predis/Command/Traits/KeysTest.php b/tests/Predis/Command/Traits/KeysTest.php
@@ -24,7 +24,7 @@ protected function setUp(): void
     {
         parent::setUp();
 
-        $this->testClass = new class() extends RedisCommand {
+        $this->testClass = new class extends RedisCommand {
             use Keys;
 
             public static $keysArgumentPositionOffset = 0;
diff --git a/tests/Predis/Command/Traits/LeftRightTest.php b/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;
diff --git a/tests/Predis/Command/Traits/Limit/LimitObjectTest.php b/tests/Predis/Command/Traits/Limit/LimitObjectTest.php
@@ -24,7 +24,7 @@ protected function setUp(): void
     {
         parent::setUp();
 
-        $this->testClass = new class() extends RedisCommand {
+        $this->testClass = new class extends RedisCommand {
             use LimitObject;
 
             public function getId()
diff --git a/tests/Predis/Command/Traits/Limit/LimitTest.php b/tests/Predis/Command/Traits/Limit/LimitTest.php
@@ -24,7 +24,7 @@ protected function setUp(): void
     {
         parent::setUp();
 
-        $this->testClass = new class() extends RedisCommand {
+        $this->testClass = new class extends RedisCommand {
             use Limit;
 
             public static $limitArgumentPositionOffset = 0;
diff --git a/tests/Predis/Command/Traits/MinMaxModifierTest.php b/tests/Predis/Command/Traits/MinMaxModifierTest.php
@@ -24,7 +24,7 @@ protected function setUp(): void
     {
         parent::setUp();
 
-        $this->testClass = new class() extends RedisCommand {
+        $this->testClass = new class extends RedisCommand {
             use MinMaxModifier;
 
             public function getId()
diff --git a/tests/Predis/Command/Traits/ReplaceTest.php b/tests/Predis/Command/Traits/ReplaceTest.php
@@ -23,7 +23,7 @@ protected function setUp(): void
     {
         parent::setUp();
 
-        $this->testClass = new class() extends RedisCommand {
+        $this->testClass = new class extends RedisCommand {
             use Replace;
 
             public function getId()
diff --git a/tests/Predis/Command/Traits/RevTest.php b/tests/Predis/Command/Traits/RevTest.php
@@ -24,7 +24,7 @@ protected function setUp(): void
     {
         parent::setUp();
 
-        $this->testClass = new class() extends RedisCommand {
+        $this->testClass = new class extends RedisCommand {
             use Rev;
 
             public static $revArgumentPositionOffset = 0;
diff --git a/tests/Predis/Command/Traits/StoredistTest.php b/tests/Predis/Command/Traits/StoredistTest.php
@@ -24,7 +24,7 @@ protected function setUp(): void
     {
         parent::setUp();
 
-        $this->testClass = new class() extends RedisCommand {
+        $this->testClass = new class extends RedisCommand {
             use Storedist;
 
             public static $storeDistArgumentPositionOffset = 0;
diff --git a/tests/Predis/Command/Traits/TimeoutTest.php b/tests/Predis/Command/Traits/TimeoutTest.php
@@ -24,7 +24,7 @@ protected function setUp(): void
     {
         parent::setUp();
 
-        $this->testClass = new class() extends RedisCommand {
+        $this->testClass = new class extends RedisCommand {
             use Timeout;
 
             public static $timeoutArgumentPositionOffset = 0;
diff --git a/tests/Predis/Command/Traits/To/ServerToTest.php b/tests/Predis/Command/Traits/To/ServerToTest.php
@@ -24,7 +24,7 @@ protected function setUp(): void
     {
         parent::setUp();
 
-        $this->testClass = new class() extends RedisCommand {
+        $this->testClass = new class extends RedisCommand {
             use ServerTo;
 
             public static $toArgumentPositionOffset = 0;
diff --git a/tests/Predis/Command/Traits/WeightsTest.php b/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;
diff --git a/tests/Predis/Command/Traits/With/WithCoordTest.php b/tests/Predis/Command/Traits/With/WithCoordTest.php
@@ -24,7 +24,7 @@ protected function setUp(): void
     {
         parent::setUp();
 
-        $this->testClass = new class() extends RedisCommand {
+        $this->testClass = new class extends RedisCommand {
             use WithCoord;
 
             public static $withCoordArgumentPositionOffset = 0;
diff --git a/tests/Predis/Command/Traits/With/WithDistTest.php b/tests/Predis/Command/Traits/With/WithDistTest.php
@@ -24,7 +24,7 @@ protected function setUp(): void
     {
         parent::setUp();
 
-        $this->testClass = new class() extends RedisCommand {
+        $this->testClass = new class extends RedisCommand {
             use WithDist;
 
             public static $withDistArgumentPositionOffset = 0;
diff --git a/tests/Predis/Command/Traits/With/WithHashTest.php b/tests/Predis/Command/Traits/With/WithHashTest.php
@@ -24,7 +24,7 @@ protected function setUp(): void
     {
         parent::setUp();
 
-        $this->testClass = new class() extends RedisCommand {
+        $this->testClass = new class extends RedisCommand {
             use WithHash;
 
             public static $withHashArgumentPositionOffset = 0;
diff --git a/tests/Predis/Command/Traits/With/WithScoresTest.php b/tests/Predis/Command/Traits/With/WithScoresTest.php
@@ -26,7 +26,7 @@ protected function setUp(): void
     {
         parent::setUp();
 
-        $this->testClass = new class() extends RedisCommand {
+        $this->testClass = new class extends RedisCommand {
             use WithScores;
 
             public function getId()

Original file line number	Diff line number	Diff line change
`@@ -26,7 +26,7 @@ protected function setUp(): void`
`26`	`26`	`{`
`27`	`27`	`parent::setUp();`
`28`	`28`
`29`		`- $this->testCommand = new class() extends BZPOPBase {`
	`29`	`+ $this->testCommand = new class extends BZPOPBase {`
`30`	`30`	`public function getId(): string`
`31`	`31`	`{`
`32`	`32`	`return 'test';`
Original file line number	Diff line number	Diff line change
`@@ -22,7 +22,7 @@ class AggregateTest extends PredisTestCase`
`22`	`22`
`23`	`23`	`protected function setUp(): void`
`24`	`24`	`{`
`25`		`- $this->testClass = new class() extends RedisCommand {`
	`25`	`+ $this->testClass = new class extends RedisCommand {`
`26`	`26`	`use Aggregate;`
`27`	`27`
`28`	`28`	`public static $aggregateArgumentPositionOffset = 0;`
Original file line number	Diff line number	Diff line change
`@@ -21,7 +21,7 @@ class BitByteTest extends PredisTestCase`
`21`	`21`
`22`	`22`	`protected function setUp(): void`
`23`	`23`	`{`
`24`		`- $this->testClass = new class() extends RedisCommand {`
	`24`	`+ $this->testClass = new class extends RedisCommand {`
`25`	`25`	`use BitByte;`
`26`	`26`
`27`	`27`	`public function getId()`
Original file line number	Diff line number	Diff line change
`@@ -24,7 +24,7 @@ protected function setUp(): void`
`24`	`24`	`{`
`25`	`25`	`parent::setUp();`
`26`	`26`
`27`		`- $this->testClass = new class() extends RedisCommand {`
	`27`	`+ $this->testClass = new class extends RedisCommand {`
`28`	`28`	`use BucketSize;`
`29`	`29`
`30`	`30`	`public static $bucketSizeArgumentPositionOffset = 0;`
Original file line number	Diff line number	Diff line change
`@@ -22,7 +22,7 @@ class ExpansionTest extends PredisTestCase`
`22`	`22`
`23`	`23`	`protected function setUp(): void`
`24`	`24`	`{`
`25`		`- $this->testClass = new class() extends RedisCommand {`
	`25`	`+ $this->testClass = new class extends RedisCommand {`
`26`	`26`	`use Expansion;`
`27`	`27`
`28`	`28`	`public static $expansionArgumentPositionOffset = 0;`
Original file line number	Diff line number	Diff line change
`@@ -23,7 +23,7 @@ protected function setUp(): void`
`23`	`23`	`{`
`24`	`24`	`parent::setUp();`
`25`	`25`
`26`		`- $this->testClass = new class() extends RedisCommand {`
	`26`	`+ $this->testClass = new class extends RedisCommand {`
`27`	`27`	`use Items;`
`28`	`28`
`29`	`29`	`public static $itemsArgumentPositionOffset = 0;`
Original file line number	Diff line number	Diff line change
`@@ -25,7 +25,7 @@ protected function setUp(): void`
`25`	`25`	`{`
`26`	`26`	`parent::setUp();`
`27`	`27`
`28`		`- $this->testClass = new class() extends RedisCommand {`
	`28`	`+ $this->testClass = new class extends RedisCommand {`
`29`	`29`	`use ByLexByScore;`
`30`	`30`
`31`	`31`	`public static $byLexByScoreArgumentPositionOffset = 0;`
Original file line number	Diff line number	Diff line change
`@@ -22,7 +22,7 @@ class IndentTest extends PredisTestCase`
`22`	`22`
`23`	`23`	`protected function setUp(): void`
`24`	`24`	`{`
`25`		`- $this->testClass = new class() extends RedisCommand {`
	`25`	`+ $this->testClass = new class extends RedisCommand {`
`26`	`26`	`use Indent;`
`27`	`27`
`28`	`28`	`public static $indentArgumentPositionOffset = 0;`
Original file line number	Diff line number	Diff line change
`@@ -22,7 +22,7 @@ class NewlineTest extends PredisTestCase`
`22`	`22`
`23`	`23`	`protected function setUp(): void`
`24`	`24`	`{`
`25`		`- $this->testClass = new class() extends RedisCommand {`
	`25`	`+ $this->testClass = new class extends RedisCommand {`
`26`	`26`	`use Newline;`
`27`	`27`
`28`	`28`	`public static $newlineArgumentPositionOffset = 0;`
Original file line number	Diff line number	Diff line change
`@@ -22,7 +22,7 @@ class NxXxArgumentTest extends PredisTestCase`
`22`	`22`
`23`	`23`	`protected function setUp(): void`
`24`	`24`	`{`
`25`		`- $this->testClass = new class() extends RedisCommand {`
	`25`	`+ $this->testClass = new class extends RedisCommand {`
`26`	`26`	`use NxXxArgument;`
`27`	`27`
`28`	`28`	`public static $nxXxArgumentPositionOffset = 0;`