Updated Rector to commit 7c8b23b02d

7c8b23b02d [CodeQuality] Add TernaryFalseExpressionToIfRector (#2590)

config/set/code-quality.php

@@ -18,6 +18,7 @@ use Rector\CodeQuality\Rector\Concat\JoinStringConcatRector;
 use Rector\CodeQuality\Rector\Do_\DoWhileBreakFalseToIfElseRector;
 use Rector\CodeQuality\Rector\Equal\UseIdenticalOverEqualWithSameTypeRector;
 use Rector\CodeQuality\Rector\Expression\InlineIfToExplicitIfRector;
+use Rector\CodeQuality\Rector\Expression\TernaryFalseExpressionToIfRector;
 use Rector\CodeQuality\Rector\For_\ForRepeatedCountToOwnVariableRector;
 use Rector\CodeQuality\Rector\For_\ForToForeachRector;
 use Rector\CodeQuality\Rector\Foreach_\ForeachItemsAssignToEmptyArrayToAssignRector;
@@ -105,5 +106,5 @@ return static function (RectorConfig $rectorConfig) : void {
         'mbstrrpos' => 'mb_strrpos',
         'mbsubstr' => 'mb_substr',
     ]);
-    $rectorConfig->rules([CombinedAssignRector::class, SimplifyEmptyArrayCheckRector::class, ReplaceMultipleBooleanNotRector::class, ForeachToInArrayRector::class, SimplifyForeachToCoalescingRector::class, SimplifyFuncGetArgsCountRector::class, SimplifyInArrayValuesRector::class, SimplifyStrposLowerRector::class, GetClassToInstanceOfRector::class, SimplifyArraySearchRector::class, SimplifyConditionsRector::class, SimplifyIfNotNullReturnRector::class, SimplifyIfReturnBoolRector::class, SimplifyUselessVariableRector::class, UnnecessaryTernaryExpressionRector::class, RemoveExtraParametersRector::class, SimplifyDeMorganBinaryRector::class, SimplifyTautologyTernaryRector::class, SimplifyForeachToArrayFilterRector::class, SingleInArrayToCompareRector::class, SimplifyIfElseToTernaryRector::class, JoinStringConcatRector::class, ConsecutiveNullCompareReturnsToNullCoalesceQueueRector::class, SimplifyIfIssetToNullCoalescingRector::class, ExplicitBoolCompareRector::class, CombineIfRector::class, UseIdenticalOverEqualWithSameTypeRector::class, SimplifyBoolIdenticalTrueRector::class, SimplifyRegexPatternRector::class, BooleanNotIdenticalToNotIdenticalRector::class, CallableThisArrayToAnonymousFunctionRector::class, AndAssignsToSeparateLinesRector::class, ForToForeachRector::class, CompactToVariablesRector::class, CompleteDynamicPropertiesRector::class, IsAWithStringWithThirdArgumentRector::class, StrlenZeroToIdenticalEmptyStringRector::class, RemoveAlwaysTrueConditionSetInConstructorRector::class, ThrowWithPreviousExceptionRector::class, RemoveSoleValueSprintfRector::class, ShortenElseIfRector::class, AddPregQuoteDelimiterRector::class, ArrayMergeOfNonArraysToSimpleArrayRector::class, IntvalToTypeCastRector::class, ArrayKeyExistsTernaryThenValueToCoalescingRector::class, AbsolutizeRequireAndIncludePathRector::class, ChangeArrayPushToArrayAssignRector::class, ForRepeatedCountToOwnVariableRector::class, ForeachItemsAssignToEmptyArrayToAssignRector::class, InlineIfToExplicitIfRector::class, ArrayKeysAndInArrayToArrayKeyExistsRector::class, SplitListAssignToSeparateLineRector::class, UnusedForeachValueToArrayKeysRector::class, CommonNotEqualRector::class, SetTypeToCastRector::class, LogicalToBooleanRector::class, VarToPublicPropertyRector::class, IssetOnPropertyObjectToPropertyExistsRector::class, NewStaticToNewSelfRector::class, DateTimeToDateTimeInterfaceRector::class, UnwrapSprintfOneArgumentRector::class, SwitchNegatedTernaryRector::class, SingularSwitchToIfRector::class, SimplifyIfNullableReturnRector::class, NarrowUnionTypeDocRector::class, FuncGetArgsToVariadicParamRector::class, CallUserFuncToMethodCallRector::class, CallUserFuncWithArrowFunctionToInlineRector::class, CountArrayToEmptyArrayComparisonRector::class, FlipTypeControlToUseExclusiveTypeRector::class, ExplicitMethodCallOverMagicGetSetRector::class, DoWhileBreakFalseToIfElseRector::class, InlineArrayReturnAssignRector::class, InlineIsAInstanceOfRector::class]);
+    $rectorConfig->rules([CombinedAssignRector::class, SimplifyEmptyArrayCheckRector::class, ReplaceMultipleBooleanNotRector::class, ForeachToInArrayRector::class, SimplifyForeachToCoalescingRector::class, SimplifyFuncGetArgsCountRector::class, SimplifyInArrayValuesRector::class, SimplifyStrposLowerRector::class, GetClassToInstanceOfRector::class, SimplifyArraySearchRector::class, SimplifyConditionsRector::class, SimplifyIfNotNullReturnRector::class, SimplifyIfReturnBoolRector::class, SimplifyUselessVariableRector::class, UnnecessaryTernaryExpressionRector::class, RemoveExtraParametersRector::class, SimplifyDeMorganBinaryRector::class, SimplifyTautologyTernaryRector::class, SimplifyForeachToArrayFilterRector::class, SingleInArrayToCompareRector::class, SimplifyIfElseToTernaryRector::class, JoinStringConcatRector::class, ConsecutiveNullCompareReturnsToNullCoalesceQueueRector::class, SimplifyIfIssetToNullCoalescingRector::class, ExplicitBoolCompareRector::class, CombineIfRector::class, UseIdenticalOverEqualWithSameTypeRector::class, SimplifyBoolIdenticalTrueRector::class, SimplifyRegexPatternRector::class, BooleanNotIdenticalToNotIdenticalRector::class, CallableThisArrayToAnonymousFunctionRector::class, AndAssignsToSeparateLinesRector::class, ForToForeachRector::class, CompactToVariablesRector::class, CompleteDynamicPropertiesRector::class, IsAWithStringWithThirdArgumentRector::class, StrlenZeroToIdenticalEmptyStringRector::class, RemoveAlwaysTrueConditionSetInConstructorRector::class, ThrowWithPreviousExceptionRector::class, RemoveSoleValueSprintfRector::class, ShortenElseIfRector::class, AddPregQuoteDelimiterRector::class, ArrayMergeOfNonArraysToSimpleArrayRector::class, IntvalToTypeCastRector::class, ArrayKeyExistsTernaryThenValueToCoalescingRector::class, AbsolutizeRequireAndIncludePathRector::class, ChangeArrayPushToArrayAssignRector::class, ForRepeatedCountToOwnVariableRector::class, ForeachItemsAssignToEmptyArrayToAssignRector::class, InlineIfToExplicitIfRector::class, ArrayKeysAndInArrayToArrayKeyExistsRector::class, SplitListAssignToSeparateLineRector::class, UnusedForeachValueToArrayKeysRector::class, CommonNotEqualRector::class, SetTypeToCastRector::class, LogicalToBooleanRector::class, VarToPublicPropertyRector::class, IssetOnPropertyObjectToPropertyExistsRector::class, NewStaticToNewSelfRector::class, DateTimeToDateTimeInterfaceRector::class, UnwrapSprintfOneArgumentRector::class, SwitchNegatedTernaryRector::class, SingularSwitchToIfRector::class, SimplifyIfNullableReturnRector::class, NarrowUnionTypeDocRector::class, FuncGetArgsToVariadicParamRector::class, CallUserFuncToMethodCallRector::class, CallUserFuncWithArrowFunctionToInlineRector::class, CountArrayToEmptyArrayComparisonRector::class, FlipTypeControlToUseExclusiveTypeRector::class, ExplicitMethodCallOverMagicGetSetRector::class, DoWhileBreakFalseToIfElseRector::class, InlineArrayReturnAssignRector::class, InlineIsAInstanceOfRector::class, TernaryFalseExpressionToIfRector::class]);
 };

