feat: update phpstan support rules with PHP 8.4 and solve errors

.github/workflows/build-and-publish-ci-image.yml

@@ -1,5 +1,9 @@
 name: Build Docker CI image
 
+concurrency:
+  group: ${{ github.workflow }}-${{ github.ref }}
+  cancel-in-progress: true
+
 on:
   push:
     branches:

.github/workflows/build-and-publish-franken-image.yml

@@ -1,5 +1,9 @@
 name: Build Docker FrankenPHP image
 
+concurrency:
+  group: ${{ github.workflow }}-${{ github.ref }}
+  cancel-in-progress: true
+
 on:
   push:
     tags:

.github/workflows/coding-standards.yml

@@ -1,5 +1,9 @@
 name: "Coding standards"
 
+concurrency:
+  group: ${{ github.workflow }}-${{ github.ref }}
+  cancel-in-progress: true
+
 on:
   pull_request:
     paths:
@@ -28,6 +32,9 @@ jobs:
       matrix:
         php-version:
           - "8.2"
+          - "8.3"
+          - "8.4"
+          - "8.5"
 
     steps:
       - name: "Checkout code"
@@ -41,7 +48,7 @@ jobs:
           tools: cs2pr
 
       - name: "Install dependencies with Composer"
-        uses: "ramsey/composer-install@v2"
+        uses: "ramsey/composer-install@v3"
 
       - name: "Run a Code style analysis with friendsofphp/php-cs-fixer"
         run: "vendor/bin/php-cs-fixer fix --format=checkstyle --allow-risky=yes --dry-run | cs2pr"

.github/workflows/continuous-integration.yml

@@ -1,5 +1,9 @@
 name: "Continuous Integration"
 
+concurrency:
+  group: ${{ github.workflow }}-${{ github.ref }}
+  cancel-in-progress: true
+
 on:
   pull_request:
     paths:
@@ -29,10 +33,10 @@ jobs:
     strategy:
       matrix:
         php-version:
-          - "8.1"
           - "8.2"
           - "8.3"
           - "8.4"
+          - "8.5"
         postgres-version:
           - "16"
         extension:
@@ -64,6 +68,7 @@ jobs:
         with:
           php-version: "${{ matrix.php-version }}"
           extensions: "pgsql pdo_pgsql"
+          cache: composer
           ini-values: "zend.assertions=1"
 
       - name: "Install dependencies with Composer"
@@ -95,7 +100,10 @@ jobs:
     strategy:
       matrix:
         php-version:
-          - "8.1"
+          - "8.2"
+          - "8.3"
+          - "8.4"
+          - "8.5"
         postgres-version:
           - "10"
           - "15"
@@ -158,15 +166,27 @@ jobs:
     strategy:
       matrix:
         php-version:
-          - "8.1"
+          - "8.2"
+          - "8.3"
+          - "8.4"
+          - "8.5"
         mariadb-version:
           - "10.11.6" # LTS (Feb 2028)
           - "11.4.5" # LTS (May 2029)
           - "11.7.2" # STS
         extension:
           - "mysqli"
         include:
-          - php-version: "8.1"
+          - php-version: "8.2"
+            mariadb-version: "11.4.5"
+            extension: "pdo_mysql"
+          - php-version: "8.3"
+            mariadb-version: "11.4.5"
+            extension: "pdo_mysql"
+          - php-version: "8.4"
+            mariadb-version: "11.4.5"
+            extension: "pdo_mysql"
+          - php-version: "8.5"
             mariadb-version: "11.4.5"
             extension: "pdo_mysql"
 
@@ -224,7 +244,10 @@ jobs:
     strategy:
       matrix:
         php-version:
-          - "8.1"
+          - "8.2"
+          - "8.3"
+          - "8.4"
+          - "8.5"
         mysql-version:
           - "5.7"
           - "8.0"
@@ -289,7 +312,7 @@ jobs:
   #   strategy:
   #     matrix:
   #       php-version:
-  #         - "8.1"
+  #         - "8.2"
   #       mssql-version:
   #         - "2019"
   #         - "2022"
@@ -354,7 +377,7 @@ jobs:
         os:
           - "ubuntu-22.04"
         php-version:
-          - "8.1"
+          - "8.2"
         extension:
           - "pdo_sqlite"
           - "sqlite3"
@@ -375,6 +398,7 @@ jobs:
       - name: "Install dependencies with Composer"
         uses: "ramsey/composer-install@v3"
         with:
+          dependency-versions: 'locked'
           composer-options: "--ignore-platform-req=php+"
 
       - name: "Run PHPUnit"

.github/workflows/docs-build.yml

@@ -1,5 +1,9 @@
 name: Documentation build
 
+concurrency:
+  group: ${{ github.workflow }}-${{ github.ref }}
+  cancel-in-progress: true
+
 on:
   pull_request:
     paths:
@@ -19,9 +23,9 @@ jobs:
     runs-on: ubuntu-latest
 
     steps:
