style: improve rector config, static calls invocation in tests, and add missing @throws in phpdocs (#278)

martin-georgiev · web-flow · commit 91fd91830513 · 2025-03-13T16:31:35.000Z
diff --git a/.gitignore b/.gitignore
@@ -1,3 +1,4 @@
 /bin/
+/var/
 /vendor/
 composer.lock
diff --git a/ci/rector/config.php b/ci/rector/config.php
@@ -2,7 +2,6 @@
 
 declare(strict_types=1);
 
-use Rector\CodingStyle\Rector\FuncCall\ArraySpreadInsteadOfArrayMergeRector;
 use Rector\Config\RectorConfig;
 use Rector\Doctrine\Set\DoctrineSetList;
 use Rector\Naming\Rector\Class_\RenamePropertyToMatchTypeRector;
@@ -21,7 +20,6 @@
     $rectorConfig->parallel();
     $rectorConfig->phpstanConfig($basePath.'ci/phpstan/config.neon');
     $rectorConfig->skip([
-        ArraySpreadInsteadOfArrayMergeRector::class,
         RenamePropertyToMatchTypeRector::class,
     ]);
     $rectorConfig->importShortClasses(false);
diff --git a/src/MartinGeorgiev/Doctrine/ORM/Query/AST/Functions/BaseVariadicFunction.php b/src/MartinGeorgiev/Doctrine/ORM/Query/AST/Functions/BaseVariadicFunction.php
@@ -9,6 +9,7 @@
 use Doctrine\ORM\Query\Parser;
 use Doctrine\ORM\Query\SqlWalker;
 use Doctrine\ORM\Query\TokenType;
+use MartinGeorgiev\Doctrine\ORM\Query\AST\Functions\Exception\InvalidArgumentForVariadicFunctionException;
 use MartinGeorgiev\Doctrine\ORM\Query\AST\Functions\Exception\ParserException;
 use MartinGeorgiev\Utils\DoctrineOrm;
 
@@ -19,6 +20,9 @@ abstract class BaseVariadicFunction extends BaseFunction
 {
     protected string $commonNodeMapping = 'StringPrimary';
 
+    /**
+     * @throws ParserException
+     */
     public function feedParserWithNodes(Parser $parser): void
     {
         $lexer = $parser->getLexer();
@@ -56,6 +60,8 @@ public function getSql(SqlWalker $sqlWalker): string
      * Validates the arguments passed to the function.
      *
      * @param mixed[] $arguments The array of arguments to validate
+     *
+     * @throws InvalidArgumentForVariadicFunctionException
      */
     abstract protected function validateArguments(array $arguments): void;
 }
diff --git a/tests/MartinGeorgiev/Doctrine/DBAL/Types/BaseArrayTest.php b/tests/MartinGeorgiev/Doctrine/DBAL/Types/BaseArrayTest.php
@@ -43,7 +43,7 @@ public function can_transform_from_php_value(?array $phpValue, ?string $postgres
             ->method('isValidArrayItemForDatabase')
             ->willReturn(true);
 
-        $this->assertSame($postgresValue, $this->fixture->convertToDatabaseValue($phpValue, $this->platform));
+        self::assertSame($postgresValue, $this->fixture->convertToDatabaseValue($phpValue, $this->platform));
     }
 
     /**
@@ -53,7 +53,7 @@ public function can_transform_from_php_value(?array $phpValue, ?string $postgres
      */
     public function can_transform_to_php_value(?array $phpValue, ?string $postgresValue): void
     {
-        $this->assertEquals($phpValue, $this->fixture->convertToPHPValue($postgresValue, $this->platform));
+        self::assertEquals($phpValue, $this->fixture->convertToPHPValue($postgresValue, $this->platform));
     }
 
     /**
diff --git a/tests/MartinGeorgiev/Doctrine/DBAL/Types/BaseIntegerArrayTestCase.php b/tests/MartinGeorgiev/Doctrine/DBAL/Types/BaseIntegerArrayTestCase.php
@@ -22,7 +22,7 @@ abstract class BaseIntegerArrayTestCase extends TestCase
      */
     public function can_detect_invalid_for_transformation_php_value(mixed $phpValue): void
     {
-        $this->assertFalse($this->fixture->isValidArrayItemForDatabase($phpValue));
+        self::assertFalse($this->fixture->isValidArrayItemForDatabase($phpValue));
     }
 
     /**
@@ -47,7 +47,7 @@ public static function provideInvalidTransformations(): array
      */
     public function can_transform_from_php_value(int $phpValue, string $postgresValue): void
     {
-        $this->assertTrue($this->fixture->isValidArrayItemForDatabase($phpValue));
+        self::assertTrue($this->fixture->isValidArrayItemForDatabase($phpValue));
     }
 
     /**
@@ -57,7 +57,7 @@ public function can_transform_from_php_value(int $phpValue, string $postgresValu
      */
     public function can_transform_to_php_value(int $phpValue, string $postgresValue): void
     {
-        $this->assertEquals($phpValue, $this->fixture->transformArrayItemForPHP($postgresValue));
+        self::assertEquals($phpValue, $this->fixture->transformArrayItemForPHP($postgresValue));
     }
 
     /**
diff --git a/tests/MartinGeorgiev/Doctrine/DBAL/Types/BigIntArrayTest.php b/tests/MartinGeorgiev/Doctrine/DBAL/Types/BigIntArrayTest.php
@@ -20,7 +20,7 @@ protected function setUp(): void
      */
     public function has_name(): void
     {
-        $this->assertEquals('bigint[]', $this->fixture->getName());
+        self::assertEquals('bigint[]', $this->fixture->getName());
     }
 
     public static function provideInvalidTransformations(): array
diff --git a/tests/MartinGeorgiev/Doctrine/DBAL/Types/BooleanArrayTest.php b/tests/MartinGeorgiev/Doctrine/DBAL/Types/BooleanArrayTest.php
@@ -30,7 +30,7 @@ protected function setUp(): void
      */
     public function has_name(): void
     {
-        $this->assertEquals('bool[]', $this->fixture->getName());
+        self::assertEquals('bool[]', $this->fixture->getName());
     }
 
     /**
@@ -44,7 +44,7 @@ public function can_transform_from_php_value(?array $phpValue, ?string $postgres
             ->with($phpValue)
             ->willReturn($platformValue);
 
-        $this->assertEquals($postgresValue, $this->fixture->convertToDatabaseValue($phpValue, $this->platform));
+        self::assertEquals($postgresValue, $this->fixture->convertToDatabaseValue($phpValue, $this->platform));
     }
 
     /**
@@ -58,7 +58,7 @@ public function can_transform_to_php_value(?array $phpValue, ?string $postgresVa
             ->with($this->anything())
             ->willReturnCallback('boolval');
 
-        $this->assertEquals($phpValue, $this->fixture->convertToPHPValue($postgresValue, $this->platform));
+        self::assertEquals($phpValue, $this->fixture->convertToPHPValue($postgresValue, $this->platform));
     }
 
     /**
diff --git a/tests/MartinGeorgiev/Doctrine/DBAL/Types/IntegerArrayTest.php b/tests/MartinGeorgiev/Doctrine/DBAL/Types/IntegerArrayTest.php
@@ -20,7 +20,7 @@ protected function setUp(): void
      */
     public function has_name(): void
     {
-        $this->assertEquals('integer[]', $this->fixture->getName());
+        self::assertEquals('integer[]', $this->fixture->getName());
     }
 
     /**
diff --git a/tests/MartinGeorgiev/Doctrine/DBAL/Types/JsonbArrayTest.php b/tests/MartinGeorgiev/Doctrine/DBAL/Types/JsonbArrayTest.php
@@ -31,7 +31,7 @@ protected function setUp(): void
      */
     public function has_name(): void
     {
-        $this->assertEquals('jsonb[]', $this->fixture->getName());
+        self::assertEquals('jsonb[]', $this->fixture->getName());
     }
 
     /**
@@ -41,7 +41,7 @@ public function has_name(): void
      */
     public function can_transform_from_php_value(?array $phpValue, ?string $postgresValue): void
     {
-        $this->assertEquals($postgresValue, $this->fixture->convertToDatabaseValue($phpValue, $this->platform));
+        self::assertEquals($postgresValue, $this->fixture->convertToDatabaseValue($phpValue, $this->platform));
     }
 
     /**
@@ -51,7 +51,7 @@ public function can_transform_from_php_value(?array $phpValue, ?string $postgres
      */
     public function can_transform_to_php_value(?array $phpValue, ?string $postgresValue): void
     {
-        $this->assertEquals($phpValue, $this->fixture->convertToPHPValue($postgresValue, $this->platform));
+        self::assertEquals($phpValue, $this->fixture->convertToPHPValue($postgresValue, $this->platform));
     }
 
     /**
diff --git a/tests/MartinGeorgiev/Doctrine/DBAL/Types/JsonbTest.php b/tests/MartinGeorgiev/Doctrine/DBAL/Types/JsonbTest.php
@@ -30,7 +30,7 @@ protected function setUp(): void
      */
     public function has_name(): void
     {
-        $this->assertEquals('jsonb', $this->fixture->getName());
+        self::assertEquals('jsonb', $this->fixture->getName());
     }
 
     /**
@@ -40,7 +40,7 @@ public function has_name(): void
      */
     public function can_transform_from_php_value(null|array|bool|float|int|string $phpValue, ?string $postgresValue): void
     {
-        $this->assertEquals($postgresValue, $this->fixture->convertToDatabaseValue($phpValue, $this->platform));
+        self::assertEquals($postgresValue, $this->fixture->convertToDatabaseValue($phpValue, $this->platform));
     }
 
     /**
@@ -50,7 +50,7 @@ public function can_transform_from_php_value(null|array|bool|float|int|string $p
      */
     public function can_transform_to_php_value(null|array|bool|float|int|string $phpValue, ?string $postgresValue): void
     {
-        $this->assertEquals($phpValue, $this->fixture->convertToPHPValue($postgresValue, $this->platform));
+        self::assertEquals($phpValue, $this->fixture->convertToPHPValue($postgresValue, $this->platform));
     }
 
     /**
diff --git a/tests/MartinGeorgiev/Doctrine/DBAL/Types/SmallIntArrayTest.php b/tests/MartinGeorgiev/Doctrine/DBAL/Types/SmallIntArrayTest.php
@@ -20,7 +20,7 @@ protected function setUp(): void
      */
     public function has_name(): void
     {
-        $this->assertEquals('smallint[]', $this->fixture->getName());
+        self::assertEquals('smallint[]', $this->fixture->getName());
     }
 
     public static function provideInvalidTransformations(): array
diff --git a/tests/MartinGeorgiev/Doctrine/DBAL/Types/TextArrayTest.php b/tests/MartinGeorgiev/Doctrine/DBAL/Types/TextArrayTest.php
@@ -30,7 +30,7 @@ protected function setUp(): void
      */
     public function has_name(): void
     {
-        $this->assertEquals('text[]', $this->fixture->getName());
+        self::assertEquals('text[]', $this->fixture->getName());
     }
 
     /**
@@ -40,7 +40,7 @@ public function has_name(): void
      */
     public function can_transform_from_php_value(?array $phpValue, ?string $postgresValue): void
     {
-        $this->assertEquals($postgresValue, $this->fixture->convertToDatabaseValue($phpValue, $this->platform));
+        self::assertEquals($postgresValue, $this->fixture->convertToDatabaseValue($phpValue, $this->platform));
     }
 
     /**
@@ -50,7 +50,7 @@ public function can_transform_from_php_value(?array $phpValue, ?string $postgres
      */
     public function can_transform_to_php_value(?array $phpValue, ?string $postgresValue): void
     {
-        $this->assertEquals($phpValue, $this->fixture->convertToPHPValue($postgresValue, $this->platform));
+        self::assertEquals($phpValue, $this->fixture->convertToPHPValue($postgresValue, $this->platform));
     }
 
     /**
diff --git a/tests/MartinGeorgiev/Doctrine/ORM/Query/AST/Functions/TestCase.php b/tests/MartinGeorgiev/Doctrine/ORM/Query/AST/Functions/TestCase.php
@@ -103,7 +103,7 @@ public function dql_is_transformed_to_valid_sql(): void
     protected function assertSqlFromDql(string $expectedSql, string $dql, string $message = ''): void
     {
         $query = $this->buildEntityManager()->createQuery($dql);
-        $this->assertEquals($expectedSql, $query->getSQL(), $message);
+        self::assertEquals($expectedSql, $query->getSQL(), $message);
     }
 
     private function buildEntityManager(): EntityManager
diff --git a/tests/MartinGeorgiev/Utils/DataStructureTest.php b/tests/MartinGeorgiev/Utils/DataStructureTest.php
@@ -18,7 +18,7 @@ class DataStructureTest extends TestCase
      */
     public function can_transform_from_php_value(array $phpValue, string $postgresValue): void
     {
-        $this->assertEquals($postgresValue, DataStructure::transformPHPArrayToPostgresTextArray($phpValue));
+        self::assertEquals($postgresValue, DataStructure::transformPHPArrayToPostgresTextArray($phpValue));
     }
 
     /**
@@ -30,7 +30,7 @@ public function can_transform_from_php_value(array $phpValue, string $postgresVa
      */
     public function can_transform_to_php_value(array $phpValue, string $postgresValue): void
     {
-        $this->assertEquals($phpValue, DataStructure::transformPostgresTextArrayToPHPArray($postgresValue));
+        self::assertEquals($phpValue, DataStructure::transformPostgresTextArrayToPHPArray($postgresValue));
     }
 
     /**

-Original file line number
+Diff line change
@@ @@ -1,3 +1,4 @@ @@
 /bin/
 +/var/
 /vendor/
 composer.lock
Original file line number	Diff line number	Diff line change
`@@ -9,6 +9,7 @@`
`9`	`9`	`use Doctrine\ORM\Query\Parser;`
`10`	`10`	`use Doctrine\ORM\Query\SqlWalker;`
`11`	`11`	`use Doctrine\ORM\Query\TokenType;`
	`12`	`+use MartinGeorgiev\Doctrine\ORM\Query\AST\Functions\Exception\InvalidArgumentForVariadicFunctionException;`
`12`	`13`	`use MartinGeorgiev\Doctrine\ORM\Query\AST\Functions\Exception\ParserException;`
`13`	`14`	`use MartinGeorgiev\Utils\DoctrineOrm;`
`14`	`15`
`@@ -19,6 +20,9 @@ abstract class BaseVariadicFunction extends BaseFunction`
`19`	`20`	`{`
`20`	`21`	`protected string $commonNodeMapping = 'StringPrimary';`
`21`	`22`
	`23`	`+ /**`
	`24`	`+ * @throws ParserException`
	`25`	`+ */`
`22`	`26`	`public function feedParserWithNodes(Parser $parser): void`
`23`	`27`	`{`
`24`	`28`	`$lexer = $parser->getLexer();`
`@@ -56,6 +60,8 @@ public function getSql(SqlWalker $sqlWalker): string`
`56`	`60`	`* Validates the arguments passed to the function.`
`57`	`61`	`*`
`58`	`62`	`* @param mixed[] $arguments The array of arguments to validate`
	`63`	`+ *`
	`64`	`+ * @throws InvalidArgumentForVariadicFunctionException`
`59`	`65`	`*/`
`60`	`66`	`abstract protected function validateArguments(array $arguments): void;`
`61`	`67`	`}`
Original file line number	Diff line number	Diff line change
`@@ -43,7 +43,7 @@ public function can_transform_from_php_value(?array $phpValue, ?string $postgres`
`43`	`43`	`->method('isValidArrayItemForDatabase')`
`44`	`44`	`->willReturn(true);`
`45`	`45`
`46`		`- $this->assertSame($postgresValue, $this->fixture->convertToDatabaseValue($phpValue, $this->platform));`
	`46`	`+ self::assertSame($postgresValue, $this->fixture->convertToDatabaseValue($phpValue, $this->platform));`
`47`	`47`	`}`
`48`	`48`
`49`	`49`	`/**`
`@@ -53,7 +53,7 @@ public function can_transform_from_php_value(?array $phpValue, ?string $postgres`
`53`	`53`	`*/`
`54`	`54`	`public function can_transform_to_php_value(?array $phpValue, ?string $postgresValue): void`
`55`	`55`	`{`
`56`		`- $this->assertEquals($phpValue, $this->fixture->convertToPHPValue($postgresValue, $this->platform));`
	`56`	`+ self::assertEquals($phpValue, $this->fixture->convertToPHPValue($postgresValue, $this->platform));`
`57`	`57`	`}`
`58`	`58`
`59`	`59`	`/**`
Original file line number	Diff line number	Diff line change
`@@ -22,7 +22,7 @@ abstract class BaseIntegerArrayTestCase extends TestCase`
`22`	`22`	`*/`
`23`	`23`	`public function can_detect_invalid_for_transformation_php_value(mixed $phpValue): void`
`24`	`24`	`{`
`25`		`- $this->assertFalse($this->fixture->isValidArrayItemForDatabase($phpValue));`
	`25`	`+ self::assertFalse($this->fixture->isValidArrayItemForDatabase($phpValue));`
`26`	`26`	`}`
`27`	`27`
`28`	`28`	`/**`
`@@ -47,7 +47,7 @@ public static function provideInvalidTransformations(): array`
`47`	`47`	`*/`
`48`	`48`	`public function can_transform_from_php_value(int $phpValue, string $postgresValue): void`
`49`	`49`	`{`
`50`		`- $this->assertTrue($this->fixture->isValidArrayItemForDatabase($phpValue));`
	`50`	`+ self::assertTrue($this->fixture->isValidArrayItemForDatabase($phpValue));`
`51`	`51`	`}`
`52`	`52`
`53`	`53`	`/**`
`@@ -57,7 +57,7 @@ public function can_transform_from_php_value(int $phpValue, string $postgresValu`
`57`	`57`	`*/`
`58`	`58`	`public function can_transform_to_php_value(int $phpValue, string $postgresValue): void`
`59`	`59`	`{`
`60`		`- $this->assertEquals($phpValue, $this->fixture->transformArrayItemForPHP($postgresValue));`
	`60`	`+ self::assertEquals($phpValue, $this->fixture->transformArrayItemForPHP($postgresValue));`
`61`	`61`	`}`
`62`	`62`
`63`	`63`	`/**`
Original file line number	Diff line number	Diff line change
`@@ -20,7 +20,7 @@ protected function setUp(): void`
`20`	`20`	`*/`
`21`	`21`	`public function has_name(): void`
`22`	`22`	`{`
`23`		`- $this->assertEquals('bigint[]', $this->fixture->getName());`
	`23`	`+ self::assertEquals('bigint[]', $this->fixture->getName());`
`24`	`24`	`}`
`25`	`25`
`26`	`26`	`public static function provideInvalidTransformations(): array`
Original file line number	Diff line number	Diff line change
`@@ -30,7 +30,7 @@ protected function setUp(): void`
`30`	`30`	`*/`
`31`	`31`	`public function has_name(): void`
`32`	`32`	`{`
`33`		`- $this->assertEquals('bool[]', $this->fixture->getName());`
	`33`	`+ self::assertEquals('bool[]', $this->fixture->getName());`
`34`	`34`	`}`
`35`	`35`
`36`	`36`	`/**`
`@@ -44,7 +44,7 @@ public function can_transform_from_php_value(?array $phpValue, ?string $postgres`
`44`	`44`	`->with($phpValue)`
`45`	`45`	`->willReturn($platformValue);`
`46`	`46`
`47`		`- $this->assertEquals($postgresValue, $this->fixture->convertToDatabaseValue($phpValue, $this->platform));`
	`47`	`+ self::assertEquals($postgresValue, $this->fixture->convertToDatabaseValue($phpValue, $this->platform));`
`48`	`48`	`}`
`49`	`49`
`50`	`50`	`/**`
`@@ -58,7 +58,7 @@ public function can_transform_to_php_value(?array $phpValue, ?string $postgresVa`
`58`	`58`	`->with($this->anything())`
`59`	`59`	`->willReturnCallback('boolval');`
`60`	`60`
`61`		`- $this->assertEquals($phpValue, $this->fixture->convertToPHPValue($postgresValue, $this->platform));`
	`61`	`+ self::assertEquals($phpValue, $this->fixture->convertToPHPValue($postgresValue, $this->platform));`
`62`	`62`	`}`
`63`	`63`
`64`	`64`	`/**`
Original file line number	Diff line number	Diff line change
`@@ -31,7 +31,7 @@ protected function setUp(): void`
`31`	`31`	`*/`
`32`	`32`	`public function has_name(): void`
`33`	`33`	`{`
`34`		`- $this->assertEquals('jsonb[]', $this->fixture->getName());`
	`34`	`+ self::assertEquals('jsonb[]', $this->fixture->getName());`
`35`	`35`	`}`
`36`	`36`
`37`	`37`	`/**`
`@@ -41,7 +41,7 @@ public function has_name(): void`
`41`	`41`	`*/`
`42`	`42`	`public function can_transform_from_php_value(?array $phpValue, ?string $postgresValue): void`
`43`	`43`	`{`
`44`		`- $this->assertEquals($postgresValue, $this->fixture->convertToDatabaseValue($phpValue, $this->platform));`
	`44`	`+ self::assertEquals($postgresValue, $this->fixture->convertToDatabaseValue($phpValue, $this->platform));`
`45`	`45`	`}`
`46`	`46`
`47`	`47`	`/**`
`@@ -51,7 +51,7 @@ public function can_transform_from_php_value(?array $phpValue, ?string $postgres`
`51`	`51`	`*/`
`52`	`52`	`public function can_transform_to_php_value(?array $phpValue, ?string $postgresValue): void`
`53`	`53`	`{`
`54`		`- $this->assertEquals($phpValue, $this->fixture->convertToPHPValue($postgresValue, $this->platform));`
	`54`	`+ self::assertEquals($phpValue, $this->fixture->convertToPHPValue($postgresValue, $this->platform));`
`55`	`55`	`}`
`56`	`56`
`57`	`57`	`/**`