Update tests

src/main/QafooLabs/Refactoring/Adapters/PHPParser/Visitor/LocalVariableClassifier.php

@@ -58,7 +58,7 @@ private function enterAssignment(Node\Expr\Assign $node)
         if ($node->var instanceof Node\Expr\Variable) {
             $this->assignments[$node->var->name][] = $node->getLine();
             $this->seenAssignmentVariables->attach($node->var);
-        } else if ($node instanceof Node\Expr\ArrayDimFetch) {
+        } else if ($node->var instanceof Node\Expr\ArrayDimFetch) {
             // $foo[] = "baz" is both a read and a write access to $foo
             $this->localVariables[$node->var->var->name][] = $node->getLine();
             $this->assignments[$node->var->var->name][] = $node->getLine();

src/test/QafooLabs/Refactoring/Adapters/PHPParser/Visitor/LineRangeStatementCollectorTest.php

@@ -2,12 +2,10 @@
 
 namespace QafooLabs\Refactoring\Adapters\PHPParser\Visitor;
 
-use PHPParser_Parser;
-use PHPParser_Lexer;
-use PHPParser_NodeTraverser;
+use PhpParser\NodeTraverser;
+use PhpParser\ParserFactory;
 
 use QafooLabs\Refactoring\Domain\Model\LineRange;
-use QafooLabs\Refactoring\Adapters\PHPParser\Visitor\NodeConnector;
 
 class LineRangeStatementCollectorTest extends \PHPUnit_Framework_TestCase
 {
@@ -25,14 +23,14 @@ public function givenNestedStatements_WhenCollecting_ThenOnlyCollectTopLevel()
         $collectedStatements = $collector->getStatements();
 
         $this->assertCount(1, $collectedStatements);
-        $this->assertInstanceOf('PHPParser_Node_Expr_MethodCall', $collectedStatements[0]);
+        $this->assertInstanceOf('PHPParser\Node\Expr\MethodCall', $collectedStatements[0]);
     }
 
     private function traverse($stmts, $visitor)
     {
         $this->connect($stmts);
 
-        $traverser     = new PHPParser_NodeTraverser;
+        $traverser = new NodeTraverser();
         $traverser->addVisitor(new NodeConnector);
         $traverser->addVisitor($visitor);
         $traverser->traverse($stmts);
@@ -42,7 +40,7 @@ private function traverse($stmts, $visitor)
 
     private function connect($stmts)
     {
-        $traverser     = new PHPParser_NodeTraverser;
+        $traverser = new NodeTraverser();
         $traverser->addVisitor(new NodeConnector);
         return $traverser->traverse($stmts);
     }
@@ -58,7 +56,9 @@ private function statements($code)
             $code = "<?php\n" . $code;
         }
 
-        $parser = new PHPParser_Parser(new PHPParser_Lexer());
+        $parserFactory = new ParserFactory();
+        $parser = $parserFactory->create(ParserFactory::PREFER_PHP7);
+
         return $parser->parse($code);
 
     }

src/test/QafooLabs/Refactoring/Adapters/PHPParser/Visitor/LocalVariableClassifierTest.php

@@ -2,6 +2,9 @@
 
 namespace QafooLabs\Refactoring\Adapters\PHPParser\Visitor;
 