-    - uses: actions/checkout@v3
+    - uses: actions/checkout@v4
     - name: Use Node.js 18.12
-      uses: actions/setup-node@v3
+      uses: actions/setup-node@v4
       with:
         node-version: 18.12
         cache: 'npm'

.github/workflows/static-analysis.yml

@@ -1,5 +1,9 @@
 name: "Static Analysis"
 
+concurrency:
+  group: ${{ github.workflow }}-${{ github.ref }}
+  cancel-in-progress: true
+
 on:
   pull_request:
     paths:
@@ -20,13 +24,16 @@ on:
 
 jobs:
   phpstan:
-    name: "Static Analysis"
+    name: "Static Analysis (PHP ${{ matrix.php-version }})"
     runs-on: "ubuntu-22.04"
 
     strategy:
       matrix:
         php-version:
           - "8.2"
+          - "8.3"
+          - "8.4"
+          - "8.5"
 
     steps:
       - name: Checkout code
@@ -40,7 +47,7 @@ jobs:
           tools: cs2pr
 
       - name: Install dependencies with Composer
-        uses: ramsey/composer-install@v2
+        uses: ramsey/composer-install@v3
 
       - name: Run static analysis with phpstan/phpstan
         run: vendor/bin/phpstan --error-format=checkstyle | cs2pr

composer.json

@@ -27,9 +27,11 @@
         "doctrine/doctrine-bundle": "^2.10.0",
         "doctrine/orm": "^2.15|^3.0",
         "friendsofphp/php-cs-fixer": "^3.34",
+        "larastan/larastan": "^3.0",
         "laravel/framework": "^10.0|^11.0",
-        "phpstan/phpstan": "^1.10",
+        "phpstan/phpstan": "^2.1.33",
         "phpunit/phpunit": "^10.4",
+        "seld/phar-utils": "^1.2",
         "symfony/dependency-injection": "^6.0|^7.0",
         "symfony/framework-bundle": "^6.0|^7.0",
         "symfony/password-hasher": "^6.0|^7.0",

phpstan.neon.dist

@@ -3,9 +3,6 @@ parameters:
     paths:
         - src
         - tests
-    excludePaths:
-        - src/DependencyInjection/DbToolsConfiguration.php
     checkMissingOverrideMethodAttribute: true
+    treatPhpDocTypesAsCertain: false
     ignoreErrors:
-        - '#Instantiated class Seld\\PharUtils\\Timestamps not found.#'
-        - '#on an unknown class Seld\\PharUtils\\Timestamps.#'

src/Anonymization/Anonymizer/Core/DateAnonymizer.php

@@ -38,7 +38,6 @@ protected function validateOptions(): void
             throw new \InvalidArgumentException("You must specify both 'min' and 'max' boundaries.");
         }
 
