From efb3c476c700fdd3a3a61819c4d1a6fdda91e741 Mon Sep 17 00:00:00 2001 From: Tomas Votruba Date: Fri, 10 May 2024 09:40:07 +0000 Subject: [PATCH] Updated Rector to commit ca2988edc997d76a1d7d4b2c6a4f7226478cac7c https://github.com/rectorphp/rector-src/commit/ca2988edc997d76a1d7d4b2c6a4f7226478cac7c [CodeQuality] Skip increment variable on else on TernaryFalseExpressionToIfRector (#5867) --- .../Expression/TernaryFalseExpressionToIfRector.php | 13 +++++++------ src/Application/VersionResolver.php | 4 ++-- 2 files changed, 9 insertions(+), 8 deletions(-) diff --git a/rules/CodeQuality/Rector/Expression/TernaryFalseExpressionToIfRector.php b/rules/CodeQuality/Rector/Expression/TernaryFalseExpressionToIfRector.php index 8fce3074e22..f5e838c3403 100644 --- a/rules/CodeQuality/Rector/Expression/TernaryFalseExpressionToIfRector.php +++ b/rules/CodeQuality/Rector/Expression/TernaryFalseExpressionToIfRector.php @@ -6,10 +6,11 @@ namespace Rector\CodeQuality\Rector\Expression; use PhpParser\Node; use PhpParser\Node\Expr; use PhpParser\Node\Expr\Ternary; +use PhpParser\Node\Expr\Variable; use PhpParser\Node\Stmt\Expression; use PhpParser\Node\Stmt\If_; use PHPStan\Analyser\Scope; -use Rector\DeadCode\SideEffect\SideEffectNodeDetector; +use Rector\NodeAnalyzer\ExprAnalyzer; use Rector\Rector\AbstractScopeAwareRector; use Symplify\RuleDocGenerator\ValueObject\CodeSample\CodeSample; use Symplify\RuleDocGenerator\ValueObject\RuleDefinition; @@ -20,12 +21,12 @@ final class TernaryFalseExpressionToIfRector extends AbstractScopeAwareRector { /** * @readonly - * @var \Rector\DeadCode\SideEffect\SideEffectNodeDetector + * @var \Rector\NodeAnalyzer\ExprAnalyzer */ - private $sideEffectNodeDetector; - public function __construct(SideEffectNodeDetector $sideEffectNodeDetector) + private $exprAnalyzer; + public function __construct(ExprAnalyzer $exprAnalyzer) { - $this->sideEffectNodeDetector = $sideEffectNodeDetector; + $this->exprAnalyzer = $exprAnalyzer; } public function getRuleDefinition() : RuleDefinition { @@ -70,7 +71,7 @@ CODE_SAMPLE if (!$ternary->if instanceof Expr) { return null; } - if ($this->sideEffectNodeDetector->detect($ternary->else, $scope) || $this->sideEffectNodeDetector->detectCallExpr($ternary->else, $scope)) { + if (!$ternary->else instanceof Variable && $this->exprAnalyzer->isDynamicExpr($ternary->else)) { return null; } return new If_($ternary->cond, ['stmts' => [new Expression($ternary->if)]]); diff --git a/src/Application/VersionResolver.php b/src/Application/VersionResolver.php index 0a3cac60ad8..9997b9df99a 100644 --- a/src/Application/VersionResolver.php +++ b/src/Application/VersionResolver.php @@ -19,12 +19,12 @@ final class VersionResolver * @api * @var string */ - public const PACKAGE_VERSION = '1.0.5'; + public const PACKAGE_VERSION = 'ca2988edc997d76a1d7d4b2c6a4f7226478cac7c'; /** * @api * @var string */ - public const RELEASE_DATE = '2024-05-10 10:25:34'; + public const RELEASE_DATE = '2024-05-10 16:36:07'; /** * @var int */