Feature/php parser 4

composer.json

@@ -22,7 +22,7 @@
     "require": {
         "php": ">=7.1",
         "psr/log": "~1.0",
-        "nikic/php-parser": "^3.0",
+        "nikic/php-parser": "^4.0",
         "phpdocumentor/reflection-docblock": "^5"
     },
     "require-dev": {

phive.xml

@@ -1,4 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <phive xmlns="https://phar.io/phive">
-  <phar name="phpstan" version="^0.9.1" installed="0.9.1" location="./tools/phpstan"/>
+  <phar name="phpstan" version="^0.9.1" installed="0.10.2" location="./tools/phpstan" copy="true"/>
+  <phar name="phpunit" version="^6.0" installed="6.5.5" location="./tools/phpunit" copy="true"/>
 </phive>

phpstan.neon

@@ -11,6 +11,9 @@ parameters:
         - '#Access to an undefined property PhpParser\\Node\\Const_::\$fqsen\.#'
         - '#Access to an undefined property PhpParser\\Node\\Stmt\\PropertyProperty::\$fqsen\.#'
         #
+        # src/phpDocumentor/Reflection/Php/Factory/Argument.php
+        - '#Access to an undefined property PhpParser\\Node\\Expr\\Error\|PhpParser\\Node\\Expr\\Variable::\$name\.#'
+        #
         # src/phpDocumentor/Reflection/Php/Factory/Class_.php
         - '#Access to an undefined property PhpParser\\Node\\Stmt\\Class_::\$fqsen\.#'
         #
@@ -19,7 +22,7 @@ parameters:
         #
         #
         # this is a mismatch inside php-parser, not reflection
-        - '#Parameter \#1 \$nodes of method PhpParser\\NodeTraverser::traverse\(\) expects array\<PhpParser\\Node>, array\<PhpParser\\Node>\|null given\.#'
+        - '#Parameter \#1 \$nodes of method PhpParser\\NodeTraverser::traverse\(\) expects array\<PhpParser\\Node>, array\<PhpParser\\Node\\Stmt\>|null given\.#'
         #
         #
         # there is one test case that prevents changing PropertyIterator::getDefault() to just return Expr (this is set in PhpParser)

src/phpDocumentor/Reflection/File/LocalFile.php

@@ -40,7 +40,7 @@ public function __construct(string $path)
      */
     public function getContents(): string
     {
-        return file_get_contents($this->path);
+        return (string) file_get_contents($this->path);
     }
 
     /**

src/phpDocumentor/Reflection/NodeVisitor/ElementNameResolver.php

@@ -134,6 +134,6 @@ private function buildName(): string
             $name .= $part;
         }
 
-        return rtrim($name, '\\');
+        return rtrim((string) $name, '\\');
     }
 }

src/phpDocumentor/Reflection/Php/Factory/Argument.php

@@ -19,7 +19,9 @@
 use phpDocumentor\Reflection\Php\StrategyContainer;
 use phpDocumentor\Reflection\PrettyPrinter;
 use phpDocumentor\Reflection\Types\Context;
+use PhpParser\Node\Expr\Variable;
 use PhpParser\Node\Param;
+use Webmozart\Assert\Assert;
 
 /**
  * Strategy to convert Param to Argument
@@ -59,11 +61,13 @@ public function matches($object): bool
      */
     protected function doCreate($object, StrategyContainer $strategies, ?Context $context = null)
     {
+        Assert::isInstanceOf($object, Param::class);
+        Assert::isInstanceOf($object->var, Variable::class);
         $default = null;
         if ($object->default !== null) {
             $default = $this->valueConverter->prettyPrintExpr($object->default);
         }
 
-        return new ArgumentDescriptor($object->name, $default, $object->byRef, $object->variadic);
+        return new ArgumentDescriptor((string) $object->var->name, $default, $object->byRef, $object->variadic);
     }
 }

src/phpDocumentor/Reflection/Php/Factory/ClassConstantIterator.php

@@ -58,7 +58,7 @@ public function getLine(): int
      */
     public function getName(): string
     {
-        return $this->classConstants->consts[$this->index]->name;
+        return (string) $this->classConstants->consts[$this->index]->name;
     }
 
     /**

src/phpDocumentor/Reflection/Php/Factory/PropertyIterator.php

@@ -104,7 +104,7 @@ public function getDocComment(): ?Doc
      */
     public function getName(): string
     {
-        return $this->property->props[$this->index]->name;
+        return (string) $this->property->props[$this->index]->name;
     }
 
     /**

src/phpDocumentor/Reflection/PrettyPrinter.php

@@ -57,6 +57,6 @@ public function pScalar_String(String_ $node): string
             return $node->value;
         }
 
-        return $this->pNoIndent($node->getAttribute('originalValue'));
+        return (string) $node->getAttribute('originalValue');
     }
 }

tests/unit/phpDocumentor/Reflection/Php/Factory/ArgumentTest.php

@@ -54,7 +54,7 @@ public function testCreate()
         $factory = new ProjectFactoryStrategies([]);
 
         $argMock = m::mock(Param::class);
-        $argMock->name = 'myArgument';
+        $argMock->var = new \PhpParser\Node\Expr\Variable('myArgument');
         $argMock->default = new String_('MyDefault');
         $argMock->byRef = true;
         $argMock->variadic = true;

tests/unit/phpDocumentor/Reflection/Php/Factory/ClassConstantIteratorTest.php

@@ -42,9 +42,9 @@ protected function tearDown()
     public function testIterateProps()
     {
         $const1 = new Const_('\Space\MyClass::MY_CONST1', new Variable('a'));
-        $const1->fqsen = new Fqsen($const1->name);
+        $const1->fqsen = new Fqsen((string) $const1->name);
         $const2 = new Const_('\Space\MyClass::MY_CONST2', new Variable('b'));
-        $const2->fqsen = new Fqsen($const2->name);
+        $const2->fqsen = new Fqsen((string) $const2->name);
 
         $classConstantNode = new ClassConst([$const1, $const2]);