Updated Rector to commit 2cd301a878e0d9124e96a243632a2395bf975e5e

TomasVotruba · TomasVotruba · commit 2e473ee6ac69 · 2025-10-21T08:35:30.000Z
rectorphp/rector-src@2cd301a [depre] Deprecate strict-types rules as risky and not practical (#7523)
diff --git a/config/set/strict-booleans.php b/config/set/strict-booleans.php
@@ -4,11 +4,7 @@
 namespace RectorPrefix202510;
 
 use Rector\Config\RectorConfig;
-use Rector\Strict\Rector\BooleanNot\BooleanInBooleanNotRuleFixerRector;
 use Rector\Strict\Rector\Empty_\DisallowedEmptyRuleFixerRector;
-use Rector\Strict\Rector\If_\BooleanInIfConditionRuleFixerRector;
-use Rector\Strict\Rector\Ternary\BooleanInTernaryOperatorRuleFixerRector;
-use Rector\Strict\Rector\Ternary\DisallowedShortTernaryRuleFixerRector;
 return static function (RectorConfig $rectorConfig): void {
-    $rectorConfig->rules([BooleanInBooleanNotRuleFixerRector::class, DisallowedEmptyRuleFixerRector::class, BooleanInIfConditionRuleFixerRector::class, BooleanInTernaryOperatorRuleFixerRector::class, DisallowedShortTernaryRuleFixerRector::class]);
+    $rectorConfig->rules([DisallowedEmptyRuleFixerRector::class]);
 };
diff --git a/rules/Strict/Rector/AbstractFalsyScalarRuleFixerRector.php b/rules/Strict/Rector/AbstractFalsyScalarRuleFixerRector.php
@@ -7,8 +7,6 @@
 use Rector\Rector\AbstractRector;
 use RectorPrefix202510\Webmozart\Assert\Assert;
 /**
- * @see \Rector\Tests\Strict\Rector\BooleanNot\BooleanInBooleanNotRuleFixerRector\BooleanInBooleanNotRuleFixerRectorTest
- *
  * @internal
  */
 abstract class AbstractFalsyScalarRuleFixerRector extends AbstractRector implements ConfigurableRectorInterface
diff --git a/rules/Strict/Rector/BooleanNot/BooleanInBooleanNotRuleFixerRector.php b/rules/Strict/Rector/BooleanNot/BooleanInBooleanNotRuleFixerRector.php
@@ -6,27 +6,17 @@
 use PhpParser\Node;
 use PhpParser\Node\Expr;
 use PhpParser\Node\Expr\BooleanNot;
-use Rector\PHPStan\ScopeFetcher;
-use Rector\Strict\NodeFactory\ExactCompareFactory;
-use Rector\Strict\Rector\AbstractFalsyScalarRuleFixerRector;
+use Rector\Configuration\Deprecation\Contract\DeprecatedInterface;
+use Rector\Exception\ShouldNotHappenException;
+use Rector\Rector\AbstractRector;
 use Symplify\RuleDocGenerator\ValueObject\CodeSample\ConfiguredCodeSample;
 use Symplify\RuleDocGenerator\ValueObject\RuleDefinition;
 /**
- * Fixer Rector for PHPStan rule:
- * https://github.com/phpstan/phpstan-strict-rules/blob/0705fefc7c9168529fd130e341428f5f10f4f01d/src/Rules/BooleansInConditions/BooleanInBooleanNotRule.php
- *
- * @see \Rector\Tests\Strict\Rector\BooleanNot\BooleanInBooleanNotRuleFixerRector\BooleanInBooleanNotRuleFixerRectorTest
+ * @deprecated as risky and requires manual checking
  */
-final class BooleanInBooleanNotRuleFixerRector extends AbstractFalsyScalarRuleFixerRector
+final class BooleanInBooleanNotRuleFixerRector extends AbstractRector implements DeprecatedInterface
 {
-    /**
-     * @readonly
-     */
-    private ExactCompareFactory $exactCompareFactory;
-    public function __construct(ExactCompareFactory $exactCompareFactory)
-    {
-        $this->exactCompareFactory = $exactCompareFactory;
-    }
+    public const TREAT_AS_NON_EMPTY = 'treat_as_non_empty';
     public function getRuleDefinition(): RuleDefinition
     {
         $errorMessage = \sprintf('Fixer for PHPStan reports by strict type rule - "%s"', 'PHPStan\Rules\BooleansInConditions\BooleanInBooleanNotRule');
@@ -70,11 +60,6 @@ public function getNodeTypes(): array
      */
     public function refactor(Node $node): ?Expr
     {
-        $scope = ScopeFetcher::fetch($node);
-        $exprType = $scope->getNativeType($node->expr);
-        if ($exprType->isBoolean()->yes()) {
-            return null;
-        }
-        return $this->exactCompareFactory->createIdenticalFalsyCompare($exprType, $node->expr, $this->treatAsNonEmpty);
+        throw new ShouldNotHappenException('This rule is deprecated as risky and not practical');
     }
 }
diff --git a/rules/Strict/Rector/If_/BooleanInIfConditionRuleFixerRector.php b/rules/Strict/Rector/If_/BooleanInIfConditionRuleFixerRector.php
@@ -4,30 +4,18 @@
 namespace Rector\Strict\Rector\If_;
 
 use PhpParser\Node;
-use PhpParser\Node\Expr;
 use PhpParser\Node\Stmt\If_;
-use Rector\PHPStan\ScopeFetcher;
-use Rector\Strict\NodeFactory\ExactCompareFactory;
-use Rector\Strict\Rector\AbstractFalsyScalarRuleFixerRector;
+use Rector\Configuration\Deprecation\Contract\DeprecatedInterface;
+use Rector\Exception\ShouldNotHappenException;
+use Rector\Rector\AbstractRector;
 use Symplify\RuleDocGenerator\ValueObject\CodeSample\ConfiguredCodeSample;
 use Symplify\RuleDocGenerator\ValueObject\RuleDefinition;
 /**
- * Fixer Rector for PHPStan rules:
- * https://github.com/phpstan/phpstan-strict-rules/blob/master/src/Rules/BooleansInConditions/BooleanInIfConditionRule.php
- * https://github.com/phpstan/phpstan-strict-rules/blob/master/src/Rules/BooleansInConditions/BooleanInElseIfConditionRule.php
- *
- * @see \Rector\Tests\Strict\Rector\If_\BooleanInIfConditionRuleFixerRector\BooleanInIfConditionRuleFixerRectorTest
+ * @deprecated this rule is risky and requires manual checking
  */
-final class BooleanInIfConditionRuleFixerRector extends AbstractFalsyScalarRuleFixerRector
+final class BooleanInIfConditionRuleFixerRector extends AbstractRector implements DeprecatedInterface
 {
-    /**
-     * @readonly
-     */
-    private ExactCompareFactory $exactCompareFactory;
-    public function __construct(ExactCompareFactory $exactCompareFactory)
-    {
-        $this->exactCompareFactory = $exactCompareFactory;
-    }
+    public const TREAT_AS_NON_EMPTY = 'treat_as_non_empty';
     public function getRuleDefinition(): RuleDefinition
     {
         $errorMessage = \sprintf('Fixer for PHPStan reports by strict type rule - "%s"', 'PHPStan\Rules\BooleansInConditions\BooleanInIfConditionRule');
@@ -71,28 +59,6 @@ public function getNodeTypes(): array
      */
     public function refactor(Node $node): ?If_
     {
-        $hasChanged = \false;
-        $scope = ScopeFetcher::fetch($node);
-        // 1. if
-        $ifCondExprType = $scope->getNativeType($node->cond);
-        $notIdentical = $this->exactCompareFactory->createNotIdenticalFalsyCompare($ifCondExprType, $node->cond, $this->treatAsNonEmpty);
-        if ($notIdentical !== null) {
-            $node->cond = $notIdentical;
-            $hasChanged = \true;
-        }
-        // 2. elseifs
-        foreach ($node->elseifs as $elseif) {
-            $elseifCondExprType = $scope->getNativeType($elseif->cond);
-            $notIdentical = $this->exactCompareFactory->createNotIdenticalFalsyCompare($elseifCondExprType, $elseif->cond, $this->treatAsNonEmpty);
-            if (!$notIdentical instanceof Expr) {
-                continue;
-            }
-            $elseif->cond = $notIdentical;
-            $hasChanged = \true;
-        }
-        if ($hasChanged) {
-            return $node;
-        }
-        return null;
+        throw new ShouldNotHappenException('This rule is deprecated and will be removed as risky and requires manual checking');
     }
 }
diff --git a/rules/Strict/Rector/Ternary/BooleanInTernaryOperatorRuleFixerRector.php b/rules/Strict/Rector/Ternary/BooleanInTernaryOperatorRuleFixerRector.php
@@ -4,29 +4,18 @@
 namespace Rector\Strict\Rector\Ternary;
 
 use PhpParser\Node;
-use PhpParser\Node\Expr;
 use PhpParser\Node\Expr\Ternary;
-use Rector\PHPStan\ScopeFetcher;
-use Rector\Strict\NodeFactory\ExactCompareFactory;
-use Rector\Strict\Rector\AbstractFalsyScalarRuleFixerRector;
+use Rector\Configuration\Deprecation\Contract\DeprecatedInterface;
+use Rector\Exception\ShouldNotHappenException;
+use Rector\Rector\AbstractRector;
 use Symplify\RuleDocGenerator\ValueObject\CodeSample\ConfiguredCodeSample;
 use Symplify\RuleDocGenerator\ValueObject\RuleDefinition;
 /**
- * Fixer Rector for PHPStan rule:
- * https://github.com/phpstan/phpstan-strict-rules/blob/master/src/Rules/BooleansInConditions/BooleanInTernaryOperatorRule.php
- *
- * @see \Rector\Tests\Strict\Rector\Ternary\BooleanInTernaryOperatorRuleFixerRector\BooleanInTernaryOperatorRuleFixerRectorTest
+ * @deprecated as risky and requires manual checking
  */
-final class BooleanInTernaryOperatorRuleFixerRector extends AbstractFalsyScalarRuleFixerRector
+final class BooleanInTernaryOperatorRuleFixerRector extends AbstractRector implements DeprecatedInterface
 {
-    /**
-     * @readonly
-     */
-    private ExactCompareFactory $exactCompareFactory;
-    public function __construct(ExactCompareFactory $exactCompareFactory)
-    {
-        $this->exactCompareFactory = $exactCompareFactory;
-    }
+    public const TREAT_AS_NON_EMPTY = 'treat_as_non_empty';
     public function getRuleDefinition(): RuleDefinition
     {
         $errorMessage = \sprintf('Fixer for PHPStan reports by strict type rule - "%s"', 'PHPStan\Rules\BooleansInConditions\BooleanInTernaryOperatorRule');
@@ -62,17 +51,6 @@ public function getNodeTypes(): array
      */
     public function refactor(Node $node): ?Ternary
     {
-        // skip short ternary
-        if (!$node->if instanceof Expr) {
-            return null;
-        }
-        $scope = ScopeFetcher::fetch($node);
-        $exprType = $scope->getNativeType($node->cond);
-        $expr = $this->exactCompareFactory->createNotIdenticalFalsyCompare($exprType, $node->cond, $this->treatAsNonEmpty);
-        if (!$expr instanceof Expr) {
-            return null;
-        }
-        $node->cond = $expr;
-        return $node;
+        throw new ShouldNotHappenException('This rule is deprecated as risky and not practical');
     }
 }
diff --git a/rules/Strict/Rector/Ternary/DisallowedShortTernaryRuleFixerRector.php b/rules/Strict/Rector/Ternary/DisallowedShortTernaryRuleFixerRector.php
@@ -4,32 +4,21 @@
 namespace Rector\Strict\Rector\Ternary;
 
 use PhpParser\Node;
-use PhpParser\Node\Expr;
-use PhpParser\Node\Expr\FuncCall;
 use PhpParser\Node\Expr\Ternary;
-use PHPStan\Analyser\Scope;
-use Rector\PHPStan\ScopeFetcher;
-use Rector\Strict\NodeFactory\ExactCompareFactory;
-use Rector\Strict\Rector\AbstractFalsyScalarRuleFixerRector;
+use Rector\Configuration\Deprecation\Contract\DeprecatedInterface;
+use Rector\Exception\ShouldNotHappenException;
+use Rector\Rector\AbstractRector;
 use Symplify\RuleDocGenerator\ValueObject\CodeSample\ConfiguredCodeSample;
 use Symplify\RuleDocGenerator\ValueObject\RuleDefinition;
 /**
  * Fixer Rector for PHPStan rule:
  * https://github.com/phpstan/phpstan-strict-rules/blob/master/src/Rules/DisallowedConstructs/DisallowedShortTernaryRule.php
  *
- * @see \Rector\Tests\Strict\Rector\Ternary\DisallowedShortTernaryRuleFixerRector\DisallowedShortTernaryRuleFixerRectorTest
+ * @deprecated as risky and not practical
  */
-final class DisallowedShortTernaryRuleFixerRector extends AbstractFalsyScalarRuleFixerRector
+final class DisallowedShortTernaryRuleFixerRector extends AbstractRector implements DeprecatedInterface
 {
-    /**
-     * @readonly
-     */
-    private ExactCompareFactory $exactCompareFactory;
-    private bool $hasChanged = \false;
-    public function __construct(ExactCompareFactory $exactCompareFactory)
-    {
-        $this->exactCompareFactory = $exactCompareFactory;
-    }
+    public const TREAT_AS_NON_EMPTY = 'treat_as_non_empty';
     public function getRuleDefinition(): RuleDefinition
     {
         $errorMessage = sprintf('Fixer for PHPStan reports by strict type rule - "%s"', 'PHPStan\Rules\DisallowedConstructs\DisallowedShortTernaryRule');
@@ -65,42 +54,6 @@ public function getNodeTypes(): array
      */
     public function refactor(Node $node): ?Ternary
     {
-        $this->hasChanged = \false;
-        // skip non-short ternary
-        if ($node->if instanceof Expr) {
-            return null;
-        }
-        $scope = ScopeFetcher::fetch($node);
-        // special case for reset() function
-        if ($node->cond instanceof FuncCall && $this->isName($node->cond, 'reset')) {
-            $this->refactorResetFuncCall($node, $node->cond, $scope);
-            if (!$this->hasChanged) {
-                return null;
-            }
-            return $node;
-        }
-        $exprType = $scope->getNativeType($node->cond);
-        $compareExpr = $this->exactCompareFactory->createNotIdenticalFalsyCompare($exprType, $node->cond, $this->treatAsNonEmpty);
-        if (!$compareExpr instanceof Expr) {
-            return null;
-        }
-        $node->if = $node->cond;
-        $node->cond = $compareExpr;
-        return $node;
-    }
-    private function refactorResetFuncCall(Ternary $ternary, FuncCall $resetFuncCall, Scope $scope): void
-    {
-        $ternary->if = $ternary->cond;
-        if ($resetFuncCall->isFirstClassCallable()) {
-            return;
-        }
-        $firstArgValue = $resetFuncCall->getArgs()[0]->value;
-        $firstArgType = $scope->getNativeType($firstArgValue);
-        $falsyCompareExpr = $this->exactCompareFactory->createNotIdenticalFalsyCompare($firstArgType, $firstArgValue, $this->treatAsNonEmpty);
-        if (!$falsyCompareExpr instanceof Expr) {
-            return;
-        }
-        $ternary->cond = $falsyCompareExpr;
-        $this->hasChanged = \true;
+        throw new ShouldNotHappenException('This rule is deprecated as risky and not practical');
     }
 }
diff --git a/src/Application/VersionResolver.php b/src/Application/VersionResolver.php
@@ -19,12 +19,12 @@ final class VersionResolver
      * @api
      * @var string
      */
-    public const PACKAGE_VERSION = '5b5c2cd9f465b32508eede574f3b7fba7465f734';
+    public const PACKAGE_VERSION = '2cd301a878e0d9124e96a243632a2395bf975e5e';
     /**
      * @api
      * @var string
      */
-    public const RELEASE_DATE = '2025-10-20 21:28:09';
+    public const RELEASE_DATE = '2025-10-21 10:32:00';
     /**
      * @var int
      */
diff --git a/src/Configuration/RectorConfigBuilder.php b/src/Configuration/RectorConfigBuilder.php
@@ -523,10 +523,28 @@ public function withPhp74Sets(): self
     }
     // there is no withPhp80Sets() and above,
     // as we already use PHP 8.0 and should go with withPhpSets() instead
-    public function withPreparedSets(bool $deadCode = \false, bool $codeQuality = \false, bool $codingStyle = \false, bool $typeDeclarations = \false, bool $typeDeclarationDocblocks = \false, bool $privatization = \false, bool $naming = \false, bool $instanceOf = \false, bool $earlyReturn = \false, bool $strictBooleans = \false, bool $carbon = \false, bool $rectorPreset = \false, bool $phpunitCodeQuality = \false, bool $doctrineCodeQuality = \false, bool $symfonyCodeQuality = \false, bool $symfonyConfigs = \false): self
+    public function withPreparedSets(
+        bool $deadCode = \false,
+        bool $codeQuality = \false,
+        bool $codingStyle = \false,
+        bool $typeDeclarations = \false,
+        bool $typeDeclarationDocblocks = \false,
+        bool $privatization = \false,
+        bool $naming = \false,
+        bool $instanceOf = \false,
+        bool $earlyReturn = \false,
+        /** @deprecated */
+        bool $strictBooleans = \false,
+        bool $carbon = \false,
+        bool $rectorPreset = \false,
+        bool $phpunitCodeQuality = \false,
+        bool $doctrineCodeQuality = \false,
+        bool $symfonyCodeQuality = \false,
+        bool $symfonyConfigs = \false
+    ): self
     {
         Notifier::notifyNotSuitableMethodForPHP74(__METHOD__);
-        $setMap = [SetList::DEAD_CODE => $deadCode, SetList::CODE_QUALITY => $codeQuality, SetList::CODING_STYLE => $codingStyle, SetList::TYPE_DECLARATION => $typeDeclarations, SetList::TYPE_DECLARATION_DOCBLOCKS => $typeDeclarationDocblocks, SetList::PRIVATIZATION => $privatization, SetList::NAMING => $naming, SetList::INSTANCEOF => $instanceOf, SetList::EARLY_RETURN => $earlyReturn, SetList::STRICT_BOOLEANS => $strictBooleans, SetList::CARBON => $carbon, SetList::RECTOR_PRESET => $rectorPreset, PHPUnitSetList::PHPUNIT_CODE_QUALITY => $phpunitCodeQuality, DoctrineSetList::DOCTRINE_CODE_QUALITY => $doctrineCodeQuality, SymfonySetList::SYMFONY_CODE_QUALITY => $symfonyCodeQuality, SymfonySetList::CONFIGS => $symfonyConfigs];
+        $setMap = [SetList::DEAD_CODE => $deadCode, SetList::CODE_QUALITY => $codeQuality, SetList::CODING_STYLE => $codingStyle, SetList::TYPE_DECLARATION => $typeDeclarations, SetList::TYPE_DECLARATION_DOCBLOCKS => $typeDeclarationDocblocks, SetList::PRIVATIZATION => $privatization, SetList::NAMING => $naming, SetList::INSTANCEOF => $instanceOf, SetList::EARLY_RETURN => $earlyReturn, SetList::CARBON => $carbon, SetList::RECTOR_PRESET => $rectorPreset, PHPUnitSetList::PHPUNIT_CODE_QUALITY => $phpunitCodeQuality, DoctrineSetList::DOCTRINE_CODE_QUALITY => $doctrineCodeQuality, SymfonySetList::SYMFONY_CODE_QUALITY => $symfonyCodeQuality, SymfonySetList::CONFIGS => $symfonyConfigs];
         foreach ($setMap as $setPath => $isEnabled) {
             if ($isEnabled) {
                 $this->sets[] = $setPath;
diff --git a/src/Set/ValueObject/SetList.php b/src/Set/ValueObject/SetList.php
@@ -26,6 +26,7 @@ final class SetList
      */
     public const DEAD_CODE = __DIR__ . '/../../../config/set/dead-code.php';
     /**
+     * @deprecated As too strict and not practical. Use code quality and coding style sets instead.
      * @var string
      */
     public const STRICT_BOOLEANS = __DIR__ . '/../../../config/set/strict-booleans.php';
