From df6c20622afdd162042fa652a5df2b221a77861e Mon Sep 17 00:00:00 2001 From: GitHub Action Date: Wed, 3 Jul 2024 20:27:44 +0000 Subject: [PATCH] [ci-review] Rector Rectify --- .../NumericReturnTypeFromStrictReturnsRector.php | 3 ++- .../NumericReturnTypeFromStrictScalarReturnsRector.php | 3 ++- .../ReturnTypeFromStrictScalarReturnExprRector.php | 7 ------- 3 files changed, 4 insertions(+), 9 deletions(-) diff --git a/rules/TypeDeclaration/Rector/ClassMethod/NumericReturnTypeFromStrictReturnsRector.php b/rules/TypeDeclaration/Rector/ClassMethod/NumericReturnTypeFromStrictReturnsRector.php index 0373dd4e5a3..3a3202207b0 100644 --- a/rules/TypeDeclaration/Rector/ClassMethod/NumericReturnTypeFromStrictReturnsRector.php +++ b/rules/TypeDeclaration/Rector/ClassMethod/NumericReturnTypeFromStrictReturnsRector.php @@ -4,6 +4,7 @@ namespace Rector\TypeDeclaration\Rector\ClassMethod; +use PhpParser\Node\Expr\UnaryMinus; use PhpParser\Node; use PhpParser\Node\Expr; use PhpParser\Node\Identifier; @@ -152,7 +153,7 @@ private function isAlwaysNumeric(array $returns): bool foreach ($returns as $return) { $epxr = $return->expr; - if ($epxr instanceof Expr\UnaryMinus) { + if ($epxr instanceof UnaryMinus) { $epxr = $epxr->expr; } diff --git a/rules/TypeDeclaration/Rector/ClassMethod/NumericReturnTypeFromStrictScalarReturnsRector.php b/rules/TypeDeclaration/Rector/ClassMethod/NumericReturnTypeFromStrictScalarReturnsRector.php index 7aa5277c68d..5b4f780fd17 100644 --- a/rules/TypeDeclaration/Rector/ClassMethod/NumericReturnTypeFromStrictScalarReturnsRector.php +++ b/rules/TypeDeclaration/Rector/ClassMethod/NumericReturnTypeFromStrictScalarReturnsRector.php @@ -4,6 +4,7 @@ namespace Rector\TypeDeclaration\Rector\ClassMethod; +use PhpParser\Node\Expr\UnaryMinus; use PhpParser\Node; use PhpParser\Node\Identifier; use PhpParser\Node\Scalar\DNumber; @@ -85,7 +86,7 @@ public function refactorWithScope(Node $node, Scope $scope): ?Node foreach ($returns as $return) { $expr = $return->expr; - if ($expr instanceof Node\Expr\UnaryMinus) { + if ($expr instanceof UnaryMinus) { $expr = $expr->expr; } diff --git a/rules/TypeDeclaration/Rector/ClassMethod/ReturnTypeFromStrictScalarReturnExprRector.php b/rules/TypeDeclaration/Rector/ClassMethod/ReturnTypeFromStrictScalarReturnExprRector.php index 79a00c36f22..b5c3d83e560 100644 --- a/rules/TypeDeclaration/Rector/ClassMethod/ReturnTypeFromStrictScalarReturnExprRector.php +++ b/rules/TypeDeclaration/Rector/ClassMethod/ReturnTypeFromStrictScalarReturnExprRector.php @@ -28,11 +28,6 @@ final class ReturnTypeFromStrictScalarReturnExprRector extends AbstractScopeAwar */ public const HARD_CODED_ONLY = 'hard_coded_only'; - /** - * @api - */ - private bool $hardCodedOnly = false; - public function getRuleDefinition(): RuleDefinition { return new RuleDefinition('Change return type based on strict scalar returns - string, int, float or bool', [ @@ -108,7 +103,5 @@ public function configure(array $configuration): void { $hardCodedOnly = $configuration[self::HARD_CODED_ONLY] ?? false; Assert::boolean($hardCodedOnly); - - $this->hardCodedOnly = $hardCodedOnly; } }