martin-georgiev · martin-georgiev · Mar 14, 2025 · Mar 13, 2025 · Mar 14, 2025 · Mar 14, 2025
diff --git a/ci/phpstan/config.neon b/ci/phpstan/config.neon
@@ -1,5 +1,7 @@
 includes:
     - ../../vendor/ekino/phpstan-banned-code/extension.neon
+    - ../../vendor/phpstan/phpstan-deprecation-rules/rules.neon
+    - ../../vendor/phpstan/phpstan-doctrine/extension.neon
     - ../../vendor/phpstan/phpstan-phpunit/extension.neon
 
 parameters:
@@ -9,6 +11,13 @@ parameters:
         - ../../src
         - ../../tests
 
+    tmpDir: ../../var/cache/phpstan
+
+    parallel:
+        maximumNumberOfProcesses: 4
+
+    errorFormat: table
+
     reportUnmatchedIgnoredErrors: false
 
     ignoreErrors:

diff --git a/ci/phpunit/config.xml b/ci/phpunit/config.xml
@@ -1,13 +1,29 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<phpunit xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" colors="true" stopOnFailure="false" bootstrap="../../vendor/autoload.php" xsi:noNamespaceSchemaLocation="https://schema.phpunit.de/10.5/phpunit.xsd" cacheDirectory=".phpunit.cache">
-  <testsuites>
-    <testsuite name="PostgreSQL-for-Doctrine Test Suite">
-      <directory>../../tests</directory>
-    </testsuite>
-  </testsuites>
-  <source>
-    <include>
-      <directory suffix=".php">../../src</directory>
-    </include>
-  </source>
+<phpunit xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+         colors="true"
+         stopOnFailure="false"
+         bootstrap="../../vendor/autoload.php"
+         xsi:noNamespaceSchemaLocation="https://schema.phpunit.de/10.5/phpunit.xsd"
+         cacheDirectory="../../var/cache/phpunit/"
+         executionOrder="random"
+         failOnRisky="true"
+         failOnWarning="true"
+         beStrictAboutOutputDuringTests="true"
+         beStrictAboutTodoAnnotatedTests="true">
+    <testsuites>
+        <testsuite name="PostgreSQL-for-Doctrine Test Suite">
+            <directory>../../tests</directory>
+        </testsuite>
+    </testsuites>
+    <coverage>
+        <report>
+            <html outputDirectory="../../var/coverage/html"/>
+            <clover outputFile="../../var/coverage/clover.xml"/>
+        </report>
+    </coverage>
+    <source>
+        <include>
+            <directory suffix=".php">../../src</directory>
+        </include>
+    </source>
 </phpunit>
diff --git a/ci/rector/config.php b/ci/rector/config.php
@@ -12,29 +12,36 @@
     $basePath = __DIR__.'/../../';
     $paths = [
         $basePath.'ci',
+        $basePath.'fixtures',
         $basePath.'src',
         $basePath.'tests',
     ];
     $rectorConfig->paths($paths);
 
+    $rectorConfig->cacheDirectory($basePath.'var/cache/rector/');
+
     $rectorConfig->parallel();
     $rectorConfig->phpstanConfig($basePath.'ci/phpstan/config.neon');
+
+    $rectorConfig->sets([
+        SetList::CODE_QUALITY,
+        SetList::DEAD_CODE,
+        SetList::EARLY_RETURN,
+        SetList::NAMING,
+        SetList::PHP_80,
+        SetList::PHP_81,
+        SetList::TYPE_DECLARATION,
+        SetList::PRIVATIZATION,
+        SetList::CODING_STYLE,
+        DoctrineSetList::DOCTRINE_ORM_25,
+        DoctrineSetList::DOCTRINE_CODE_QUALITY,
+        LevelSetList::UP_TO_PHP_81,
+    ]);
+
     $rectorConfig->skip([
         RenamePropertyToMatchTypeRector::class,
     ]);
