update to recent nikic/php-parser; helps with formatting

composer.json

@@ -10,7 +10,7 @@
         "php": "^7.1",
         "beberlei/assert": "^2.7",
         "nette/utils": "^2.4",
-        "nikic/php-parser": "4.0.x-dev#ed8a744c as 3.1.1",
+        "nikic/php-parser": "4.0.x-dev#3193f7a as 3.1.1",
         "rector/better-reflection": "^3.0",
         "symfony/console": "^3.3",
         "symfony/dependency-injection": "^3.3",

src/Node/Attribute.php

@@ -28,6 +28,14 @@ final class Attribute
      */
     public const SCOPE_NODE = 'scopeNode';
 
+    /**
+     * System name.
+     * Do not change this even if you want!
+     *
+     * @var string
+     */
+    public const ORIGIGINAL_NODE = 'origNode';
+
     /**
      * System name to be found in @see \PhpParser\NodeVisitor\NameResolver
      * Do not change this even if you want!

src/NodeVisitor/PropertyToClassAdder.php

@@ -8,6 +8,7 @@ use PhpParser\NodeVisitorAbstract;
 use Rector\Builder\Class_\ClassPropertyCollector;
 use Rector\Builder\ConstructorMethodBuilder;
 use Rector\Builder\PropertyBuilder;
+use Rector\Node\Attribute;
 
 /**
  * Adds new properties to class and to contructor.
@@ -65,7 +66,7 @@ final class PropertyToClassAdder extends NodeVisitorAbstract
         }
 
         // prevents offset errors
-        $classNode->setAttribute('origNode', null);
+        $classNode->setAttribute(Attribute::ORIGIGINAL_NODE, null);
 
         foreach ($propertiesForClass as $propertyType => $propertyName) {
             $this->constructorMethodBuilder->addPropertyAssignToClass($classNode, $propertyType, $propertyName);

src/NodeVisitor/StatementToMethodAdder.php

@@ -7,6 +7,7 @@ use PhpParser\Node\Stmt\Class_;
 use PhpParser\Node\Stmt\ClassMethod;
 use PhpParser\NodeVisitorAbstract;
 use Rector\Builder\Method\MethodStatementCollector;
+use Rector\Node\Attribute;
 
 /**
  * Adds new statements to method.
@@ -58,7 +59,7 @@ final class StatementToMethodAdder extends NodeVisitorAbstract
 
         /** @var Node $parentNode */
         $parentNode = $classMethodNode->getAttribute('parentNode');
-        $parentNode->setAttribute('origNode', null);
+        $parentNode->setAttribute(Attribute::ORIGIGINAL_NODEq, null);
 
         return $classMethodNode;
     }

src/Rector/Contrib/Nette/Utils/MagicMethodRector.php

@@ -110,6 +110,8 @@ final class MagicMethodRector extends AbstractRector
             $this->docBlockAnalyzer->removeAnnotationFromNode($classNode, 'method', $methodName);
         }
 
+        $classNode->setAttribute(Attribute::ORIGIGINAL_NODE, null);
+
         return $classNode;
     }
 

src/Rector/Contrib/Nette/Utils/NetteObjectToSmartTraitRector.php

@@ -63,6 +63,8 @@ final class NetteObjectToSmartTraitRector extends AbstractRector
 
         $this->removeParentClass($classNode);
 
+        $classNode->setAttribute(Attribute::ORIGIGINAL_NODE, null);
+
         return $classNode;
     }
 

src/Rector/Dynamic/NamespaceReplacerRector.php

@@ -69,7 +69,7 @@ final class NamespaceReplacerRector extends AbstractRector
             }
 
             $node->parts = explode('\\', $newName);
-            $node->setAttribute('origNode', null);
+            $node->setAttribute(Attribute::ORIGIGINAL_NODE, null);
 
             return $node;
         }

src/Rector/Dynamic/PseudoNamespaceToNamespaceRector.php

@@ -92,7 +92,7 @@ final class PseudoNamespaceToNamespaceRector extends AbstractRector
                 $this->oldToNewUseStatements[$oldName] = $lastNewNamePart;
             } elseif (isset($this->oldToNewUseStatements[$oldName])) {
                 // to prevent "getComments() on string" error
-                $nameOrIdentifierNode->setAttribute('origNode', null);
+                $nameOrIdentifierNode->setAttribute(Attribute::ORIGIGINAL_NODE, null);
                 $newNameParts = [$this->oldToNewUseStatements[$oldName]];
             }
 

tests/Rector/Dynamic/PseudoNamespaceToNamespaceRector/correct/correct3.php.inc

@@ -1,8 +1,7 @@
-<?php
-
-declare(strict_types=1);
+<?php declare(strict_types=1);
 namespace PHPUnit;
 
+
 class TestCase
 {
-}
+}