Add support for nikic/php-parser:^4 (#88)

* Add support for nikic/php-parser:^4

* cs

Author: Nyholm

.travis.yml

@@ -29,6 +29,8 @@ matrix:
         - php: 7.1
         - php: 7.2
           env: COVERAGE=true TEST_COMMAND="composer test-ci"
+        - php: 7.2
+          env: DEPENDENCIES="nikic/php-parser:^3"
 
           # Force some major versions of Symfony
         - php: 7.2

composer.json

@@ -10,7 +10,7 @@
     ],
     "require": {
         "php": "^5.5 || ^7.0",
-        "nikic/php-parser": "^3.0",
+        "nikic/php-parser": "^3.0 || ^4.0",
         "symfony/finder": "^2.7 || ^3.0 || ^4.0",
         "twig/twig": "^1.27 || ^2.0",
         "doctrine/annotations": "^1.2"

src/Visitor/Php/SourceLocationContainerVisitor.php

@@ -50,7 +50,8 @@ public function enterNode(Node $node)
         }
 
         if ($node instanceof Node\Stmt\UseUse) {
-            $this->useStatements[$node->alias] = implode('\\', $node->name->parts);
+            $key = isset($node->alias) ? $node->alias : $node->name->parts[count($node->name->parts) - 1];
+            $this->useStatements[$key] = implode('\\', $node->name->parts);
 
             return;
         }

src/Visitor/Php/Symfony/ContainerAwareTrans.php

@@ -30,10 +30,10 @@ public function enterNode(Node $node)
             return;
         }
 
-        if (!is_string($node->name)) {
+        if (!is_string($node->name) && !$node->name instanceof Node\Identifier) {
             return;
         }
-        $name = $node->name;
+        $name = (string) $node->name;
 
         //If $this->get('translator')->trans('foobar')
         if ('trans' === $name) {

src/Visitor/Php/Symfony/ContainerAwareTransChoice.php

@@ -30,10 +30,10 @@ public function enterNode(Node $node)
             return;
         }
 
-        if (!is_string($node->name)) {
+        if (!is_string($node->name) && !$node->name instanceof Node\Identifier) {
             return;
         }
-        $name = $node->name;
+        $name = (string) $node->name;
 
         //If $this->get('translator')->trans('foobar')
         if ('transChoice' === $name) {

src/Visitor/Php/Symfony/FlashMessage.php

@@ -30,11 +30,11 @@ public function enterNode(Node $node)
             return;
         }
 
-        if (!is_string($node->name)) {
+        if (!is_string($node->name) && !$node->name instanceof Node\Identifier) {
             return;
         }
 
-        $name = $node->name;
+        $name = (string) $node->name;
         $caller = $node->var;
         // $caller might be "Node\Expr\New_"
         $callerName = isset($caller->name) ? $caller->name : '';

src/Visitor/Php/Symfony/FormTypeLabelImplicit.php

@@ -31,7 +31,7 @@ public function enterNode(Node $node)
         $domain = null;
         // use add() function and look at first argument and if that's a string
         if ($node instanceof Node\Expr\MethodCall
-            && ('add' === $node->name || 'create' === $node->name)
+            && ('add' === (string) $node->name || 'create' === (string) $node->name)
             && $node->args[0]->value instanceof Node\Scalar\String_) {
             // now make sure we don't have 'label' in the array of options
             $customLabel = false;

tests/Functional/Visitor/Php/Symfony/FormTypeLabelTest.php

@@ -45,6 +45,9 @@ public function testTranslationDomain()
     {
         $collection = $this->getSourceLocations($this->allFormVisitors, Resources\Php\Symfony\FormDomainType::class);
 
+        // We should not have "test_d" or "test_e"
+        $this->assertEquals(3, $collection->count(), 'We should ignore choices where "translation_domain" is "false"');
+
         $messageA = $collection->get(0);
         $this->assertEquals('label1', $messageA->getMessage());
         $this->assertEquals('admin0', $messageA->getContext()['domain']);
@@ -56,8 +59,5 @@ public function testTranslationDomain()
         $messageC = $collection->get(2);
         $this->assertEquals('test_c', $messageC->getMessage());
         $this->assertNull($messageC->getContext()['domain']);
-
-        // We should not have "test_d" or "test_e"
-        $this->assertEquals(3, $collection->count(), 'We should ignore choices where "translation_domain" is "false"');
     }
 }