-    $rectorConfig->importShortClasses(false);
-    $rectorConfig->importNames(false, false); // @todo Enable once Rector introduces better support for function imports.
-
-    $rectorConfig->import(SetList::CODE_QUALITY);
-    $rectorConfig->import(SetList::DEAD_CODE);
-    $rectorConfig->import(SetList::EARLY_RETURN);
-    $rectorConfig->import(SetList::NAMING);
-    $rectorConfig->import(SetList::PHP_80);
-    $rectorConfig->import(SetList::PHP_81);
-    $rectorConfig->import(SetList::TYPE_DECLARATION);
 
-    $rectorConfig->import(DoctrineSetList::DOCTRINE_ORM_25);
-    $rectorConfig->import(DoctrineSetList::DOCTRINE_CODE_QUALITY);
-
-    $rectorConfig->import(LevelSetList::UP_TO_PHP_81);
+    $rectorConfig->importShortClasses(false);
+    $rectorConfig->importNames(false, false);
 };
diff --git a/composer.json b/composer.json
@@ -48,9 +48,11 @@
         "ekino/phpstan-banned-code": "^1.0",
         "friendsofphp/php-cs-fixer": "^3.72.0",
         "phpstan/phpstan": "^1.12.21",
+        "phpstan/phpstan-deprecation-rules": "^1.2",
+        "phpstan/phpstan-doctrine": "^1.5",
         "phpstan/phpstan-phpunit": "^1.4.2",
         "phpunit/phpunit": "^10.5.45",
