Use nikic/PHP-Parser ~2.0

composer.json

@@ -8,7 +8,7 @@
     ],
 
     "require": {
-        "nikic/php-parser": "~1.2",
+        "nikic/php-parser": "~2.1",
         "beberlei/assert": "~2.3",
         "andrewsville/php-token-reflection": "~1.4",
         "symfony/finder": "~2.4",

src/main/QafooLabs/Refactoring/Adapters/PHPParser/ParserPhpNameScanner.php

@@ -2,30 +2,26 @@
 
 namespace QafooLabs\Refactoring\Adapters\PHPParser;
 
+use PhpParser\NodeTraverser;
+use PhpParser\ParserFactory;
 use QafooLabs\Refactoring\Adapters\PHPParser\Visitor\PhpNameCollector;
 use QafooLabs\Refactoring\Domain\Services\PhpNameScanner;
 use QafooLabs\Refactoring\Domain\Model\File;
-use QafooLabs\Refactoring\Domain\Model\LineRange;
-use QafooLabs\Refactoring\Domain\Model\UseStatement;
 use QafooLabs\Refactoring\Domain\Model\PhpName;
 use QafooLabs\Refactoring\Domain\Model\PhpNameOccurance;
 
-use PHPParser_Parser;
-use PHPParser_Lexer;
-use PHPParser_NodeTraverser;
-use PHPParser_Error;
-
 class ParserPhpNameScanner implements PhpNameScanner
 {
     public function findNames(File $file)
     {
-        $parser    = new PHPParser_Parser(new PHPParser_Lexer());
+        $parserFactory = new ParserFactory();
+        $parser = $parserFactory->create(ParserFactory::PREFER_PHP7);
         $collector = new PhpNameCollector();
-        $traverser = new PHPParser_NodeTraverser;
+        $traverser = new NodeTraverser();
 
         try {
             $stmts = $parser->parse($file->getCode());
-        } catch (PHPParser_Error $e) {
+        } catch (\PHPParser\Error $e) {
             throw new \RuntimeException("Error parsing " . $file->getRelativePath() .": " . $e->getMessage(), 0, $e);
         }
 

src/main/QafooLabs/Refactoring/Adapters/PHPParser/ParserVariableScanner.php

@@ -14,6 +14,8 @@
 
 namespace QafooLabs\Refactoring\Adapters\PHPParser;
 
+use PhpParser\NodeTraverser;
+use PhpParser\ParserFactory;
 use QafooLabs\Refactoring\Domain\Model\LineRange;
 use QafooLabs\Refactoring\Domain\Model\File;
 use QafooLabs\Refactoring\Domain\Model\DefinedVariables;
@@ -23,23 +25,17 @@
 use QafooLabs\Refactoring\Adapters\PHPParser\Visitor\LocalVariableClassifier;
 use QafooLabs\Refactoring\Adapters\PHPParser\Visitor\NodeConnector;
 
-use PHPParser_Parser;
-use PHPParser_Lexer;
-use PHPParser_Node;
-use PHPParser_Node_Stmt;
-use PHPParser_Node_Expr_FuncCall;
-use PHPParser_NodeTraverser;
-
 class ParserVariableScanner implements VariableScanner
 {
     public function scanForVariables(File $file, LineRange $range)
     {
-        $parser = new PHPParser_Parser(new PHPParser_Lexer());
+        $parserFactory = new ParserFactory();
+        $parser = $parserFactory->create(ParserFactory::PREFER_PHP7);
         $stmts = $parser->parse($file->getCode());
 
         $collector = new LineRangeStatementCollector($range);
 
-        $traverser     = new PHPParser_NodeTraverser;
+        $traverser = new NodeTraverser();
         $traverser->addVisitor(new NodeConnector);
         $traverser->addVisitor($collector);
 
@@ -52,7 +48,7 @@ public function scanForVariables(File $file, LineRange $range)
         }
 
         $localVariableClassifier = new LocalVariableClassifier();
-        $traverser     = new PHPParser_NodeTraverser;
+        $traverser = new NodeTraverser();
         $traverser->addVisitor($localVariableClassifier);
         $traverser->traverse($selectedStatements);
 

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

@@ -14,15 +14,14 @@
 
 namespace QafooLabs\Refactoring\Adapters\PHPParser\Visitor;
 
+use PhpParser\Node;
+use PhpParser\NodeVisitorAbstract;
 use QafooLabs\Refactoring\Domain\Model\LineRange;
-use PHPParser_Node;
-use PHPParser_Node_Stmt;
-use PHPParser_Node_Expr_FuncCall;
 
 /**
  * Given a line range, collect the AST slice that is inside that range.
  */
-class LineRangeStatementCollector extends \PHPParser_NodeVisitorAbstract
+class LineRangeStatementCollector extends NodeVisitorAbstract
 {
     /**
      * @var LineRange
@@ -36,7 +35,7 @@ public function __construct(LineRange $lineRange)
         $this->statements = new \SplObjectStorage();
     }
 
-    public function enterNode(PHPParser_Node $node)
+    public function enterNode(Node $node)
     {
         if ( ! $this->lineRange->isInRange($node->getLine())) {
             return;

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

@@ -14,19 +14,15 @@
 
 namespace QafooLabs\Refactoring\Adapters\PHPParser\Visitor;
 
-use PHPParser_Node;
-use PHPParser_NodeVisitorAbstract;
-use PHPParser_Node_Expr_Variable;
-use PHPParser_Node_Expr_Assign;
-use PHPParser_Node_Expr_ArrayDimFetch;
-use PHPParser_Node_Param;
+use PhpParser\Node;
+use PhpParser\NodeVisitorAbstract;
 use SplObjectStorage;
 
 /**
  * Classify local variables into assignments and usages,
  * permanent and temporary variables.
  */
-class LocalVariableClassifier extends PHPParser_NodeVisitorAbstract
+class LocalVariableClassifier extends NodeVisitorAbstract
 {
     private $localVariables = array();
     private $assignments = array();
@@ -37,40 +33,40 @@ public function __construct()
         $this->seenAssignmentVariables = new SplObjectStorage();
     }
 
-    public function enterNode(PHPParser_Node $node)
+    public function enterNode(Node $node)
     {
-        if ($node instanceof PHPParser_Node_Expr_Variable) {
+        if ($node instanceof Node\Expr\Variable) {
             $this->enterVariableNode($node);
         }
 
-        if ($node instanceof PHPParser_Node_Expr_Assign) {
+        if ($node instanceof Node\Expr\Assign) {
             $this->enterAssignment($node);
         }
 
-        if ($node instanceof PHPParser_Node_Param) {
+        if ($node instanceof Node\Param) {
             $this->enterParam($node);
         }
     }
 
-    private function enterParam($node)
+    private function enterParam(Node\Param $node)
     {
         $this->assignments[$node->name][] = $node->getLine();
     }
 
-    private function enterAssignment($node)
+    private function enterAssignment(Node\Expr\Assign $node)
     {
-        if ($node->var instanceof PHPParser_Node_Expr_Variable) {
+        if ($node->var instanceof Node\Expr\Variable) {
             $this->assignments[$node->var->name][] = $node->getLine();
             $this->seenAssignmentVariables->attach($node->var);
-        } else if ($node->var instanceof PHPParser_Node_Expr_ArrayDimFetch) {
+        } else if ($node 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();
             $this->seenAssignmentVariables->attach($node->var->var);
         }
     }
 
-    private function enterVariableNode($node)
+    private function enterVariableNode(Node\Expr\Variable $node)
     {
         if ($node->name === "this" || $this->seenAssignmentVariables->contains($node)) {
             return;

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

@@ -13,21 +13,21 @@
 
 namespace QafooLabs\Refactoring\Adapters\PHPParser\Visitor;
 
-use PHPParser_NodeVisitorAbstract;
-use PHPParser_Node;
+use PhpParser\Node;
+use PhpParser\NodeVisitorAbstract;
 
 /**
  * Connects the nodes.
  *
  * @author Johannes M. Schmitt <[email protected]>
  */
-class NodeConnector extends PHPParser_NodeVisitorAbstract
+class NodeConnector extends NodeVisitorAbstract
 {
-    public function enterNode(PHPParser_Node $node)
+    public function enterNode(Node $node)
     {
         $subNodes = array();
         foreach ($node as $subNode) {
-            if ($subNode instanceof PHPParser_Node) {
+            if ($subNode instanceof Node) {
                 $subNodes[] = $subNode;
                 continue;
             } else if (!is_array($subNode)) {
@@ -38,7 +38,7 @@ public function enterNode(PHPParser_Node $node)
         }
 
         for ($i=0,$c=count($subNodes); $i<$c; $i++) {
-            if (!$subNodes[$i] instanceof PHPParser_Node) {
+            if (!$subNodes[$i] instanceof Node) {
                 continue;
             }
 

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

@@ -13,19 +13,13 @@
 
 namespace QafooLabs\Refactoring\Adapters\PHPParser\Visitor;
 
-use PHPParser_Node;
-use PHPParser_Node_Name;
-use PHPParser_Node_Stmt_Namespace;
-use PHPParser_Node_Stmt_Use;
-use PHPParser_Node_Stmt_Class;
-use PHPParser_Node_Stmt_UseUse;
-use PHPParser_Node_Expr_New;
-use PHPParser_Node_Expr_StaticCall;
+use PhpParser\Node;
+use PhpParser\NodeVisitorAbstract;
 
 /**
  * Visitor for PHP Parser collecting PHP Names from an AST.
  */
-class PhpNameCollector extends \PHPParser_NodeVisitorAbstract
+class PhpNameCollector extends NodeVisitorAbstract
 {
     /**
      * @var array
@@ -40,11 +34,11 @@ class PhpNameCollector extends \PHPParser_NodeVisitorAbstract
      */
     private $currentNamespace;
 
-    public function enterNode(PHPParser_Node $node)
+    public function enterNode(Node $node)
     {
-        if ($node instanceof PHPParser_Node_Stmt_Use) {
+        if ($node instanceof Node\Stmt\Use_) {
             foreach ($node->uses as $use) {
-                if ($use instanceof PHPParser_Node_Stmt_UseUse) {
+                if ($use instanceof Node\Stmt\UseUse) {
                     $name = implode('\\', $use->name->parts);
 
                     $this->useStatements[$use->alias] = $name;
@@ -59,7 +53,7 @@ public function enterNode(PHPParser_Node $node)
         }
 
 
-        if ($node instanceof PHPParser_Node_Expr_New && $node->class instanceof PHPParser_Node_Name) {
+        if ($node instanceof Node\Expr\New_ && $node->class instanceof Node\Name) {
             $usedAlias = implode('\\', $node->class->parts);
 
             $this->nameDeclarations[] = array(
@@ -70,7 +64,7 @@ public function enterNode(PHPParser_Node $node)
             );
         }
 
-        if ($node instanceof PHPParser_Node_Expr_StaticCall && $node->class instanceof PHPParser_Node_Name) {
+        if ($node instanceof Node\Expr\StaticCall && $node->class instanceof Node\Name) {
             $usedAlias = implode('\\', $node->class->parts);
 
             $this->nameDeclarations[] = array(
@@ -81,7 +75,7 @@ public function enterNode(PHPParser_Node $node)
             );
         }
 
-        if ($node instanceof PHPParser_Node_Stmt_Class) {
+        if ($node instanceof Node\Stmt\Class_) {
             $className = $node->name;
 
             $this->nameDeclarations[] = array(
@@ -114,7 +108,7 @@ public function enterNode(PHPParser_Node $node)
             }
         }
 
-        if ($node instanceof PHPParser_Node_Stmt_Namespace) {
+        if ($node instanceof Node\Stmt\Namespace_) {
             $this->currentNamespace = implode('\\', $node->name->parts);
             $this->useStatements = array();