Merge branch '7.1' into 7.x

* 7.1: [AllBundles] Upgrade phpstan to 2.0
Kunstmaan · Nov 11, 2024 · f02613b · f02613b
2 parents a512d77 + 8b41885
commit f02613b
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 8 deletions.
diff --git a/composer.json b/composer.json
@@ -88,8 +88,8 @@
         "matthiasnoback/symfony-dependency-injection-test": "^4.2.1",
         "symfony/phpunit-bridge": "^7.0",
         "phpunit/phpunit": "^9.5.5",
-        "phpstan/phpstan": "^1.1",
-        "phpstan/phpstan-doctrine": "^1.0",
+        "phpstan/phpstan": "^2.0",
+        "phpstan/phpstan-doctrine": "^2.0",
         "php-cs-fixer/shim": "^3.11"
     },
     "replace": {

diff --git a/phpstan.neon b/phpstan.neon
@@ -17,12 +17,6 @@ parameters:
         - src/Kunstmaan/CacheBundle # Temporary excluded for full rework
         - src/Kunstmaan/FixturesBundle # Temporary excluded for full rework
         # Excluded deprecated classes/files
-        - src/Kunstmaan/AdminBundle/Composer/ScriptHandler.php
-        - src/Kunstmaan/AdminBundle/EventListener/ConsoleExceptionListener.php
-        - src/Kunstmaan/GeneratorBundle/Helper/Sf4AppBundle.php # BC layer
-        - src/Kunstmaan/TranslatorBundle/Command/MigrationsDiffCommand.php
-        - src/Kunstmaan/TranslatorBundle/Service/Command/DiffCommand.php
-        - src/Kunstmaan/*/Event/*.php # Ignore the event classes until we get rid of the BC layer. The BC layer causes a weird phpstan error.
         - src/Kunstmaan/GeneratorBundle/Helper/Sf4AppBundle.php # BC layer
 
     ignoreErrors: