Merge remote-tracking branch 'origin/2.13.x' into 2.14.x

Author: ostrolucky

.gitattributes

@@ -4,7 +4,8 @@
 .gitignore             export-ignore
 phpunit.xml.dist       export-ignore
 phpcs.xml.dist         export-ignore
-psalm.xml.dist         export-ignore
+phpstan-baseline.neon  export-ignore
+phpstan.neon.dist      export-ignore
 /docs                  export-ignore
 /tests                 export-ignore
 .symfony.bundle.yaml   export-ignore

.github/workflows/static-analysis.yml

@@ -10,25 +10,6 @@ on:
       - "*.x"
 
 jobs:
-  static-analysis-psalm:
-    name: "Static Analysis with Psalm"
-    runs-on: "ubuntu-latest"
-
-    steps:
-      - name: "Checkout code"
-        uses: "actions/checkout@v4"
-
-      - name: "Install PHP"
-        uses: "shivammathur/setup-php@v2"
-        with:
-          coverage: "none"
-          php-version: "8.2"
-
-      - name: "Enforce using stable dependencies"
-        run: "composer config minimum-stability stable"
-
-      - name: "Install dependencies with Composer"
-        uses: "ramsey/composer-install@v3"
-
-      - name: "Run a static analysis with vimeo/psalm"
-        run: "vendor/bin/psalm --show-info=false --stats --output-format=github --find-unused-psalm-suppress"
+  static-analysis:
+    name: "Static Analysis"
+    uses: "doctrine/.github/.github/workflows/[email protected]"

composer.json

@@ -50,9 +50,10 @@
         "doctrine/deprecations": "^1.0",
         "doctrine/orm": "^2.17 || ^3.0",
         "friendsofphp/proxy-manager-lts": "^1.0",
+        "phpstan/phpstan": "2.1.1",
+        "phpstan/phpstan-phpunit": "2.0.3",
+        "phpstan/phpstan-strict-rules": "^2",
         "phpunit/phpunit": "^9.5.26",
-        "psalm/plugin-phpunit": "^0.18.4",
-        "psalm/plugin-symfony": "^5",
         "psr/log": "^1.1.4 || ^2.0 || ^3.0",
         "symfony/phpunit-bridge": "^6.1 || ^7.0",
         "symfony/property-info": "^5.4 || ^6.0 || ^7.0",
@@ -65,8 +66,7 @@
         "symfony/var-exporter": "^5.4 || ^6.2 || ^7.0",
         "symfony/web-profiler-bundle": "^5.4 || ^6.0 || ^7.0",
         "symfony/yaml": "^5.4 || ^6.0 || ^7.0",
-        "twig/twig": "^1.34 || ^2.12 || ^3.0",
-        "vimeo/psalm": "^5.15"
+        "twig/twig": "^1.34 || ^2.12 || ^3.0"
     },
     "conflict": {
         "doctrine/annotations": ">=3.0",

phpstan.neon.dist

@@ -0,0 +1,9 @@
+parameters:
+   level: 1
+   paths:
+      - src
+      - tests
+
+   excludePaths:
+      - src/Command/Proxy/ConvertMappingDoctrineCommand.php
+      - src/Command/Proxy/EnsureProductionSettingsDoctrineCommand.php

psalm.xml.dist

@@ -63,6 +63,7 @@ protected function execute(InputInterface $input, OutputInterface $output): int
 
         // Need to get rid of _every_ occurrence of dbname from connection configuration as we have already extracted all relevant info from url
         /** @psalm-suppress InvalidArrayOffset Need to be compatible with DBAL < 4, which still has `$params['url']` */
+        /** @phpstan-ignore unset.offset */
         unset($params['dbname'], $params['path'], $params['url']);
 
         if ($connection->getDatabasePlatform() instanceof PostgreSQLPlatform) {

src/Command/CreateDatabaseDoctrineCommand.php

@@ -34,6 +34,7 @@ public function __construct(ManagerRegistry $doctrine)
      */
     protected function getEntityGenerator()
     {
+        /** @phpstan-ignore class.notFound */
         $entityGenerator = new EntityGenerator();
         $entityGenerator->setGenerateAnnotations(false);
         $entityGenerator->setGenerateStubMethods(true);

src/Command/DoctrineCommand.php

@@ -74,6 +74,7 @@ protected function execute(InputInterface $input, OutputInterface $output): int
         }
 
         /** @psalm-suppress InvalidArrayOffset Need to be compatible with DBAL < 4, which still has `$params['url']` */
+        /* @phpstan-ignore unset.offset */
         unset($params['dbname'], $params['url']);
 
         if ($connection->getDatabasePlatform() instanceof PostgreSQLPlatform) {

src/Command/DropDatabaseDoctrineCommand.php

@@ -109,6 +109,7 @@ protected function execute(InputInterface $input, OutputInterface $output): int
             }
         }
 
+        /* @phpstan-ignore class.notFound */
         $cme      = new ClassMetadataExporter();
         $exporter = $cme->getExporter($type);
         $exporter->setOverwriteExistingFiles($input->getOption('force'));
@@ -126,6 +127,7 @@ protected function execute(InputInterface $input, OutputInterface $output): int
         $emName = $input->getOption('em');
         $emName = $emName ? $emName : 'default';
 
+        /* @phpstan-ignore class.notFound */
         $cmf = new DisconnectedClassMetadataFactory();
         $cmf->setEntityManager($em);
         $metadata = $cmf->getAllMetadata();

src/Command/ImportMappingDoctrineCommand.php

@@ -29,12 +29,14 @@ public static function setApplicationEntityManager(Application $application, $em
         assert($em instanceof EntityManagerInterface);
         $helperSet = $application->getHelperSet();
         /** @psalm-suppress InvalidArgument ORM < 3 specific */
+        /* @phpstan-ignore class.notFound */
         $helperSet->set(new EntityManagerHelper($em), 'em');
 
         trigger_deprecation(
             'doctrine/doctrine-bundle',
             '2.7',
             'Providing an EntityManager using "%s" is deprecated. Use an instance of "%s" instead.',
+            /* @phpstan-ignore class.notFound */
             EntityManagerHelper::class,
             EntityManagerProvider::class,
         );