Merge pull request #3 from open-code-modeling/fix/order_of_constants

Fix order of class constants does not match w/visitor order

Author: codeliner

src/NodeVisitor/ClassConstant.php

@@ -31,7 +31,7 @@ public function __construct(IdentifierGenerator $lineGenerator)
 
     public static function forClassConstant(
         string $constantName,
-        string $constantValue,
+        $constantValue,
         int $flags = ClassConstGenerator::FLAG_PUBLIC
     ): ClassConstant {
         return new self(
@@ -56,8 +56,8 @@ public function afterTraverse(array $nodes): ?array
                             return null;
                         }
                         $stmt->stmts = \array_merge(
-                            $this->lineGenerator->generate(),
-                            $stmt->stmts
+                            $stmt->stmts,
+                            $this->lineGenerator->generate()
                         );
                     }
                 }
@@ -66,8 +66,8 @@ public function afterTraverse(array $nodes): ?array
                     return null;
                 }
                 $node->stmts = \array_merge(
-                    $this->lineGenerator->generate(),
-                    $node->stmts
+                    $node->stmts,
+                    $this->lineGenerator->generate()
                 );
             }
         }

tests/NodeVisitor/ClassConstantTest.php

@@ -9,6 +9,8 @@
 use OpenCodeModeling\CodeAst\NodeVisitor\ClassConstant;
 use OpenCodeModeling\CodeAst\NodeVisitor\ClassFile;
 use OpenCodeModeling\CodeAst\NodeVisitor\ClassNamespace;
+use OpenCodeModeling\CodeAst\NodeVisitor\ClassUseTrait;
+use OpenCodeModeling\CodeAst\NodeVisitor\NamespaceUse;
 use OpenCodeModeling\CodeAst\NodeVisitor\StrictType;
 use OpenCodeModeling\JsonSchemaToPhpAst\ValueObject\BooleanFactory;
 use PhpParser\NodeTraverser;
@@ -137,6 +139,40 @@ class TestClass
 {
     private const TYPE_STRING = 'string';
 }
+EOF;
+
+        $this->assertSame($expected, $this->printer->prettyPrintFile($nodeTraverser->traverse($ast)));
+    }
+
+    /**
+     * @test
+     */
+    public function it_preserves_order_of_registered_visitors()
+    {
+        $ast = $this->parser->parse('');
+
+        $nodeTraverser = new NodeTraverser();
+        $nodeTraverser->addVisitor(new StrictType());
+        $nodeTraverser->addVisitor(new ClassNamespace('My\\Awesome\\Service'));
+        $nodeTraverser->addVisitor(new NamespaceUse('My\\Awesome\\ServiceTrait'));
+        $nodeTraverser->addVisitor(new ClassFile(new ClassGenerator('TestClass')));
+        $nodeTraverser->addVisitor(new ClassUseTrait('ServiceTrait'));
+        $nodeTraverser->addVisitor(ClassConstant::forClassConstant('TYPE_STRING', 'string'));
+        $nodeTraverser->addVisitor(ClassConstant::forClassConstant('TYPE_INT', 3));
+
+        $expected = <<<'EOF'
+<?php
+
+declare (strict_types=1);
+namespace My\Awesome\Service;
+
+use My\Awesome\ServiceTrait;
+class TestClass
+{
+    use ServiceTrait;
+    public const TYPE_STRING = 'string';
+    public const TYPE_INT = 3;
+}
 EOF;
 
         $this->assertSame($expected, $this->printer->prettyPrintFile($nodeTraverser->traverse($ast)));