[Config] Make with php set used, cleanup phpstan config (#6274)

* [Config] Make with php set used

* level is always natural

* cleanup phpstan

Author: TomasVotruba

phpstan.neon

@@ -111,9 +111,6 @@ parameters:
                 - src/BetterPhpDocParser/PhpDocParser/StaticDoctrineAnnotationParser/ArrayParser.php
                 - rules/EarlyReturn/Rector/If_/ChangeNestedIfsToEarlyReturnRector.php
                 - rules/Php70/EregToPcreTransformer.php
-                - rules/DeadCode/NodeManipulator/LivingCodeManipulator.php
-                - rules/EarlyReturn/Rector/If_/ChangeAndIfToEarlyReturnRector.php
-                - src/PhpParser/NodeTransformer.php
 
         # mapper re-use
         - '#Parameter \#1 \$type of method Rector\\PHPStanStaticTypeMapper\\TypeMapper\\ObjectWithoutClassTypeMapper\:\:mapToPhpParserNode\(\) expects PHPStan\\Type\\ObjectWithoutClassType, PHPStan\\Type\\Accessory\\Has(Property|Method)Type given#'
@@ -302,3 +299,6 @@ parameters:
 
         # known values
         - '#Method Rector\\Util\\PhpVersionFactory\:\:createIntVersion\(\) should return 50200\|50300\|50400\|50500\|50600\|70000\|70100\|70200\|70300\|70400\|80000\|80100\|80200\|80300\|80400\|100000 but returns int#'
+
+        # soon to be used
+        - '#Property Rector\\Configuration\\RectorConfigBuilder\:\:\$isWithPhpSetsUsed is never read, only written#'

rector.php

@@ -5,6 +5,7 @@
 use Rector\CodingStyle\Rector\String_\UseClassKeywordForClassNameResolutionRector;
 use Rector\Config\RectorConfig;
 use Rector\DeadCode\Rector\ConstFetch\RemovePhpVersionIdCheckRector;
+use Rector\DeadCode\Rector\Property\RemoveUnusedPrivatePropertyRector;
 use Rector\Php55\Rector\String_\StringClassNameToClassConstantRector;
 
 return RectorConfig::configure()
@@ -54,4 +55,6 @@
             __DIR__ . '/src/Configuration/RectorConfigBuilder.php',
             __DIR__ . '/src/Console/Notifier.php',
         ],
+
+        RemoveUnusedPrivatePropertyRector::class => [__DIR__ . '/src/Configuration/RectorConfigBuilder.php'],
     ]);

src/Configuration/RectorConfigBuilder.php

@@ -153,6 +153,11 @@ final class RectorConfigBuilder
      */
     private array $groupLoadedSets = [];
 
