Update test badge

split: 39dd7c399e46a9a22490c061a2c91d3ef1579af6

Author: kylekatarnls

Parser.php

@@ -330,8 +330,8 @@ public function parse($input, $path = null)
 
         foreach ($expandingNodes as $expandingNode) {
             $current = $expandingNode;
-            while ($outerNode = $expandingNode->getOuterNode()) {
 
+            while ($outerNode = $expandingNode->getOuterNode()) {
                 /** @var NodeInterface $expandedNode */
                 $expandedNode = $outerNode;
                 $current->setOuterNode(null);

Parser/Event/NodeEvent.php

@@ -4,6 +4,7 @@
 
 use Phug\Event;
 use Phug\Parser\NodeInterface;
+use Phug\ParserEvent;
 
 class NodeEvent extends Event
 {
@@ -12,8 +13,8 @@ class NodeEvent extends Event
     /**
      * NodeEvent constructor.
      *
-     * @param $name
-     * @param NodeInterface $node
+     * @param ParserEvent::* $name
+     * @param NodeInterface  $node
      */
     public function __construct($name, NodeInterface $node)
     {

Parser/Node/AssignmentNode.php

@@ -4,11 +4,14 @@
 
 use Phug\Parser\Node;
 use Phug\Util\AttributesInterface;
+use Phug\Util\OrderableInterface;
 use Phug\Util\Partial\AttributeTrait;
 use Phug\Util\Partial\NameTrait;
+use Phug\Util\Partial\OrderTrait;
 
-class AssignmentNode extends Node implements AttributesInterface
+class AssignmentNode extends Node implements AttributesInterface, OrderableInterface
 {
     use NameTrait;
     use AttributeTrait;
+    use OrderTrait;
 }

Parser/Node/AttributeNode.php

@@ -3,17 +3,20 @@
 namespace Phug\Parser\Node;
 
 use Phug\Parser\Node;
+use Phug\Util\OrderableInterface;
 use Phug\Util\Partial\CheckTrait;
 use Phug\Util\Partial\EscapeTrait;
 use Phug\Util\Partial\NameTrait;
+use Phug\Util\Partial\OrderTrait;
 use Phug\Util\Partial\ValueTrait;
 use Phug\Util\Partial\VariadicTrait;
 
-class AttributeNode extends Node
+class AttributeNode extends Node implements OrderableInterface
 {
     use NameTrait;
     use ValueTrait;
     use EscapeTrait;
     use CheckTrait;
     use VariadicTrait;
+    use OrderTrait;
 }

Parser/Node/ElementNode.php

@@ -4,15 +4,18 @@
 
 use Phug\Parser\Node;
 use Phug\Util\AttributesInterface;
+use Phug\Util\AttributesOrderInterface;
 use Phug\Util\Partial\AssignmentTrait;
+use Phug\Util\Partial\AttributesOrderTrait;
 use Phug\Util\Partial\AttributeTrait;
 use Phug\Util\Partial\NameTrait;
 
-class ElementNode extends Node implements AttributesInterface
+class ElementNode extends Node implements AttributesInterface, AttributesOrderInterface
 {
     use NameTrait;
     use AttributeTrait;
     use AssignmentTrait;
+    use AttributesOrderTrait;
 
     /**
      * @var bool

Parser/Node/MixinCallNode.php

@@ -4,15 +4,18 @@
 
 use Phug\Parser\Node;
 use Phug\Util\AttributesInterface;
+use Phug\Util\AttributesOrderInterface;
 use Phug\Util\Partial\AssignmentTrait;
+use Phug\Util\Partial\AttributesOrderTrait;
 use Phug\Util\Partial\AttributeTrait;
 use Phug\Util\Partial\NameTrait;
 
-class MixinCallNode extends Node implements AttributesInterface
+class MixinCallNode extends Node implements AttributesInterface, AttributesOrderInterface
 {
     use NameTrait;
     use AttributeTrait;
     use AssignmentTrait;
+    use AttributesOrderTrait;
 
     /**
      * @var bool

Parser/Node/MixinNode.php

@@ -4,13 +4,16 @@
 
 use Phug\Parser\Node;
 use Phug\Util\AttributesInterface;
+use Phug\Util\AttributesOrderInterface;
 use Phug\Util\Partial\AssignmentTrait;
+use Phug\Util\Partial\AttributesOrderTrait;
 use Phug\Util\Partial\AttributeTrait;
 use Phug\Util\Partial\NameTrait;
 
-class MixinNode extends Node implements AttributesInterface
+class MixinNode extends Node implements AttributesInterface, AttributesOrderInterface
 {
     use NameTrait;
     use AttributeTrait;
     use AssignmentTrait;
+    use AttributesOrderTrait;
 }

Parser/TokenHandler/AssignmentTokenHandler.php

@@ -39,6 +39,7 @@ public function handleToken(TokenInterface $token, State $state)
 
         /** @var ElementNode|MixinCallNode $current */
         $current = $state->getCurrentNode();
+        $node->setOrder($current->getNextAttributeIndex());
         $current->getAssignments()->attach($node);
 
         if ($state->expectNext([AttributeStartToken::class])) {

Parser/TokenHandler/AttributeTokenHandler.php

@@ -10,6 +10,8 @@
 use Phug\Parser\Node\MixinCallNode;
 use Phug\Parser\State;
 use Phug\Parser\TokenHandlerInterface;
+use Phug\Util\AttributesOrderInterface;
+use Phug\Util\OrderableInterface;
 
 class AttributeTokenHandler implements TokenHandlerInterface
 {
@@ -46,8 +48,15 @@ public function handleToken(TokenInterface $token, State $state)
             }
         }
 
-        /** @var ElementNode|MixinCallNode $current */
+        /** @var ElementNode|MixinCallNode|AssignmentNode $current */
         $current = $state->getCurrentNode();
+
+        if ($current instanceof AttributesOrderInterface) {
+            $node->setOrder($current->getNextAttributeIndex());
+        } elseif ($current instanceof OrderableInterface) {
+            $node->setOrder($current->getOrder());
+        }
+
         $current->getAttributes()->attach($node);
     }
 }