docs/rector_rules_overview.md

@@ -1,4 +1,4 @@
-# 410 Rules Overview
+# 411 Rules Overview
 
 <br>
 
@@ -6,7 +6,7 @@
 
 - [Arguments](#arguments) (5)
 
-- [CodeQuality](#codequality) (72)
+- [CodeQuality](#codequality) (73)
 
 - [CodingStyle](#codingstyle) (35)
 
@@ -1589,6 +1589,27 @@ Switch negated ternary condition rector
 
 <br>
 
+### TernaryFalseExpressionToIfRector
+
+Change ternary with false to if and explicit call
+
+- class: [`Rector\CodeQuality\Rector\Expression\TernaryFalseExpressionToIfRector`](../rules/CodeQuality/Rector/Expression/TernaryFalseExpressionToIfRector.php)
+
+```diff
+ final class SomeClass
+ {
+     public function run($value, $someMethod)
+     {
+-        $value ? $someMethod->call($value) : false;
++        if ($value) {
++            $someMethod->call($value);
++        }
+     }
+ }
+```
+
+<br>
+
 ### ThrowWithPreviousExceptionRector
 
 When throwing into a catch block, checks that the previous exception is passed to the new throw clause
@@ -1954,7 +1975,7 @@ return static function (RectorConfig $rectorConfig): void {
 -    /**
 -     * @var DateTime[]
 -     */
-+    /** @var DateTime[]|null */
++    /** @var DateTime[] */
      private ?array $dateTimes;
  }
 ```

rules/CodeQuality/Rector/Expression/TernaryFalseExpressionToIfRector.php

@@ -0,0 +1,77 @@
+<?php
+
+declare (strict_types=1);
+namespace Rector\CodeQuality\Rector\Expression;
+
+use PhpParser\Node;
+use PhpParser\Node\Expr;
+use PhpParser\Node\Expr\Ternary;
+use PhpParser\Node\Stmt\Expression;
+use PhpParser\Node\Stmt\If_;
+use Rector\Core\Rector\AbstractRector;
+use Rector\DeadCode\SideEffect\SideEffectNodeDetector;
+use Symplify\RuleDocGenerator\ValueObject\CodeSample\CodeSample;
+use Symplify\RuleDocGenerator\ValueObject\RuleDefinition;
+/**
+ * @see \Rector\Tests\CodeQuality\Rector\Expression\TernaryFalseExpressionToIfRector\TernaryFalseExpressionToIfRectorTest
+ */
+final class TernaryFalseExpressionToIfRector extends AbstractRector
+{
+    /**
+     * @readonly
+     * @var \Rector\DeadCode\SideEffect\SideEffectNodeDetector
+     */
+    private $sideEffectNodeDetector;
+    public function __construct(SideEffectNodeDetector $sideEffectNodeDetector)
+    {
+        $this->sideEffectNodeDetector = $sideEffectNodeDetector;
+    }
+    public function getRuleDefinition() : RuleDefinition
+    {
+        return new RuleDefinition('Change ternary with false to if and explicit call', [new CodeSample(<<<'CODE_SAMPLE'
+final class SomeClass
+{
+    public function run($value, $someMethod)
+    {
+        $value ? $someMethod->call($value) : false;
+    }
+}
+CODE_SAMPLE
+, <<<'CODE_SAMPLE'
+final class SomeClass
+{
+    public function run($value, $someMethod)
+    {
+        if ($value) {
+            $someMethod->call($value);
+        }
+    }
+}
+CODE_SAMPLE
+)]);
+    }
+    /**
+     * @return array<class-string<Node>>
+     */
+    public function getNodeTypes() : array
+    {
+        return [Expression::class];
+    }
+    /**
+     * @param Expression $node
+     */
+    public function refactor(Node $node) : ?Node
+    {
+        if (!$node->expr instanceof Ternary) {
+            return null;
+        }
+        $ternary = $node->expr;
+        if (!$ternary->if instanceof Expr) {
+            return null;
+        }
+        if ($this->sideEffectNodeDetector->detect($ternary->else)) {
+            return null;
+        }
+        return new If_($ternary->cond, ['stmts' => [new Expression($ternary->if)]]);
+    }
+}

rules/CodingStyle/Rector/Property/InlineSimplePropertyAnnotationRector.php

@@ -50,7 +50,7 @@ final class SomeClass
     /** @phpstan-var string */
     private const TEXT = 'text';
 
-    /** @var DateTime[]|null */
+    /** @var DateTime[] */
     private ?array $dateTimes;
 }
 CODE_SAMPLE

src/Application/VersionResolver.php

@@ -16,11 +16,11 @@ final class VersionResolver
     /**
      * @var string
      */
-    public const PACKAGE_VERSION = '407ad5fc5e4766fcc41043b0c8558b98aa08caea';
+    public const PACKAGE_VERSION = '7c8b23b02d49c397deb2cf194f0e0bfeef6ea90c';
     /**
      * @var string
      */
-    public const RELEASE_DATE = '2022-06-29 16:40:34';
+    public const RELEASE_DATE = '2022-06-29 15:50:24';
     /**
      * @var int
      */

vendor/autoload.php

@@ -9,4 +9,4 @@ if (PHP_VERSION_ID < 50600) {
 
 require_once __DIR__ . '/composer/autoload_real.php';
 
-return ComposerAutoloaderInitb47055983a31f5f0b99f7fdce24e8393::getLoader();
+return ComposerAutoloaderInit6836f15434ca6d9a0271618d614b8b14::getLoader();

vendor/composer/autoload_classmap.php

@@ -1353,6 +1353,7 @@ return array(
     'Rector\\CodeQuality\\Rector\\Do_\\DoWhileBreakFalseToIfElseRector' => $baseDir . '/rules/CodeQuality/Rector/Do_/DoWhileBreakFalseToIfElseRector.php',
     'Rector\\CodeQuality\\Rector\\Equal\\UseIdenticalOverEqualWithSameTypeRector' => $baseDir . '/rules/CodeQuality/Rector/Equal/UseIdenticalOverEqualWithSameTypeRector.php',
     'Rector\\CodeQuality\\Rector\\Expression\\InlineIfToExplicitIfRector' => $baseDir . '/rules/CodeQuality/Rector/Expression/InlineIfToExplicitIfRector.php',
+    'Rector\\CodeQuality\\Rector\\Expression\\TernaryFalseExpressionToIfRector' => $baseDir . '/rules/CodeQuality/Rector/Expression/TernaryFalseExpressionToIfRector.php',
     'Rector\\CodeQuality\\Rector\\For_\\ForRepeatedCountToOwnVariableRector' => $baseDir . '/rules/CodeQuality/Rector/For_/ForRepeatedCountToOwnVariableRector.php',
     'Rector\\CodeQuality\\Rector\\For_\\ForToForeachRector' => $baseDir . '/rules/CodeQuality/Rector/For_/ForToForeachRector.php',
     'Rector\\CodeQuality\\Rector\\Foreach_\\ForeachItemsAssignToEmptyArrayToAssignRector' => $baseDir . '/rules/CodeQuality/Rector/Foreach_/ForeachItemsAssignToEmptyArrayToAssignRector.php',

vendor/composer/autoload_real.php

@@ -2,7 +2,7 @@
 
 // autoload_real.php @generated by Composer
 
-class ComposerAutoloaderInitb47055983a31f5f0b99f7fdce24e8393
+class ComposerAutoloaderInit6836f15434ca6d9a0271618d614b8b14
 {
     private static $loader;
 
@@ -22,19 +22,19 @@ class ComposerAutoloaderInitb47055983a31f5f0b99f7fdce24e8393
             return self::$loader;
         }
 
-        spl_autoload_register(array('ComposerAutoloaderInitb47055983a31f5f0b99f7fdce24e8393', 'loadClassLoader'), true, true);
+        spl_autoload_register(array('ComposerAutoloaderInit6836f15434ca6d9a0271618d614b8b14', 'loadClassLoader'), true, true);
         self::$loader = $loader = new \Composer\Autoload\ClassLoader(\dirname(__DIR__));
-        spl_autoload_unregister(array('ComposerAutoloaderInitb47055983a31f5f0b99f7fdce24e8393', 'loadClassLoader'));
+        spl_autoload_unregister(array('ComposerAutoloaderInit6836f15434ca6d9a0271618d614b8b14', 'loadClassLoader'));
 
         require __DIR__ . '/autoload_static.php';
-        call_user_func(\Composer\Autoload\ComposerStaticInitb47055983a31f5f0b99f7fdce24e8393::getInitializer($loader));
+        call_user_func(\Composer\Autoload\ComposerStaticInit6836f15434ca6d9a0271618d614b8b14::getInitializer($loader));
 
         $loader->setClassMapAuthoritative(true);
         $loader->register(true);
 
-        $includeFiles = \Composer\Autoload\ComposerStaticInitb47055983a31f5f0b99f7fdce24e8393::$files;
+        $includeFiles = \Composer\Autoload\ComposerStaticInit6836f15434ca6d9a0271618d614b8b14::$files;
         foreach ($includeFiles as $fileIdentifier => $file) {
-            composerRequireb47055983a31f5f0b99f7fdce24e8393($fileIdentifier, $file);
+            composerRequire6836f15434ca6d9a0271618d614b8b14($fileIdentifier, $file);
         }
 
         return $loader;
@@ -46,7 +46,7 @@ class ComposerAutoloaderInitb47055983a31f5f0b99f7fdce24e8393
  * @param string $file
  * @return void
  */
-function composerRequireb47055983a31f5f0b99f7fdce24e8393($fileIdentifier, $file)
+function composerRequire6836f15434ca6d9a0271618d614b8b14($fileIdentifier, $file)
 {
     if (empty($GLOBALS['__composer_autoload_files'][$fileIdentifier])) {
         $GLOBALS['__composer_autoload_files'][$fileIdentifier] = true;

vendor/composer/autoload_static.php

@@ -4,7 +4,7 @@
 
 namespace Composer\Autoload;
 
-class ComposerStaticInitb47055983a31f5f0b99f7fdce24e8393
+class ComposerStaticInit6836f15434ca6d9a0271618d614b8b14
 {
     public static $files = array (
         '0e6d7bf4a5811bfa5cf40c5ccd6fae6a' => __DIR__ . '/..' . '/symfony/polyfill-mbstring/bootstrap.php',
@@ -1660,6 +1660,7 @@ class ComposerStaticInitb47055983a31f5f0b99f7fdce24e8393
         'Rector\\CodeQuality\\Rector\\Do_\\DoWhileBreakFalseToIfElseRector' => __DIR__ . '/../..' . '/rules/CodeQuality/Rector/Do_/DoWhileBreakFalseToIfElseRector.php',
         'Rector\\CodeQuality\\Rector\\Equal\\UseIdenticalOverEqualWithSameTypeRector' => __DIR__ . '/../..' . '/rules/CodeQuality/Rector/Equal/UseIdenticalOverEqualWithSameTypeRector.php',
         'Rector\\CodeQuality\\Rector\\Expression\\InlineIfToExplicitIfRector' => __DIR__ . '/../..' . '/rules/CodeQuality/Rector/Expression/InlineIfToExplicitIfRector.php',
+        'Rector\\CodeQuality\\Rector\\Expression\\TernaryFalseExpressionToIfRector' => __DIR__ . '/../..' . '/rules/CodeQuality/Rector/Expression/TernaryFalseExpressionToIfRector.php',
         'Rector\\CodeQuality\\Rector\\For_\\ForRepeatedCountToOwnVariableRector' => __DIR__ . '/../..' . '/rules/CodeQuality/Rector/For_/ForRepeatedCountToOwnVariableRector.php',
         'Rector\\CodeQuality\\Rector\\For_\\ForToForeachRector' => __DIR__ . '/../..' . '/rules/CodeQuality/Rector/For_/ForToForeachRector.php',
         'Rector\\CodeQuality\\Rector\\Foreach_\\ForeachItemsAssignToEmptyArrayToAssignRector' => __DIR__ . '/../..' . '/rules/CodeQuality/Rector/Foreach_/ForeachItemsAssignToEmptyArrayToAssignRector.php',
@@ -3416,9 +3417,9 @@ class ComposerStaticInitb47055983a31f5f0b99f7fdce24e8393
     public static function getInitializer(ClassLoader $loader)
     {
         return \Closure::bind(function () use ($loader) {
-            $loader->prefixLengthsPsr4 = ComposerStaticInitb47055983a31f5f0b99f7fdce24e8393::$prefixLengthsPsr4;
-            $loader->prefixDirsPsr4 = ComposerStaticInitb47055983a31f5f0b99f7fdce24e8393::$prefixDirsPsr4;
-            $loader->classMap = ComposerStaticInitb47055983a31f5f0b99f7fdce24e8393::$classMap;
+            $loader->prefixLengthsPsr4 = ComposerStaticInit6836f15434ca6d9a0271618d614b8b14::$prefixLengthsPsr4;
+            $loader->prefixDirsPsr4 = ComposerStaticInit6836f15434ca6d9a0271618d614b8b14::$prefixDirsPsr4;
+            $loader->classMap = ComposerStaticInit6836f15434ca6d9a0271618d614b8b14::$classMap;
 
         }, null, ClassLoader::class);
     }