-        "rector/rector": "^1.2.10",
+        "rector/rector": "^1.2",
         "symfony/cache": "^6.4||^7.0"
     },
     "suggest": {

diff --git a/fixtures/MartinGeorgiev/Doctrine/Entity/ContainsArrays.php b/fixtures/MartinGeorgiev/Doctrine/Entity/ContainsArrays.php
@@ -4,14 +4,15 @@
 
 namespace Fixtures\MartinGeorgiev\Doctrine\Entity;
 
+use Doctrine\DBAL\Types\Types;
 use Doctrine\ORM\Mapping as ORM;
 
 #[ORM\Entity()]
 class ContainsArrays extends Entity
 {
-    #[ORM\Column(type: 'json')]
+    #[ORM\Column(type: Types::JSON)]
     public array $array1;
 
-    #[ORM\Column(type: 'json')]
+    #[ORM\Column(type: Types::JSON)]
     public array $array2;
 }
diff --git a/fixtures/MartinGeorgiev/Doctrine/Entity/ContainsDates.php b/fixtures/MartinGeorgiev/Doctrine/Entity/ContainsDates.php
@@ -4,26 +4,27 @@
 
 namespace Fixtures\MartinGeorgiev\Doctrine\Entity;
 
+use Doctrine\DBAL\Types\Types;
 use Doctrine\ORM\Mapping as ORM;
 
 #[ORM\Entity()]
 class ContainsDates extends Entity
 {
-    #[ORM\Column(type: 'date_immutable')]
+    #[ORM\Column(type: Types::DATE_IMMUTABLE)]
     public \DateTimeImmutable $date1;
 
-    #[ORM\Column(type: 'date_immutable')]
+    #[ORM\Column(type: Types::DATE_IMMUTABLE)]
     public \DateTimeImmutable $date2;
 
-    #[ORM\Column(type: 'datetime_immutable')]
+    #[ORM\Column(type: Types::DATETIME_IMMUTABLE)]
     public \DateTimeImmutable $datetime1;
 
-    #[ORM\Column(type: 'datetime_immutable')]
+    #[ORM\Column(type: Types::DATETIME_IMMUTABLE)]
     public \DateTimeImmutable $datetime2;
 
-    #[ORM\Column(type: 'datetimetz_immutable')]
+    #[ORM\Column(type: Types::DATETIMETZ_IMMUTABLE)]
     public \DateTimeImmutable $datetimetz1;
 
-    #[ORM\Column(type: 'datetimetz_immutable')]
+    #[ORM\Column(type: Types::DATETIMETZ_IMMUTABLE)]
     public \DateTimeImmutable $datetimetz2;
 }
diff --git a/fixtures/MartinGeorgiev/Doctrine/Entity/ContainsDecimals.php b/fixtures/MartinGeorgiev/Doctrine/Entity/ContainsDecimals.php
@@ -4,17 +4,18 @@
 
 namespace Fixtures\MartinGeorgiev\Doctrine\Entity;
 
+use Doctrine\DBAL\Types\Types;
 use Doctrine\ORM\Mapping as ORM;
 
 #[ORM\Entity()]
 class ContainsDecimals extends Entity
 {
-    #[ORM\Column(type: 'decimal')]
+    #[ORM\Column(type: Types::DECIMAL)]
     public float $decimal1;
 
-    #[ORM\Column(type: 'decimal')]
+    #[ORM\Column(type: Types::DECIMAL)]
     public float $decimal2;
 
-    #[ORM\Column(type: 'decimal')]
+    #[ORM\Column(type: Types::DECIMAL)]
     public float $decimal3;
 }
diff --git a/fixtures/MartinGeorgiev/Doctrine/Entity/ContainsIntegers.php b/fixtures/MartinGeorgiev/Doctrine/Entity/ContainsIntegers.php
@@ -4,17 +4,18 @@
 
 namespace Fixtures\MartinGeorgiev\Doctrine\Entity;
 
+use Doctrine\DBAL\Types\Types;
 use Doctrine\ORM\Mapping as ORM;
 
 #[ORM\Entity()]
 class ContainsIntegers extends Entity
 {
-    #[ORM\Column(type: 'integer')]
+    #[ORM\Column(type: Types::INTEGER)]
     public int $integer1;
 
-    #[ORM\Column(type: 'integer')]
+    #[ORM\Column(type: Types::INTEGER)]
     public int $integer2;
 
-    #[ORM\Column(type: 'integer')]
+    #[ORM\Column(type: Types::INTEGER)]
     public int $integer3;
 }
diff --git a/fixtures/MartinGeorgiev/Doctrine/Entity/ContainsJsons.php b/fixtures/MartinGeorgiev/Doctrine/Entity/ContainsJsons.php
@@ -4,14 +4,15 @@
 
 namespace Fixtures\MartinGeorgiev\Doctrine\Entity;
 
+use Doctrine\DBAL\Types\Types;
 use Doctrine\ORM\Mapping as ORM;
 
 #[ORM\Entity()]
 class ContainsJsons extends Entity
 {
-    #[ORM\Column(type: 'json')]
+    #[ORM\Column(type: Types::JSON)]
     public array $object1;
 
-    #[ORM\Column(type: 'json')]
+    #[ORM\Column(type: Types::JSON)]
     public array $object2;
 }
diff --git a/fixtures/MartinGeorgiev/Doctrine/Entity/ContainsTexts.php b/fixtures/MartinGeorgiev/Doctrine/Entity/ContainsTexts.php
@@ -4,14 +4,15 @@
 
 namespace Fixtures\MartinGeorgiev\Doctrine\Entity;
 
+use Doctrine\DBAL\Types\Types;
 use Doctrine\ORM\Mapping as ORM;
 
 #[ORM\Entity()]
 class ContainsTexts extends Entity
 {
-    #[ORM\Column(type: 'text')]
+    #[ORM\Column(type: Types::TEXT)]
     public string $text1;
 
-    #[ORM\Column(type: 'text')]
+    #[ORM\Column(type: Types::TEXT)]
     public string $text2;
 }
diff --git a/fixtures/MartinGeorgiev/Doctrine/Entity/Entity.php b/fixtures/MartinGeorgiev/Doctrine/Entity/Entity.php
@@ -4,19 +4,13 @@
 
 namespace Fixtures\MartinGeorgiev\Doctrine\Entity;
 
+use Doctrine\DBAL\Types\Types;
 use Doctrine\ORM\Mapping as ORM;
 
 abstract class Entity
 {
-    /**
-     * @ORM\Id
-     *
-     * @ORM\Column(type="string")
-     *
-     * @ORM\GeneratedValue
-     */
     #[ORM\Id()]
-    #[ORM\Column(type: 'string')]
+    #[ORM\Column(type: Types::STRING)]
     #[ORM\GeneratedValue()]
     public string $id;
 }
diff --git a/src/MartinGeorgiev/Doctrine/DBAL/Types/BaseIntegerArray.php b/src/MartinGeorgiev/Doctrine/DBAL/Types/BaseIntegerArray.php
@@ -26,9 +26,11 @@ public function isValidArrayItemForDatabase($item): bool
         if (!\is_int($item) && !\is_string($item)) {
             return false;
         }
+
         if (!(bool) \preg_match('/^-?\d+$/', (string) $item)) {
             return false;
         }
+
         if ((string) $item < $this->getMinValue()) {
             return false;
         }

diff --git a/src/MartinGeorgiev/Doctrine/DBAL/Types/JsonTransformer.php b/src/MartinGeorgiev/Doctrine/DBAL/Types/JsonTransformer.php
@@ -25,7 +25,7 @@ protected function transformToPostgresJson(mixed $phpValue): string
         try {
             $postgresValue = \json_encode($phpValue, JSON_THROW_ON_ERROR);
         } catch (\JsonException) {
-            throw new ConversionException(\sprintf('Value %s can\'t be resolved to valid JSON', \var_export($phpValue, true)));
+            throw new ConversionException(\sprintf("Value %s can't be resolved to valid JSON", \var_export($phpValue, true)));
         }
 
         return $postgresValue;

diff --git a/src/MartinGeorgiev/Doctrine/DBAL/Types/JsonbArray.php b/src/MartinGeorgiev/Doctrine/DBAL/Types/JsonbArray.php
@@ -33,6 +33,7 @@ protected function transformPostgresArrayToPHPArray(string $postgresArray): arra
         if ($postgresArray === '{}') {
             return [];
         }
+
         $trimmedPostgresArray = \mb_substr($postgresArray, 2, -2);
         $phpArray = \explode('},{', $trimmedPostgresArray);
         foreach ($phpArray as &$item) {

diff --git a/src/MartinGeorgiev/Doctrine/DBAL/Types/TextArray.php b/src/MartinGeorgiev/Doctrine/DBAL/Types/TextArray.php
@@ -41,6 +41,7 @@ protected function transformToPostgresTextArray(array $phpTextArray): string
         if (!\is_array($phpTextArray)) {
             throw new \InvalidArgumentException(\sprintf('Value %s is not an array', \var_export($phpTextArray, true)));
         }
+
         if ($phpTextArray === []) {
             return '{}';
         }

diff --git a/src/MartinGeorgiev/Doctrine/ORM/Query/AST/Functions/BaseOrderableFunction.php b/src/MartinGeorgiev/Doctrine/ORM/Query/AST/Functions/BaseOrderableFunction.php
@@ -15,6 +15,7 @@
 abstract class BaseOrderableFunction extends BaseFunction
 {
     protected Node $expression;
+
     protected ?OrderByClause $orderByClause = null;
 
     public function parse(Parser $parser): void
@@ -23,17 +24,17 @@

        $this->customizeFunction();

        $parser->match($shouldUseLexer ? Lexer::T_IDENTIFIER : TokenType::T_IDENTIFIER);
        $parser->match($shouldUseLexer ? Lexer::T_OPEN_PARENTHESIS : TokenType::T_OPEN_PARENTHESIS);

        $this->parseFunction($parser);

        $lexer = $parser->getLexer();
        if ($lexer->isNextToken($shouldUseLexer ? Lexer::T_ORDER : TokenType::T_ORDER)) {
            $this->orderByClause = $parser->OrderByClause();
        }

        $parser->match($shouldUseLexer ? Lexer::T_CLOSE_PARENTHESIS : TokenType::T_CLOSE_PARENTHESIS);
    }

    abstract protected function parseFunction(Parser $parser): void;

diff --git a/src/MartinGeorgiev/Doctrine/ORM/Query/AST/Functions/BaseVariadicFunction.php b/src/MartinGeorgiev/Doctrine/ORM/Query/AST/Functions/BaseVariadicFunction.php
@@ -23,7 +23,7 @@
     /**
      * @throws ParserException
      */
-    public function feedParserWithNodes(Parser $parser): void
+    protected function feedParserWithNodes(Parser $parser): void
     {
         $lexer = $parser->getLexer();
 
@@ -35,11 +35,12 @@
        $aheadType = $lexer->lookahead->type;
        $shouldUseLexer = DoctrineOrm::isPre219();

        while (($shouldUseLexer ? Lexer::T_CLOSE_PARENTHESIS : TokenType::T_CLOSE_PARENTHESIS) !== $aheadType) {
            if (($shouldUseLexer ? Lexer::T_COMMA : TokenType::T_COMMA) === $aheadType) {
                 $parser->match($shouldUseLexer ? Lexer::T_COMMA : TokenType::T_COMMA);
                 $this->nodes[] = $parser->{$this->commonNodeMapping}();
             }
+
             $aheadType = $lexer->lookahead->type;
         }
 

diff --git a/src/MartinGeorgiev/Doctrine/ORM/Query/AST/Functions/Cast.php b/src/MartinGeorgiev/Doctrine/ORM/Query/AST/Functions/Cast.php
@@ -34,6 +34,7 @@ public function parse(Parser $parser): void
 
         $parser->match($shouldUseLexer ? Lexer::T_IDENTIFIER : TokenType::T_IDENTIFIER);
         $parser->match($shouldUseLexer ? Lexer::T_OPEN_PARENTHESIS : TokenType::T_OPEN_PARENTHESIS);
+
         $this->sourceType = $parser->SimpleArithmeticExpression();
         $parser->match($shouldUseLexer ? Lexer::T_AS : TokenType::T_AS);
         $parser->match($shouldUseLexer ? Lexer::T_IDENTIFIER : TokenType::T_IDENTIFIER);
@@ -43,6 +44,7 @@ public function parse(Parser $parser): void
         if (!$token instanceof Token) {
             return;
         }
+
         if (!\is_string($token->value)) {
             return;
         }
@@ -59,6 +61,7 @@ public function parse(Parser $parser): void
                     $parameters[] = $parameter->value;
                 }
             }
+
             $parser->match($shouldUseLexer ? Lexer::T_CLOSE_PARENTHESIS : TokenType::T_CLOSE_PARENTHESIS);
             $type .= '('.\implode(', ', $parameters).')';
         }

