[Core] Remove BetterStandardPrinter::pStmt_Class() (#3072)

Co-authored-by: GitHub Action <action@github.com>
rectorphp · Nov 17, 2022 · a8f322a · a8f322a
1 parent 8ac960d
commit a8f322a
Show file tree

Hide file tree

Showing 3 changed files with 7 additions and 36 deletions.
diff --git a/rules/CodeQuality/Rector/Empty_/SimplifyEmptyCheckOnEmptyArrayRector.php b/rules/CodeQuality/Rector/Empty_/SimplifyEmptyCheckOnEmptyArrayRector.php
@@ -5,6 +5,7 @@
 namespace Rector\CodeQuality\Rector\Empty_;
 
 use PhpParser\Node;
+use PhpParser\Node\Expr;
 use PhpParser\Node\Expr\Array_;
 use PhpParser\Node\Expr\BinaryOp\Identical;
 use PhpParser\Node\Expr\Empty_;
@@ -54,18 +55,16 @@ public function refactorWithScope(Node $node, Scope $scope): ?Node
         return new Identical($node->expr, new Array_());
     }
 
-    private function isAllowedExpr(Node\Expr $expr): bool
+    private function isAllowedExpr(Expr $expr): bool
     {
         if ($expr instanceof Variable) {
             return true;
         }
+
         if ($expr instanceof PropertyFetch) {
             return true;
         }
-        if ($expr instanceof StaticPropertyFetch) {
-            return true;
-        }
 
-        return false;
+        return $expr instanceof StaticPropertyFetch;
     }
 }
diff --git a/rules/Removing/Rector/Class_/RemoveTraitUseRector.php b/rules/Removing/Rector/Class_/RemoveTraitUseRector.php
@@ -9,7 +9,6 @@
 use PhpParser\Node\Stmt\Trait_;
 use Rector\Core\Contract\Rector\ConfigurableRectorInterface;
 use Rector\Core\Rector\AbstractRector;
-use Rector\NodeTypeResolver\Node\AttributeKey;
 use Symplify\RuleDocGenerator\ValueObject\CodeSample\ConfiguredCodeSample;
 use Symplify\RuleDocGenerator\ValueObject\RuleDefinition;
 use Webmozart\Assert\Assert;
@@ -19,8 +18,6 @@
  */
 final class RemoveTraitUseRector extends AbstractRector implements ConfigurableRectorInterface
 {
-    private bool $classHasChanged = false;
-
     /**
      * @var string[]
      */
@@ -61,7 +58,7 @@ public function getNodeTypes(): array
      */
     public function refactor(Node $node): ?Node
     {
-        $this->classHasChanged = false;
+        $classHasChanged = false;
 
         foreach ($node->getTraitUses() as $traitUse) {
             foreach ($traitUse->traits as $trait) {
@@ -70,13 +67,11 @@ public function refactor(Node $node): ?Node
                 }
 
                 $this->removeNode($traitUse);
-                $this->classHasChanged = true;
+                $classHasChanged = true;
             }
         }
 
-        // invoke re-print
-        if ($this->classHasChanged) {
-            $node->setAttribute(AttributeKey::ORIGINAL_NODE, null);
+        if ($classHasChanged) {
             return $node;
         }
 

diff --git a/src/PhpParser/Printer/BetterStandardPrinter.php b/src/PhpParser/Printer/BetterStandardPrinter.php
@@ -25,7 +25,6 @@
 use PhpParser\Node\Stmt\ClassMethod;
 use PhpParser\Node\Stmt\Declare_;
 use PhpParser\Node\Stmt\Nop;
-use PhpParser\Node\Stmt\TraitUse;
 use PhpParser\Node\Stmt\Use_;
 use PhpParser\PrettyPrinter\Standard;
 use Rector\Comments\NodeDocBlock\DocBlockUpdater;
@@ -363,28 +362,6 @@ protected function pStmt_ClassMethod(ClassMethod $classMethod): string
         return Strings::replace($content, self::REPLACE_COLON_WITH_SPACE_REGEX, '$1: ');
     }
 
-    /**
-     * Clean class and trait from empty "use x;" for traits causing invalid code
-     */
-    protected function pStmt_Class(Class_ $class): string
-    {
-        $shouldReindex = false;
-
-        foreach ($class->stmts as $key => $stmt) {
-            // remove empty ones
-            if ($stmt instanceof TraitUse && $stmt->traits === []) {
-                unset($class->stmts[$key]);
-                $shouldReindex = true;
-            }
-        }
-
-        if ($shouldReindex) {
-            $class->stmts = array_values($class->stmts);
-        }
-
-        return parent::pStmt_Class($class);
-    }
-
     /**
      * It remove all spaces extra to parent
      */