+    /**
+     * @api soon to be used
+     */
+    private ?bool $isWithPhpSetsUsed = null;
+
     public function __invoke(RectorConfig $rectorConfig): void
     {
         // @experimental 2024-06
@@ -489,6 +494,8 @@ public function withPhpSets(
         bool $php53 = false,
         bool $php84 = false, // place on later as BC break when used in php 7.x without named arg
     ): self {
+        $this->isWithPhpSetsUsed = true;
+
         $pickedArguments = array_filter(func_get_args());
         if ($pickedArguments !== []) {
             Notifier::notifyWithPhpSetsNotSuitableForPHP80();
@@ -513,24 +520,51 @@ public function withPhpSets(
         }
 
         if ($php53) {
-            $targetPhpVersion = PhpVersion::PHP_53;
-        } elseif ($php54) {
-            $targetPhpVersion = PhpVersion::PHP_54;
-        } elseif ($php55) {
-            $targetPhpVersion = PhpVersion::PHP_55;
-        } elseif ($php56) {
-            $targetPhpVersion = PhpVersion::PHP_56;
-        } elseif ($php70) {
-            $targetPhpVersion = PhpVersion::PHP_70;
-        } elseif ($php71) {
-            $targetPhpVersion = PhpVersion::PHP_71;
-        } elseif ($php72) {
-            $targetPhpVersion = PhpVersion::PHP_72;
-        } elseif ($php73) {
-            $targetPhpVersion = PhpVersion::PHP_73;
-        } elseif ($php74) {
-            $targetPhpVersion = PhpVersion::PHP_74;
-        } elseif ($php80) {
+            $this->withPhp53Sets();
+            return $this;
+        }
+
+        if ($php54) {
+            $this->withPhp54Sets();
+            return $this;
+        }
+
+        if ($php55) {
+            $this->withPhp55Sets();
+            return $this;
+        }
+
+        if ($php56) {
+            $this->withPhp56Sets();
+            return $this;
+        }
+
+        if ($php70) {
+            $this->withPhp70Sets();
+            return $this;
+        }
+
+        if ($php71) {
+            $this->withPhp71Sets();
+            return $this;
+        }
+
+        if ($php72) {
+            $this->withPhp72Sets();
+            return $this;
+        }
+
+        if ($php73) {
+            $this->withPhp73Sets();
+            return $this;
+        }
+
+        if ($php74) {
+            $this->withPhp74Sets();
+            return $this;
+        }
+
+        if ($php80) {
             $targetPhpVersion = PhpVersion::PHP_80;
         } elseif ($php81) {
             $targetPhpVersion = PhpVersion::PHP_81;
@@ -556,62 +590,80 @@ public function withPhpSets(
      */
     public function withPhp53Sets(): self
     {
+        $this->isWithPhpSetsUsed = true;
+
         $this->sets = array_merge($this->sets, PhpLevelSetResolver::resolveFromPhpVersion(PhpVersion::PHP_53));
 
         return $this;
     }
 
     public function withPhp54Sets(): self
     {
+        $this->isWithPhpSetsUsed = true;
+
         $this->sets = array_merge($this->sets, PhpLevelSetResolver::resolveFromPhpVersion(PhpVersion::PHP_54));
 
         return $this;
     }
 
     public function withPhp55Sets(): self
     {
+        $this->isWithPhpSetsUsed = true;
+
         $this->sets = array_merge($this->sets, PhpLevelSetResolver::resolveFromPhpVersion(PhpVersion::PHP_55));
 
         return $this;
     }
 
     public function withPhp56Sets(): self
     {
+        $this->isWithPhpSetsUsed = true;
+
         $this->sets = array_merge($this->sets, PhpLevelSetResolver::resolveFromPhpVersion(PhpVersion::PHP_56));
 
         return $this;
     }
 
     public function withPhp70Sets(): self
     {
+        $this->isWithPhpSetsUsed = true;
+
         $this->sets = array_merge($this->sets, PhpLevelSetResolver::resolveFromPhpVersion(PhpVersion::PHP_70));
 
         return $this;
     }
 
     public function withPhp71Sets(): self
     {
+        $this->isWithPhpSetsUsed = true;
+
         $this->sets = array_merge($this->sets, PhpLevelSetResolver::resolveFromPhpVersion(PhpVersion::PHP_71));
 
         return $this;
     }
 
     public function withPhp72Sets(): self
     {
+        $this->isWithPhpSetsUsed = true;
+
         $this->sets = array_merge($this->sets, PhpLevelSetResolver::resolveFromPhpVersion(PhpVersion::PHP_72));
 
         return $this;
     }
 
     public function withPhp73Sets(): self
     {
+        $this->isWithPhpSetsUsed = true;
+
         $this->sets = array_merge($this->sets, PhpLevelSetResolver::resolveFromPhpVersion(PhpVersion::PHP_73));
 
         return $this;
     }
 
     public function withPhp74Sets(): self
     {
+        $this->isWithPhpSetsUsed = true;
+
         $this->sets = array_merge($this->sets, PhpLevelSetResolver::resolveFromPhpVersion(PhpVersion::PHP_74));
 
         return $this;
@@ -876,13 +928,11 @@ public function withSymfonyContainerPhp(string $symfonyContainerPhpFile): self
      */
     public function withDeadCodeLevel(int $level): self
     {
+        Assert::natural($level);
+
         $this->isDeadCodeLevelUsed = true;
 
-        $levelRules = LevelRulesResolver::resolve(
-            $level,
-            DeadCodeLevel::RULES,
-            'RectorConfig::withDeadCodeLevel()'
-        );
+        $levelRules = LevelRulesResolver::resolve($level, DeadCodeLevel::RULES, __METHOD__);
 
         $this->rules = array_merge($this->rules, $levelRules);
 
@@ -895,13 +945,11 @@ public function withDeadCodeLevel(int $level): self
      */
     public function withTypeCoverageLevel(int $level): self
     {
+        Assert::natural($level);
+
         $this->isTypeCoverageLevelUsed = true;
 
-        $levelRules = LevelRulesResolver::resolve(
-            $level,
-            TypeDeclarationLevel::RULES,
-            'RectorConfig::withTypeCoverageLevel()'
-        );
+        $levelRules = LevelRulesResolver::resolve($level, TypeDeclarationLevel::RULES, __METHOD__);
 
         $this->rules = array_merge($this->rules, $levelRules);
 
@@ -914,13 +962,11 @@ public function withTypeCoverageLevel(int $level): self
      */
     public function withCodeQualityLevel(int $level): self
     {
+        Assert::natural($level);
+
         $this->isCodeQualityLevelUsed = true;
 
-        $levelRules = LevelRulesResolver::resolve(
-            $level,
-            CodeQualityLevel::RULES,
-            'RectorConfig::withCodeQualityLevel()'
-        );
+        $levelRules = LevelRulesResolver::resolve($level, CodeQualityLevel::RULES, __METHOD__);
 
         $this->rules = array_merge($this->rules, $levelRules);