include unary minus check

rectorphp · Jul 3, 2024 · e55b834 · e55b834
1 parent 2c1ae9b
commit e55b834
Show file tree

Hide file tree

Showing 4 changed files with 57 additions and 5 deletions.
diff --git a/...turnsRector/Fixture/direct_return.php.inc → ...Rector/Fixture/skip_direct_return.php.inc b/...turnsRector/Fixture/direct_return.php.inc → ...Rector/Fixture/skip_direct_return.php.inc
@@ -2,10 +2,15 @@
 
 namespace Rector\Tests\TypeDeclaration\Rector\ClassMethod\NumericReturnTypeFromStrictReturnsRector\Fixture;
 
-final class DirectReturn
+final class SkipDirectReturn
 {
     public function resolve()
     {
         return 1000;
     }
+
+    public function next()
+    {
+        return -400;
+    }
 }
diff --git a/...Method/NumericReturnTypeFromStrictScalarReturnsRector/Fixture/include_unary_minus.php.inc b/...Method/NumericReturnTypeFromStrictScalarReturnsRector/Fixture/include_unary_minus.php.inc
@@ -0,0 +1,37 @@
+<?php
+
+namespace Rector\Tests\TypeDeclaration\Rector\ClassMethod\NumericReturnTypeFromStrictScalarReturnsRector\Fixture;
+
+final class IncludeUnaryMinus
+{
+    public function resolve()
+    {
+        return -1000;
+    }
+
+    public function next()
+    {
+        return +1000;
+    }
+}
+
+?>
+-----
+<?php
+
+namespace Rector\Tests\TypeDeclaration\Rector\ClassMethod\NumericReturnTypeFromStrictScalarReturnsRector\Fixture;
+
+final class IncludeUnaryMinus
+{
+    public function resolve(): int
+    {
+        return -1000;
+    }
+
+    public function next()
+    {
+        return +1000;
+    }
+}
+
+?>
diff --git a/rules/TypeDeclaration/Rector/ClassMethod/NumericReturnTypeFromStrictReturnsRector.php b/rules/TypeDeclaration/Rector/ClassMethod/NumericReturnTypeFromStrictReturnsRector.php
@@ -151,11 +151,16 @@ private function isAlwaysNumeric(array $returns): bool
         $isAlwaysInt = true;
 
         foreach ($returns as $return) {
-            if (! $return->expr instanceof DNumber) {
+            $epxr = $return->expr;
+            if ($epxr instanceof Expr\UnaryMinus) {
+                $epxr = $epxr->expr;
+            }
+
+            if (! $epxr instanceof DNumber) {
                 $isAlwaysFloat = false;
             }
 
-            if (! $return->expr instanceof LNumber) {
+            if (! $epxr instanceof LNumber) {
                 $isAlwaysInt = false;
             }
         }

diff --git a/rules/TypeDeclaration/Rector/ClassMethod/NumericReturnTypeFromStrictScalarReturnsRector.php b/rules/TypeDeclaration/Rector/ClassMethod/NumericReturnTypeFromStrictScalarReturnsRector.php
@@ -84,11 +84,16 @@ public function refactorWithScope(Node $node, Scope $scope): ?Node
         $isAlwaysFloat = true;
 
         foreach ($returns as $return) {
-            if (! $return->expr instanceof DNumber) {
+            $expr = $return->expr;
+            if ($expr instanceof Node\Expr\UnaryMinus) {
+                $expr = $expr->expr;
+            }
+
+            if (! $expr instanceof DNumber) {
                 $isAlwaysFloat = false;
             }
 
-            if (! $return->expr instanceof LNumber) {
+            if (! $expr instanceof LNumber) {
                 $isAlwaysInt = false;
             }
         }