Merge branch 'main' into testscript

Author: TomasVotruba

.github/workflows/code_analysis.yaml

@@ -36,10 +36,6 @@ jobs:
                         name: 'Tests'
                         run: vendor/bin/phpunit
 
-                    -
-                        name: 'Check Active Classes'
-                        run: vendor/bin/class-leak check src --ansi --skip-suffix "TypeExtension"
-
         name: ${{ matrix.actions.name }}
         runs-on: ubuntu-latest
 

.gitignore

@@ -1,5 +1,6 @@
 /vendor
 composer.lock
+.idea
 
 # phpunit 10+
 /.phpunit.cache

README.md

@@ -2,31 +2,32 @@
 
 [![Downloads total](https://img.shields.io/packagist/dt/symplify/phpstan-extensions.svg?style=flat-square)](https://packagist.org/packages/symplify/phpstan-extensions/stats)
 
+<br>
+
 ## Install
 
 ```bash
 composer require symplify/phpstan-extensions --dev
 ```
 
-Update config:
-
-```yaml
-# phpstan.neon
-includes:
-    - 'vendor/symplify/phpstan-extensions/config/config.neon'
-```
+<b>
 
-## Use
+## Symplify Error Formatter
 
-### Symplify Error Formatter
+Update your `phpstan.neon` config:
 
-*Works best with [anthraxx/intellij-awesome-console](https://github.com/anthraxx/intellij-awesome-console)*
+```yaml
+parameters:
+    errorFormat: symplify
+```
 
 - Do you want to **click the error and get right to the line in the file** it's reported at?
 - Do you want to **copy-paste regex escaped error to your `ignoreErrors`**?
 
+Works best with [anthraxx/intellij-awesome-console](https://github.com/anthraxx/intellij-awesome-console)
+
 ```bash
-vendor/bin/phpstan analyse src --level max --error-format symplify
+vendor/bin/phpstan analyse src
 ```
 
 ↓
@@ -41,9 +42,9 @@ src/Command/ReleaseCommand.php:51
 
 <br>
 
-### Return Type Extensions
+## Improved Symfony Types
 
-#### `Symplify\PHPStanExtensions\ReturnTypeExtension\ContainerGetTypeExtension`
+#### `ContainerGetTypeExtension`
 
 With Symfony container and type as an argument, you always know **the same type is returned**:
 
@@ -60,7 +61,9 @@ $container->get(Type::class);
 $this->get(Type::class);
 ```
 
-#### `Symplify\PHPStanExtensions\ReturnTypeExtension\KernelGetContainerAfterBootReturnTypeExtension`
+<br>
+
+#### `KernelGetContainerAfterBootReturnTypeExtension`
 
 After Symfony Kernel boot, `getContainer()` always returns the container:
 
@@ -82,7 +85,9 @@ $kernel->getContainer();
 // Reality: ContainerInterface ✅
 ```
 
-#### `Symplify\PHPStanExtensions\ReturnTypeExtension\SplFileInfoTolerantReturnTypeExtension`
+<br>
+
+#### `SplFileInfoTolerantReturnTypeExtension`
 
 Symfony Finder finds only existing files (obviously), so the `getRealPath()` always return `string`:
 
@@ -101,10 +106,4 @@ foreach ($finder as $fileInfo) {
 
 <br>
 
-## Report Issues
-
-In case you are experiencing a bug or want to request a new feature head over to the [Symplify monorepo issue tracker](https://github.com/symplify/symplify/issues)
-
-## Contribute
-
-The sources of this package are contained in the Symplify monorepo. We welcome contributions for this package on [symplify/symplify](https://github.com/symplify/symplify).
+Happy coding!

composer.json

@@ -8,15 +8,14 @@
         "phpstan/phpstan": "^2.0"
     },
     "require-dev": {
-        "illuminate/container": "^10.39",
-        "phpstan/extension-installer": "^1.3",
-        "phpunit/phpunit": "^10.3",
+        "illuminate/container": "^11.0",
+        "phpstan/extension-installer": "^1.4",
+        "phpunit/phpunit": "^11.4",
         "rector/rector": "^2.0",
         "symfony/dependency-injection": "^6.4",
         "symfony/finder": "^6.2",
         "symplify/easy-coding-standard": "^12.0",
-        "symplify/phpstan-rules": "^14.0",
-        "tomasvotruba/class-leak": "^1.1.2",
+        "symplify/phpstan-rules": "^14.1",
         "tracy/tracy": "^2.9"
     },
     "autoload": {
@@ -41,13 +40,11 @@
     },
     "scripts": {
         "check-cs": "vendor/bin/ecs check --ansi",
-        "fix-cs": "vendor/bin/ecs check --fix --ansi",
+        "fix-cs": "vendor/bin/ecs check --fix",
+        "phpstan": "vendor/bin/phpstan analyse",
         "test": "vendor/bin/phpunit",
-        "phpstan": "vendor/bin/phpstan analyse --ansi  --error-format symplify",
         "rector": "vendor/bin/rector process --dry-run --ansi"
     },
-    "minimum-stability": "dev",
-    "prefer-stable": true,
     "config": {
         "sort-packages": true,
         "platform-check": false,

phpstan.neon

@@ -3,6 +3,7 @@ includes:
 
 parameters:
     level: 8
+    errorFormat: symplify
 
     paths:
         - src

src/Console/Terminal.php

@@ -127,7 +127,7 @@ private static function readFromProcess(string $command): ?string
 
     private static function getAnsiconWidth(): ?int
     {
-        if (!is_string(\getenv('ANSICON'))) {
+        if (! is_string(\getenv('ANSICON'))) {
             return null;
         }
 

src/ErrorFormatter/SymplifyErrorFormatter.php

@@ -136,6 +136,10 @@ private function printSingleError(Error $error, OutputStyle $outputStyle): void
         $itemMessage = sprintf(" - '%s'", $regexMessage);
         $this->writeln($itemMessage);
 
+        if ($error->getIdentifier() !== null && $error->canBeIgnored()) {
+            $this->writeln(' 🪪 ' . $error->getIdentifier());
+        }
+
         $this->separator();
         $outputStyle->newLine();
     }

src/TypeResolver/ClassConstFetchReturnTypeResolver.php

@@ -10,7 +10,6 @@
 use PhpParser\Node\Identifier;
 use PhpParser\Node\Name;
 use PHPStan\Reflection\MethodReflection;
-use PHPStan\Reflection\ParametersAcceptorSelector;
 use PHPStan\Type\MixedType;
 use PHPStan\Type\ObjectType;
 use PHPStan\Type\Type;