upgrade to phpstan ^2 (#309)

dmaicher · Dec 13, 2024 · 866bbbf · 866bbbf
1 parent 1f81a28
commit 866bbbf
Show file tree

Hide file tree

Showing 7 changed files with 15 additions and 10 deletions.
diff --git a/.php-cs-fixer.php b/.php-cs-fixer.php
@@ -18,5 +18,6 @@
         ],
         'phpdoc_var_annotation_correct_order' => true,
         'void_return' => true,
+        'trailing_comma_in_multiline' => false,
     ])
 ;
diff --git a/composer.json b/composer.json
@@ -28,9 +28,9 @@
     "require-dev": {
         "behat/behat": "^3.0",
         "friendsofphp/php-cs-fixer": "^3.27",
-        "phpstan/phpstan": "^1.2",
+        "phpstan/phpstan": "^2.0",
         "phpunit/phpunit": "^8.0 || ^9.0 || ^10.0 || ^11.0",
-        "symfony/phpunit-bridge": "^6.3",
+        "symfony/phpunit-bridge": "^7.2",
         "symfony/process": "^5.4 || ^6.3 || ^7.0",
         "symfony/yaml": "^5.4 || ^6.3 || ^7.0"
     },

diff --git a/phpstan.neon b/phpstan.neon
@@ -2,7 +2,6 @@ parameters:
     treatPhpDocTypesAsCertain: false
     excludePaths:
         - %currentWorkingDirectory%/src/DAMA/DoctrineTestBundle/DependencyInjection/Configuration.php
-        - %currentWorkingDirectory%/src/DAMA/DoctrineTestBundle/PHPUnit/PHPUnitListener.php
         - %currentWorkingDirectory%/src/DAMA/DoctrineTestBundle/PHPUnit/PHPUnitExtension.php
         - %currentWorkingDirectory%/src/DAMA/DoctrineTestBundle/Doctrine/DBAL/StaticDriver.php
         - %currentWorkingDirectory%/src/DAMA/DoctrineTestBundle/Doctrine/DBAL/StaticConnection.php

diff --git a/src/DAMA/DoctrineTestBundle/Doctrine/DBAL/StaticConnectionTrait.php b/src/DAMA/DoctrineTestBundle/Doctrine/DBAL/StaticConnectionTrait.php
@@ -7,6 +7,8 @@
 
 /**
  * @internal
+ *
+ * @phpstan-ignore trait.unused
  */
 trait StaticConnectionTrait
 {

diff --git a/src/DAMA/DoctrineTestBundle/PHPUnit/PHPUnitExtension.php b/src/DAMA/DoctrineTestBundle/PHPUnit/PHPUnitExtension.php
@@ -44,22 +44,22 @@ public static function rollBack(): void
 
         public function bootstrap(Configuration $configuration, Facade $facade, ParameterCollection $parameters): void
         {
-            $facade->registerSubscriber(new class() implements TestRunnerStartedSubscriber {
+            $facade->registerSubscriber(new class implements TestRunnerStartedSubscriber {
                 public function notify(TestRunnerStartedEvent $event): void
                 {
                     StaticDriver::setKeepStaticConnections(true);
                 }
             });
 
-            $facade->registerSubscriber(new class() implements TestStartedSubscriber {
+            $facade->registerSubscriber(new class implements TestStartedSubscriber {
                 public function notify(TestStartedEvent $event): void
                 {
                     StaticDriver::beginTransaction();
                     PHPUnitExtension::$transactionStarted = true;
                 }
             });
 
-            $facade->registerSubscriber(new class() implements SkippedSubscriber {
+            $facade->registerSubscriber(new class implements SkippedSubscriber {
                 public function notify(Skipped $event): void
                 {
                     // this is a workaround to allow skipping tests within the setUp() method
@@ -68,22 +68,22 @@ public function notify(Skipped $event): void
                 }
             });
 
-            $facade->registerSubscriber(new class() implements TestFinishedSubscriber {
+            $facade->registerSubscriber(new class implements TestFinishedSubscriber {
                 public function notify(TestFinishedEvent $event): void
                 {
                     PHPUnitExtension::rollBack();
                 }
             });
 
-            $facade->registerSubscriber(new class() implements ErroredSubscriber {
+            $facade->registerSubscriber(new class implements ErroredSubscriber {
                 public function notify(Errored $event): void
                 {
                     // needed as for errored tests the "Finished" event is not triggered
                     PHPUnitExtension::rollBack();
                 }
             });
 
-            $facade->registerSubscriber(new class() implements TestRunnerFinishedSubscriber {
+            $facade->registerSubscriber(new class implements TestRunnerFinishedSubscriber {
                 public function notify(TestRunnerFinishedEvent $event): void
                 {
                     StaticDriver::setKeepStaticConnections(false);

diff --git a/tests/DAMA/DoctrineTestBundle/Doctrine/DBAL/MockDriverTrait.php b/tests/DAMA/DoctrineTestBundle/Doctrine/DBAL/MockDriverTrait.php
@@ -8,6 +8,9 @@
 use Doctrine\DBAL\Platforms\AbstractPlatform;
 use Doctrine\DBAL\Schema\AbstractSchemaManager;
 
+/**
+ * @phpstan-ignore trait.unused
+ */
 trait MockDriverTrait
 {
     private $connection;

diff --git a/tests/Functional/PhpunitTest.php b/tests/Functional/PhpunitTest.php
@@ -144,7 +144,7 @@ public function testSkippedTest(): void
 
     public function testSkippedTestDuringSetup(): void
     {
-        $this->assertTrue(true);
+        $this->expectNotToPerformAssertions();
     }
 
     public function testMarkIncomplete(): void
-Original file line number
+Diff line change
@@ Expand Up / @@ -7,6 +7,8 @@ @@
     /**
      * @internal
+     *
+     * @phpstan-ignore trait.unused
      */
     trait StaticConnectionTrait
     {
@@ Expand Down @@