diff --git a/rules/Strict/Rector/If_/BooleanInIfConditionRuleFixerRector.php b/rules/Strict/Rector/If_/BooleanInIfConditionRuleFixerRector.php index 1b59f645397..28d0bb0c424 100644 --- a/rules/Strict/Rector/If_/BooleanInIfConditionRuleFixerRector.php +++ b/rules/Strict/Rector/If_/BooleanInIfConditionRuleFixerRector.php @@ -7,10 +7,10 @@ use PhpParser\Node; use PhpParser\Node\Stmt\If_; use PHPStan\Analyser\Scope; -use Rector\Core\Rector\AbstractRector; use Rector\NodeTypeResolver\Node\AttributeKey; use Rector\Strict\NodeFactory\ExactCompareFactory; -use Symplify\RuleDocGenerator\ValueObject\CodeSample\CodeSample; +use Rector\Strict\Rector\AbstractFalsyScalarRuleFixerRector; +use Symplify\RuleDocGenerator\ValueObject\CodeSample\ConfiguredCodeSample; use Symplify\RuleDocGenerator\ValueObject\RuleDefinition; /** @@ -20,7 +20,7 @@ * * @see \Rector\Tests\Strict\Rector\If_\BooleanInIfConditionRuleFixerRector\BooleanInIfConditionRuleFixerRectorTest */ -final class BooleanInIfConditionRuleFixerRector extends AbstractRector +final class BooleanInIfConditionRuleFixerRector extends AbstractFalsyScalarRuleFixerRector { public function __construct( private ExactCompareFactory $exactCompareFactory @@ -34,7 +34,7 @@ public function getRuleDefinition(): RuleDefinition 'PHPStan\Rules\BooleansInConditions\BooleanInIfConditionRule' ); return new RuleDefinition($errorMessage, [ - new CodeSample( + new ConfiguredCodeSample( <<<'CODE_SAMPLE' final class NegatedString { @@ -62,6 +62,10 @@ public function run(string $name) } } CODE_SAMPLE + , + [ + self::TREAT_AS_NON_EMPTY => false, + ] ), ]); } diff --git a/rules/Strict/Rector/Ternary/BooleanInTernaryOperatorRuleFixerRector.php b/rules/Strict/Rector/Ternary/BooleanInTernaryOperatorRuleFixerRector.php index 69408e4bc5b..0e347c5f131 100644 --- a/rules/Strict/Rector/Ternary/BooleanInTernaryOperatorRuleFixerRector.php +++ b/rules/Strict/Rector/Ternary/BooleanInTernaryOperatorRuleFixerRector.php @@ -8,10 +8,10 @@ use PhpParser\Node\Expr; use PhpParser\Node\Expr\Ternary; use PHPStan\Analyser\Scope; -use Rector\Core\Rector\AbstractRector; use Rector\NodeTypeResolver\Node\AttributeKey; use Rector\Strict\NodeFactory\ExactCompareFactory; -use Symplify\RuleDocGenerator\ValueObject\CodeSample\CodeSample; +use Rector\Strict\Rector\AbstractFalsyScalarRuleFixerRector; +use Symplify\RuleDocGenerator\ValueObject\CodeSample\ConfiguredCodeSample; use Symplify\RuleDocGenerator\ValueObject\RuleDefinition; /** @@ -20,7 +20,7 @@ * * @see \Rector\Tests\Strict\Rector\Ternary\BooleanInTernaryOperatorRuleFixerRector\BooleanInTernaryOperatorRuleFixerRectorTest */ -final class BooleanInTernaryOperatorRuleFixerRector extends AbstractRector +final class BooleanInTernaryOperatorRuleFixerRector extends AbstractFalsyScalarRuleFixerRector { public function __construct( private ExactCompareFactory $exactCompareFactory @@ -34,7 +34,7 @@ public function getRuleDefinition(): RuleDefinition 'PHPStan\Rules\BooleansInConditions\BooleanInTernaryOperatorRule' ); return new RuleDefinition($errorMessage, [ - new CodeSample( + new ConfiguredCodeSample( <<<'CODE_SAMPLE' final class ArrayCompare { @@ -54,6 +54,10 @@ public function run(array $data) } } CODE_SAMPLE + , + [ + self::TREAT_AS_NON_EMPTY => false, + ] ), ]); } diff --git a/rules/Strict/Rector/Ternary/DisallowedShortTernaryRuleFixerRector.php b/rules/Strict/Rector/Ternary/DisallowedShortTernaryRuleFixerRector.php index d6962931647..34242b115a2 100644 --- a/rules/Strict/Rector/Ternary/DisallowedShortTernaryRuleFixerRector.php +++ b/rules/Strict/Rector/Ternary/DisallowedShortTernaryRuleFixerRector.php @@ -8,10 +8,10 @@ use PhpParser\Node\Expr\FuncCall; use PhpParser\Node\Expr\Ternary; use PHPStan\Analyser\Scope; -use Rector\Core\Rector\AbstractRector; use Rector\NodeTypeResolver\Node\AttributeKey; use Rector\Strict\NodeFactory\ExactCompareFactory; -use Symplify\RuleDocGenerator\ValueObject\CodeSample\CodeSample; +use Rector\Strict\Rector\AbstractFalsyScalarRuleFixerRector; +use Symplify\RuleDocGenerator\ValueObject\CodeSample\ConfiguredCodeSample; use Symplify\RuleDocGenerator\ValueObject\RuleDefinition; /** @@ -20,7 +20,7 @@ * * @see \Rector\Tests\Strict\Rector\Ternary\DisallowedShortTernaryRuleFixerRector\DisallowedShortTernaryRuleFixerRectorTest */ -final class DisallowedShortTernaryRuleFixerRector extends AbstractRector +final class DisallowedShortTernaryRuleFixerRector extends AbstractFalsyScalarRuleFixerRector { public function __construct( private ExactCompareFactory $exactCompareFactory, @@ -34,7 +34,7 @@ public function getRuleDefinition(): RuleDefinition 'PHPStan\Rules\DisallowedConstructs\DisallowedShortTernaryRule' ); return new RuleDefinition($errorMessage, [ - new CodeSample( + new ConfiguredCodeSample( <<<'CODE_SAMPLE' final class ShortTernaryArray { @@ -54,6 +54,10 @@ public function run(array $array) } } CODE_SAMPLE + , + [ + self::TREAT_AS_NON_EMPTY => false, + ] ), ]); }