add few fixtures (#2279)

build/target-repository/docs/rector_rules_overview.md

@@ -1341,7 +1341,7 @@ Changes compared to value and return of expr to direct return
 ```diff
  $value = 'something';
 -if ($value === 52) {
--    return $value;
+-    return 52;
 -}
 -
  return $value;

rules-tests/CodeQuality/Rector/If_/SimplifyIfExactValueReturnValueRector/Fixture/skip_different_value.php.inc

@@ -0,0 +1,15 @@
+<?php
+
+namespace Rector\Tests\CodeQuality\Rector\If_\SimplifyIfExactValueReturnValueRector\Fixture;
+
+final class SkipDifferentValue
+{
+    public function run($value)
+    {
+        if ($value === 94) {
+            return 93;
+        }
+
+        return $value;
+    }
+}

rules-tests/CodeQuality/Rector/If_/SimplifyIfExactValueReturnValueRector/Fixture/skip_not_identical.php.inc

@@ -0,0 +1,15 @@
+<?php
+
+namespace Rector\Tests\CodeQuality\Rector\If_\SimplifyIfExactValueReturnValueRector\Fixture;
+
+final class SkipNotIdentical
+{
+    public function run($value)
+    {
+        if ($value !== 93) {
+            return 93;
+        }
+
+        return $value;
+    }
+}

rules/CodeQuality/Rector/If_/SimplifyIfExactValueReturnValueRector.php

@@ -5,6 +5,7 @@ declare(strict_types=1);
 namespace Rector\CodeQuality\Rector\If_;
 
 use PhpParser\Node;
+use PhpParser\Node\Expr;
 use PhpParser\Node\Stmt\If_;
 use PhpParser\Node\Stmt\Return_;
 use Rector\Core\NodeManipulator\IfManipulator;
@@ -32,7 +33,7 @@ final class SimplifyIfExactValueReturnValueRector extends AbstractRector
                     <<<'CODE_SAMPLE'
 $value = 'something';
 if ($value === 52) {
-    return $value;
+    return 52;
 }
 
 return $value;
@@ -60,21 +61,21 @@ CODE_SAMPLE
      */
     public function refactor(Node $node): ?Return_
     {
-        $comparedNode = $this->ifManipulator->matchIfValueReturnValue($node);
-        if ($comparedNode !== null) {
-            $nextNode = $node->getAttribute(AttributeKey::NEXT_NODE);
-            if (! $nextNode instanceof Return_) {
-                return null;
-            }
-
-            if (! $this->nodeComparator->areNodesEqual($comparedNode, $nextNode->expr)) {
-                return null;
-            }
-
-            $this->removeNode($nextNode);
-            return clone $nextNode;
+        $nextNode = $node->getAttribute(AttributeKey::NEXT_NODE);
+        if (! $nextNode instanceof Return_) {
+            return null;
         }
 
-        return null;
+        $comparedNode = $this->ifManipulator->matchIfValueReturnValue($node);
+        if (! $comparedNode instanceof Expr) {
+            return null;
+        }
+
+        if (! $this->nodeComparator->areNodesEqual($comparedNode, $nextNode->expr)) {
+            return null;
+        }
+
+        $this->removeNode($nextNode);
+        return clone $nextNode;
     }
 }

src/NodeManipulator/IfManipulator.php

@@ -79,8 +79,8 @@ final class IfManipulator
             return null;
         }
 
-        $insideIfNode = $stmts[0];
-        if (! $insideIfNode instanceof Return_) {
+        $insideIfStmt = $stmts[0];
+        if (! $insideIfStmt instanceof Return_) {
             return null;
         }
 
@@ -88,11 +88,11 @@ final class IfManipulator
             return null;
         }
 
-        if ($this->nodeComparator->areNodesEqual($if->cond->left, $insideIfNode->expr)) {
+        if ($this->nodeComparator->areNodesEqual($if->cond->left, $insideIfStmt->expr)) {
             return $if->cond->right;
         }
 
-        if ($this->nodeComparator->areNodesEqual($if->cond->right, $insideIfNode->expr)) {
+        if ($this->nodeComparator->areNodesEqual($if->cond->right, $insideIfStmt->expr)) {
             return $if->cond->left;
         }