Upgrade to PHP-Parser 4 (#203)

humbug · May 28, 2018 · 91fae9c · 91fae9c
1 parent 36378fb
commit 91fae9c
Show file tree

Hide file tree

Showing 6 changed files with 34 additions and 32 deletions.
diff --git a/composer.json b/composer.json
@@ -19,9 +19,9 @@
 
     "require": {
         "php": "^7.1",
-        "nikic/php-parser": "^3.0",
+        "nikic/php-parser": "^4.0",
         "ocramius/package-versions": "^1.1",
-        "roave/better-reflection": "^2.0",
+        "roave/better-reflection": "^3.0",
         "symfony/console": "^3.2 || ^4.0",
         "symfony/filesystem": "^3.2 || ^4.0",
         "symfony/finder": "^3.2 || ^4.0"

diff --git a/composer.lock b/composer.lock
diff --git a/src/PhpParser/NodeTraverser.php b/src/PhpParser/NodeTraverser.php
@@ -41,7 +41,7 @@ public function __construct(string $prefix)
     /**
      * @inheritdoc
      */
-    public function traverse(array $nodes)
+    public function traverse(array $nodes): array
     {
         $nodes = $this->wrapInNamespace($nodes);
         $nodes = $this->replaceGroupUseStatements($nodes);

diff --git a/src/PhpParser/NodeVisitor/Collection/UseStmtCollection.php b/src/PhpParser/NodeVisitor/Collection/UseStmtCollection.php
@@ -71,7 +71,7 @@ public function findStatementForNode(?Name $namespaceName, Name $node): ?Name
         foreach ($useStatements as $use_) {
             foreach ($use_->uses as $useStatement) {
                 if ($useStatement instanceof UseUse) {
-                    if ($name === strtolower($useStatement->alias)) {
+                    if ($name === $useStatement->getAlias()->toLowerString()) {
                         if ($parentNode instanceof FuncCall && 1 === count($node->parts)) {
                             if (Use_::TYPE_FUNCTION === $use_->type) {
                                 return $useStatement->name;

diff --git a/src/PhpParser/NodeVisitor/WhitelistedClassAppender.php b/src/PhpParser/NodeVisitor/WhitelistedClassAppender.php
@@ -22,6 +22,7 @@
 use PhpParser\Node\Name\FullyQualified;
 use PhpParser\Node\Scalar\String_;
 use PhpParser\Node\Stmt\Class_;
+use PhpParser\Node\Stmt\Expression;
 use PhpParser\Node\Stmt\Interface_;
 use PhpParser\Node\Stmt\Namespace_;
 use PhpParser\NodeVisitorAbstract;
@@ -89,21 +90,21 @@ private function appendToNamespaceStmt(Namespace_ $namespace): Namespace_
             }
 
             /** @var Class_ $stmt */
-            $name = FullyQualified::concat($namespace->name, $stmt->name);
+            $name = FullyQualified::concat((string) $namespace->name, (string) $stmt->name);
             $originalName = $name->slice(1);
 
             if (false === in_array((string) $originalName, $this->whitelist, true)) {
                 continue;
             }
 
-            $newStmts[] = new FuncCall(
+            $newStmts[] = new Expression(new FuncCall(
                 new Name('class_alias'),
                 [
                     new Arg(
-                        new String_($name)
+                        new String_((string) $name)
                     ),
                     new Arg(
-                        new String_($originalName)
+                        new String_((string) $originalName)
                     ),
                     new Arg(
                         new ConstFetch(
@@ -112,7 +113,7 @@ private function appendToNamespaceStmt(Namespace_ $namespace): Namespace_
                     ),
                 ],
                 ['whitelist_class_alias' => true]
-            );
+            ));
         }
 
         $namespace->stmts = $newStmts;

diff --git a/tests/PhpParser/FakeParser.php b/tests/PhpParser/FakeParser.php
@@ -22,7 +22,7 @@ final class FakeParser implements Parser
     /**
      * @inheritdoc
      */
-    public function parse($code, ErrorHandler $errorHandler = null)
+    public function parse(string $code, ErrorHandler $errorHandler = null)
     {
         throw new \LogicException();
     }