Refactor to stop using AbstractScopeAwareRector (#195)

Author: peterfox

src/Rector/FuncCall/RemoveRedundantValueCallsRector.php

@@ -5,17 +5,16 @@
 use PhpParser\Node;
 use PhpParser\Node\Expr\FuncCall;
 use PhpParser\Node\Name;
-use PHPStan\Analyser\Scope;
 use PHPStan\Type\ClosureType;
 use PHPStan\Type\MixedType;
-use Rector\Rector\AbstractScopeAwareRector;
+use Rector\Rector\AbstractRector;
 use Symplify\RuleDocGenerator\ValueObject\CodeSample\CodeSample;
 use Symplify\RuleDocGenerator\ValueObject\RuleDefinition;
 
 /**
  * @see \RectorLaravel\Tests\Rector\FuncCall\RemoveRedundantValueCallsRector\RemoveRedundantValueCallsRectorTest
  */
-class RemoveRedundantValueCallsRector extends AbstractScopeAwareRector
+class RemoveRedundantValueCallsRector extends AbstractRector
 {
     public function getRuleDefinition(): RuleDefinition
     {
@@ -32,7 +31,7 @@ public function getNodeTypes(): array
         return [FuncCall::class];
     }
 
-    public function refactorWithScope(Node $node, Scope $scope): ?Node
+    public function refactor(Node $node): ?Node
     {
         if (! $node instanceof FuncCall) {
             return null;
@@ -52,7 +51,7 @@ public function refactorWithScope(Node $node, Scope $scope): ?Node
             return null;
         }
 
-        if ($scope->getType($args[0]->value)->isSuperTypeOf(new ClosureType([], new MixedType, true))->no() === false) {
+        if ($this->getType($args[0]->value)->isSuperTypeOf(new ClosureType([], new MixedType, true))->no() === false) {
             return null;
         }
 

src/Rector/FuncCall/RemoveRedundantWithCallsRector.php

@@ -5,15 +5,14 @@
 use PhpParser\Node;
 use PhpParser\Node\Expr\FuncCall;
 use PhpParser\Node\Name;
-use PHPStan\Analyser\Scope;
-use Rector\Rector\AbstractScopeAwareRector;
+use Rector\Rector\AbstractRector;
 use Symplify\RuleDocGenerator\ValueObject\CodeSample\CodeSample;
 use Symplify\RuleDocGenerator\ValueObject\RuleDefinition;
 
 /**
  * @see \RectorLaravel\Tests\Rector\FuncCall\RemoveRedundantWithCallsRector\RemoveRedundantWithCallsRectorTest
  */
-class RemoveRedundantWithCallsRector extends AbstractScopeAwareRector
+class RemoveRedundantWithCallsRector extends AbstractRector
 {
     public function getRuleDefinition(): RuleDefinition
     {
@@ -30,7 +29,7 @@ public function getNodeTypes(): array
         return [FuncCall::class];
     }
 
-    public function refactorWithScope(Node $node, Scope $scope): ?Node
+    public function refactor(Node $node): ?Node
     {
         if (! $node instanceof FuncCall) {
             return null;
@@ -51,7 +50,7 @@ public function refactorWithScope(Node $node, Scope $scope): ?Node
         }
 
         if (count($args) === 2) {
-            $secondArgumentType = $scope->getType($args[1]->value);
+            $secondArgumentType = $this->getType($args[1]->value);
 
             if ($secondArgumentType->isCallable()->no() === false) {
                 return null;