Add --no-ignore (#27)

README.md

@@ -58,6 +58,15 @@ To get errors count per level:
 
 <br>
 
+## Do you want to run levels including all ignored messages?
+
+```bash
+vendor/bin/phpstan-bodyscan --no-ignore
+```
+
+<br>
+
+
 ## Do you want to run levels without extensions?
 
 ```bash

composer.json

@@ -18,9 +18,9 @@
         "phpstan/extension-installer": "^1.3",
         "phpstan/phpstan": "^1.11",
         "phpunit/phpunit": "^11.1",
-        "rector/rector": "^1.0",
+        "rector/rector": "^1.1",
         "symplify/easy-coding-standard": "^12.1",
-        "symplify/phpstan-rules": "^12.4",
+        "symplify/phpstan-rules": "^12.7",
         "tomasvotruba/class-leak": "^0.2.13",
         "tomasvotruba/type-coverage": "^0.3",
         "tomasvotruba/unused-public": "^0.3",

phpstan-bodyscan.neon

@@ -0,0 +1,29 @@
+includes:
+    - vendor/symplify/phpstan-rules/config/code-complexity-rules.neon
+    - vendor/symplify/phpstan-rules/config/collector-rules.neon
+    - vendor/symplify/phpstan-rules/config/naming-rules.neon
+    - vendor/symplify/phpstan-rules/config/regex-rules.neon
+    - vendor/symplify/phpstan-rules/config/static-rules.neon
+
+parameters:
+    level: 8
+    excludePaths:
+        - */Fixture/*
+
+    paths:
+        - bin
+        - src
+        - tests
+
+    unused_public:
+        methods: true
+        constants: true
+        properties: true
+
+    type_coverage:
+        param: 99
+        property: 99
+        return: 99
+        declare: 99
+
+    reportUnmatchedIgnoredErrors: false

src/Command/RunCommand.php

@@ -58,7 +58,7 @@ protected function configure(): void
             'Without any extensions, without ignores, without baselines, just pure PHPStan'
         );
 
-        // @todo nobaseline - without ignores and baseline files
+        $this->addOption('no-ignore', null, InputOption::VALUE_NONE, 'Run PHPStan without any ignores/baselines');
     }
 
     /**
@@ -76,6 +76,7 @@ protected function execute(InputInterface $input, OutputInterface $output): int
 
         $isBare = (bool) $input->getOption('bare');
         $isJson = (bool) $input->getOption('json');
+        $isNoIgnore = (bool) $input->getOption('no-ignore');
 
         // silence output till the end to avoid invalid json format
         if ($isJson) {
@@ -86,7 +87,7 @@ protected function execute(InputInterface $input, OutputInterface $output): int
 
         // 1. prepare empty phpstan config
         // no baselines, ignores etc. etc :)
-        $phpstanConfig = $this->phpStanConfigFactory->create($projectDirectory, [], $isBare);
+        $phpstanConfig = $this->phpStanConfigFactory->create($projectDirectory, [], $isBare, $isNoIgnore);
         file_put_contents($projectDirectory . '/phpstan-bodyscan.neon', $phpstanConfig->getFileContents());
 
         $levelResults = [];

src/PHPStanConfigFactory.php

@@ -25,8 +25,12 @@ final class PHPStanConfigFactory
     /**
      * @param array<string, mixed[]> $extraConfiguration
      */
-    public function create(string $projectDirectory, array $extraConfiguration = [], bool $bare = false): PHPStanConfig
-    {
+    public function create(
+        string $projectDirectory,
+        array $extraConfiguration = [],
+        bool $bare = false,
+        bool $isNoIgnore = false
+    ): PHPStanConfig {
         $existingPHPStanFile = null;
 
         foreach (self::PHPSTAN_FILE_NAMES as $phpstanFileName) {
@@ -50,7 +54,8 @@ public function create(string $projectDirectory, array $extraConfiguration = [],
                     // disable ignored error reporting, to make no fatal errors
                     'reportUnmatchedIgnoredErrors' => false,
                 ],
-            ]);
+            ], $isNoIgnore);
+
             return new PHPStanConfig($phpStanNeonContents);
         }
 
@@ -102,11 +107,18 @@ private function createBasicPHPStanConfiguration(string $projectDirectory): arra
     /**
      * @param array<string, mixed> $extraContents
      */
-    private function loadFileAndMergeParameters(string $existingPHPStanFile, array $extraContents): string
-    {
+    private function loadFileAndMergeParameters(
+        string $existingPHPStanFile,
+        array $extraContents,
+        bool $isNoIgnore
+    ): string {
         $neon = Neon::decodeFile($existingPHPStanFile);
         $neon = array_merge_recursive($neon, $extraContents);
 
+        if ($isNoIgnore) {
+            $neon = $this->removeIgnoredErrors($neon);
+        }
+
         return $this->dumpNeonToString($neon);
     }
 
@@ -118,4 +130,24 @@ private function dumpNeonToString(array $phpstanConfiguration): string
         $encodedNeon = Neon::encode($phpstanConfiguration, true, '    ');
         return trim($encodedNeon) . PHP_EOL;
     }
+
+    /**
+     * @param array<string, mixed> $neon
+     * @return array<string, mixed>
+     */
+    private function removeIgnoredErrors(array $neon): array
+    {
+        // remove included baseline and other ignored errors
+        if (isset($neon['includes'])) {
+            foreach ($neon['includes'] as $key => $includedFile) {
+                if (str_contains((string) $includedFile, 'baseline')) {
+                    unset($neon['includes'][$key]);
+                }
+            }
+        }
+
+        unset($neon['parameters']['ignoreErrors']);
+
+        return $neon;
+    }
 }

src/ValueObject/BodyscanResult.php

@@ -4,6 +4,8 @@
 
 namespace TomasVotruba\PHPStanBodyscan\ValueObject;
 
+use Webmozart\Assert\Assert;
+
 final readonly class BodyscanResult
 {
     /**
@@ -12,15 +14,24 @@
     public function __construct(
         private array $levelResults
     ) {
+        Assert::allIsInstanceOf($levelResults, LevelResult::class);
+        Assert::notEmpty($levelResults);
     }
 
     /**
      * @return LevelResult[]
      */
     public function getLevelResults(): array
     {
-        // add relative to previous level
+        $this->computeChangesToPreviousLevels();
+
+        return $this->levelResults;
+    }
+
+    private function computeChangesToPreviousLevels(): void
+    {
         $previousLevelResult = null;
+
         foreach ($this->levelResults as $levelResult) {
             if ($previousLevelResult instanceof LevelResult) {
                 $changeToPreviousLevel = $levelResult->getErrorCount() - $previousLevelResult->getErrorCount();
@@ -29,7 +40,5 @@ public function getLevelResults(): array
 
             $previousLevelResult = $levelResult;
         }
-
-        return $this->levelResults;
     }
 }