diff --git a/src/MartinGeorgiev/Doctrine/ORM/Query/AST/Functions/StringAgg.php b/src/MartinGeorgiev/Doctrine/ORM/Query/AST/Functions/StringAgg.php
@@ -22,6 +22,7 @@
 class StringAgg extends BaseOrderableFunction
 {
     private bool $isDistinct = false;
+
     private Node $delimiter;
 
     protected function customizeFunction(): void

diff --git a/tests/MartinGeorgiev/Doctrine/DBAL/Types/BaseArrayTest.php b/tests/MartinGeorgiev/Doctrine/DBAL/Types/BaseArrayTest.php
@@ -100,7 +100,7 @@ public function throws_conversion_exception_when_invalid_array_item_value(): voi
         $this->expectExceptionMessage("One or more of the items given doesn't look valid.");
 
         $this->fixture
-            ->expects($this->once())
+            ->expects(self::once())
             ->method('isValidArrayItemForDatabase')
             ->willReturn(false);
 

diff --git a/tests/MartinGeorgiev/Doctrine/ORM/Query/AST/Functions/BaseComparisonFunctionTestCase.php b/tests/MartinGeorgiev/Doctrine/ORM/Query/AST/Functions/BaseComparisonFunctionTestCase.php
@@ -33,6 +33,10 @@ public function throws_an_exception_when_lexer_is_not_populated_with_a_lookahead
         $parser = new Parser($query);
         $parser->getLexer()->moveNext();
 
-        $this->createFixture()->feedParserWithNodes($parser);
+        $baseComparisonFunction = $this->createFixture();
+
+        $reflectionMethod = new \ReflectionMethod($baseComparisonFunction::class, 'feedParserWithNodes');
+        $reflectionMethod->setAccessible(true);
+        $reflectionMethod->invoke($baseComparisonFunction, $parser);
     }
 }