-        // @phpstan-ignore-next-line False positive detected.
         if ($min && $max) {
             if ($max <= $min) {
                 throw new \InvalidArgumentException("'min' value must be less than 'max' value.");

src/Anonymization/Config/Loader/AttributesLoader.php

@@ -32,7 +32,7 @@ public function load(AnonymizationConfig $config): void
         $metadatas = $metadataFactory->getAllMetadata();
 
         foreach ($metadatas as $metadata) {
-            \assert($metadata instanceof ClassMetadata);
+            /** @var ClassMetadata $metadata */
             if ($metadata->isMappedSuperclass || $metadata->isEmbeddedClass) {
                 continue;
             }
@@ -87,7 +87,6 @@ public function load(AnonymizationConfig $config): void
                 $columnName = $metadata->getColumnName($fieldName);
                 if ($metadata->isInheritedField($fieldName)) {
                     $fieldMapping = $metadata->getFieldMapping($fieldName);
-                    // @phpstan-ignore-next-line
                     if (\is_array($fieldMapping)) {
                         // Code for doctrine/orm:^2.0.
                         $ownerClass = $fieldMapping['inherited'];
@@ -96,7 +95,7 @@ public function load(AnonymizationConfig $config): void
                         $ownerClass = $fieldMapping->inherited;
                     }
                     $parentMetadata = $metadataFactory->getMetadataFor($ownerClass);
-                    \assert($parentMetadata instanceof ClassMetadata);
+                    /** @var ClassMetadata $parentMetadata */
                     $tableName = $parentMetadata->getTableName();
                 } else {
                     $tableName = $metadata->getTableName();

src/Backupper/BackupperFactory.php

@@ -47,8 +47,6 @@ public function create(?string $connectionName = null): AbstractBackupper
             $this->configRegistry->getConnectionConfig($connectionName),
         );
 
-        \assert($backupper instanceof AbstractBackupper);
-
         if (isset($this->excludedTables[$connectionName])) {
             $backupper->setExcludedTables($this->excludedTables[$connectionName]);
         }

src/Bridge/Standalone/PharCompiler.php

@@ -157,6 +157,7 @@ public function compile(?string $pharFile = null): void
         unset($phar);
 
         // re-sign the phar with reproducible timestamp / signature
+
         $util = new Timestamps($pharFile);
         $util->updateTimestamps($this->versionDate);
         $util->save($pharFile, \Phar::SHA512);

src/Bridge/Symfony/DependencyInjection/DbToolsConfiguration.php

@@ -87,7 +87,6 @@ public function getConfigTreeBuilder(): TreeBuilder
         // For PHPStan.
         \assert($rootNode instanceof ArrayNodeDefinition);
 
-        // @phpstan-ignore-next-line
         $rootNode
             ->children()
                 ->arrayNode('anonymization')
@@ -112,7 +111,6 @@ public function getConfigTreeBuilder(): TreeBuilder
         $this->addConnectionConfigTreeBuilder($rootNode);
 
         // Add "connections" children definition.
-        // @phpstan-ignore-next-line
         $connectionsNode = $rootNode
             ->children()
                 ->arrayNode('connections')
@@ -132,7 +130,6 @@ public function getConfigTreeBuilder(): TreeBuilder
 
         if ($this->standalone) {
             // Add extra options for standalone CLI app.
-            // @phpstan-ignore-next-line
             $rootNode
                 ->children()
                     ->scalarNode('workdir')
@@ -149,7 +146,6 @@ public function getConfigTreeBuilder(): TreeBuilder
 
         if ($this->withDeprecated) {
             // Add deprecated options.
-            // @phpstan-ignore-next-line
             $rootNode
                 ->children()
                     ->arrayNode('storage')
@@ -190,7 +186,6 @@ protected function addConnectionConfigTreeBuilder(ArrayNodeDefinition $node): vo
     {
         $intervalToInt = $this->getIntervalToInt();
 
-        // @phpstan-ignore-next-line
         $node
             ->children()
                 ->scalarNode('backup_binary')

src/Bridge/Symfony/DependencyInjection/DbToolsExtension.php

@@ -111,7 +111,7 @@ public function load(array $configs, ContainerBuilder $container): void
     }
 
     #[\Override]
-    public function getConfiguration(array $config, ContainerBuilder $container): ?ConfigurationInterface
+    public function getConfiguration(array $configs, ?ContainerBuilder $container = null): ConfigurationInterface
     {
         return new DbToolsConfiguration(true, false);
     }

src/Helper/Iban.php

@@ -121,7 +121,7 @@ private static function mod97(string $number): int
         $parts = \str_split($number, 7);
         $rest = 0;
         foreach ($parts as $part) {
-            $rest = (int)($rest . $part) % 97;
+            $rest = \intval($rest . $part) % 97;
         }
         return (int)$rest;
     }

src/Helper/LoremIpsum.php

@@ -287,7 +287,7 @@ private function punctuate(array $words): string
             $commas = $this->gauss($mean, $std_dev);
 
             for ($i = 1; $i <= $commas; $i++) {
-                $word = \round($i * $word_count / ($commas + 1));
+                $word = (int) \round($i * $word_count / ($commas + 1));
 
                 if ($word < ($word_count - 1) && $word > 0) {
                     $words[$word] .= ',';

src/Restorer/RestorerFactory.php

@@ -47,8 +47,6 @@ public function create(?string $connectionName = null): AbstractRestorer
             $this->configRegistry->getConnectionConfig($connectionName),
         );
 
-        \assert($restorer instanceof AbstractRestorer);
-
         if ($this->logger) {
             $restorer->setLogger($this->logger);
         }

src/Storage/Storage.php

@@ -54,7 +54,7 @@ public function listBackups(
             $age = $lastModified->diff(new \DateTimeImmutable(''));
 
             if (!$onlyExpired || ($lastModified < $expirationDate)) {
-                if ($file !== $preserveFile) {
+                if ($preserveFile === null || $file->getFilename() !== $preserveFile) {
                     $list[] = [$age->format('%a days'), $file];
                 }
             }

tests/Functional/Anonymizer/Core/AddressAnonymizerTest.php

@@ -74,13 +74,11 @@ public function testAnonymize(): void
         $anonymizator->anonymize();
 
         $datas = $this->getDatabaseSession()->executeQuery('select * from table_test order by id asc')->fetchAllAssociative();
-        $this->assertNotNull($datas[0]);
         $this->assertNotSame('Rue Aristide Briand', $datas[0]['my_street_address']);
         $this->assertNotSame('La maison aux volets bleus', $datas[0]['my_secondary_address']);
         $this->assertNotSame('44400', $datas[0]['my_postal_code']);
         $this->assertNotSame('REZE', $datas[0]['my_locality']);
         $this->assertNotSame('Pays de loire', $datas[0]['my_region']);
-        $this->assertNotNull($datas[1]);
         $this->assertNotSame('Rue Jean Jaures', $datas[1]['my_street_address']);
         $this->assertNotSame('Au dernier étage', $datas[1]['my_secondary_address']);
         $this->assertNotSame('44000', $datas[1]['my_postal_code']);