From 107f5640c598f1df96e5ba8934bfa3795b42f59b Mon Sep 17 00:00:00 2001
From: Abdul Malik Ikhsan <samsonasik@gmail.com>
Date: Thu, 13 Jul 2023 19:14:19 +0700
Subject: [PATCH 1/2] [NodeTypeResolver] Remove AttributeKey::IS_RETURN_EXPR
 from ContextNodeVisitor

---
 packages/NodeTypeResolver/Node/AttributeKey.php              | 5 -----
 .../PHPStan/Scope/NodeVisitor/ContextNodeVisitor.php         | 5 -----
 2 files changed, 10 deletions(-)

diff --git a/packages/NodeTypeResolver/Node/AttributeKey.php b/packages/NodeTypeResolver/Node/AttributeKey.php
index a45b0bf916a..9a96bf223e1 100644
--- a/packages/NodeTypeResolver/Node/AttributeKey.php
+++ b/packages/NodeTypeResolver/Node/AttributeKey.php
@@ -292,11 +292,6 @@ final class AttributeKey
      */
     public const IS_NEW_INSTANCE_NAME = 'is_new_instance_name';
 
-    /**
-     * @var string
-     */
-    public const IS_RETURN_EXPR = 'is_return_expr';
-
     /**
      * @var string
      */
diff --git a/packages/NodeTypeResolver/PHPStan/Scope/NodeVisitor/ContextNodeVisitor.php b/packages/NodeTypeResolver/PHPStan/Scope/NodeVisitor/ContextNodeVisitor.php
index e047d419ea0..4720ebe99e8 100644
--- a/packages/NodeTypeResolver/PHPStan/Scope/NodeVisitor/ContextNodeVisitor.php
+++ b/packages/NodeTypeResolver/PHPStan/Scope/NodeVisitor/ContextNodeVisitor.php
@@ -69,11 +69,6 @@ public function enterNode(Node $node): ?Node
             return null;
         }
 
-        if ($node instanceof Return_ && $node->expr instanceof Expr) {
-            $node->expr->setAttribute(AttributeKey::IS_RETURN_EXPR, true);
-            return null;
-        }
-
         if ($node instanceof Arg) {
             $node->value->setAttribute(AttributeKey::IS_ARG_VALUE, true);
             return null;

From f5eafae0ad8d6b742c783c4dac1b0437696c64d3 Mon Sep 17 00:00:00 2001
From: GitHub Action <actions@github.com>
Date: Thu, 13 Jul 2023 12:18:38 +0000
Subject: [PATCH 2/2] [ci-review] Rector Rectify

---
 .../PHPStan/Scope/NodeVisitor/ContextNodeVisitor.php            | 2 --
 1 file changed, 2 deletions(-)

diff --git a/packages/NodeTypeResolver/PHPStan/Scope/NodeVisitor/ContextNodeVisitor.php b/packages/NodeTypeResolver/PHPStan/Scope/NodeVisitor/ContextNodeVisitor.php
index 4720ebe99e8..237179ae61c 100644
--- a/packages/NodeTypeResolver/PHPStan/Scope/NodeVisitor/ContextNodeVisitor.php
+++ b/packages/NodeTypeResolver/PHPStan/Scope/NodeVisitor/ContextNodeVisitor.php
@@ -7,7 +7,6 @@
 use PhpParser\Node;
 use PhpParser\Node\Arg;
 use PhpParser\Node\Attribute;
-use PhpParser\Node\Expr;
 use PhpParser\Node\Expr\Array_;
 use PhpParser\Node\Expr\ArrayDimFetch;
 use PhpParser\Node\Expr\Closure;
@@ -26,7 +25,6 @@
 use PhpParser\Node\Stmt\Foreach_;
 use PhpParser\Node\Stmt\Function_;
 use PhpParser\Node\Stmt\If_;
-use PhpParser\Node\Stmt\Return_;
 use PhpParser\Node\Stmt\Unset_;
 use PhpParser\Node\Stmt\While_;
 use PhpParser\NodeTraverser;