+use PhpParser\Node\Expr;
+use PhpParser\NodeTraverser;
+
 class LocalVariableClassifierTest extends \PHPUnit_Framework_TestCase
 {
     /**
@@ -10,7 +13,7 @@ class LocalVariableClassifierTest extends \PHPUnit_Framework_TestCase
     public function givenVariable_WhenClassification_ThenLocalVariableFound()
     {
         $classifier = new LocalVariableClassifier();
-        $variable = new \PHPParser_Node_Expr_Variable('foo');
+        $variable = new Expr\Variable('foo');
 
         $classifier->enterNode($variable);
 
@@ -23,9 +26,9 @@ public function givenVariable_WhenClassification_ThenLocalVariableFound()
     public function givenAssignment_WhenClassification_ThenAssignmentFound()
     {
         $classifier = new LocalVariableClassifier();
-        $assign = new \PHPParser_Node_Expr_Assign(
-            new \PHPParser_Node_Expr_Variable('foo'),
-            new \PHPParser_Node_Expr_Variable('bar')
+        $assign = new Expr\Assign(
+            new Expr\Variable('foo'),
+            new Expr\Variable('bar')
         );
 
         $classifier->enterNode($assign);
@@ -39,12 +42,12 @@ public function givenAssignment_WhenClassification_ThenAssignmentFound()
     public function givenAssignmentAndReadOfSameVariable_WhenClassification_ThenFindBoth()
     {
         $classifier = new LocalVariableClassifier();
-        $assign = new \PHPParser_Node_Expr_Assign(
-            new \PHPParser_Node_Expr_Variable('foo'),
-            new \PHPParser_Node_Expr_Variable('foo')
+        $assign = new Expr\Assign(
+            new Expr\Variable('foo'),
+            new Expr\Variable('foo')
         );
 
-        $traverser     = new \PHPParser_NodeTraverser;
+        $traverser = new NodeTraverser();
         $traverser->addVisitor($classifier);
         $traverser->traverse(array($assign));
 
@@ -58,7 +61,7 @@ public function givenAssignmentAndReadOfSameVariable_WhenClassification_ThenFind
     public function givenThisVariable_WhenClassification_ThenNoLocalVariables()
     {
         $classifier = new LocalVariableClassifier();
-        $variable = new \PHPParser_Node_Expr_Variable('this');
+        $variable = new Expr\Variable('this');
 
         $classifier->enterNode($variable);
 
@@ -71,7 +74,7 @@ public function givenThisVariable_WhenClassification_ThenNoLocalVariables()
     public function givenParam_WhenClassification_FindAsAssignment()
     {
         $classifier = new LocalVariableClassifier();
-        $variable = new \PHPParser_Node_Param('foo');
+        $variable = new \PhpParser\Node\Param('foo');
 
         $classifier->enterNode($variable);
 
@@ -86,11 +89,11 @@ public function givenArrayDimFetchASsignment_WhenClassification_FindAsAssignment
     {
         $classifier = new LocalVariableClassifier();
 
-        $assign = new \PHPParser_Node_Expr_Assign(
-            new \PHPParser_Node_Expr_ArrayDimFetch(
-                new \PHPParser_Node_Expr_Variable('foo')
+        $assign = new Expr\Assign(
+            new Expr\ArrayDimFetch(
+                new Expr\Variable('foo')
             ),
-            new \PHPParser_Node_Expr_Variable('bar')
+            new Expr\Variable('bar')
         );
 
         $classifier->enterNode($assign);

src/test/QafooLabs/Refactoring/Application/RenameLocalVariableTest.php

@@ -7,10 +7,6 @@
 use QafooLabs\Refactoring\Domain\Model\Variable;
 use QafooLabs\Refactoring\Domain\Model\DefinedVariables;
 
-use QafooLabs\Refactoring\Adapters\PHPParser\ParserVariableScanner;
-use QafooLabs\Refactoring\Adapters\TokenReflection\StaticCodeAnalysis;
-use QafooLabs\Refactoring\Adapters\Patches\PatchEditor;
-
 class RenameLocalVariableTest extends \PHPUnit_Framework_TestCase
 {
     public function setUp()
@@ -20,7 +16,7 @@ public function setUp()
         $this->editor = \Phake::mock('QafooLabs\Refactoring\Domain\Services\Editor');
         $this->refactoring = new RenameLocalVariable($this->scanner, $this->codeAnalysis, $this->editor);
 
-        \Phake::when($this->codeAnalysis)->isInsideMethod(\Phake::anyParameters())->thenReturn(true);
+        \Phake::when($this->codeAnalysis)->isLocalScope(\Phake::anyParameters())->thenReturn(true);
     }
 
     public function testRenameLocalVariable()