gulp-phug 1.3.4 → 2.0.0

package/support/vendor/phug/phug/src/Phug/Lexer/Lexer/Scanner/AttributeScanner.php

@@ -30,7 +30,7 @@ class AttributeScanner implements ScannerInterface
         $expression = preg_replace('/
                 "(?:\\\\[\\S\\s]|[^"\\\\])*"|
                 \'(?:\\\\[\\S\\s]|[^\'\\\\])*\'
-            /x', '0', $expression);
+            /x', '0', (string) $expression);
         $expression = preg_replace('/\\s*(
                 (\\[([^\\[\\]]+|(?1))*\\]) |
                 (\\(([^\\(\\)]+|(?1))*\\)) |
@@ -42,6 +42,8 @@ class AttributeScanner implements ScannerInterface
 
     private function isTruncatedExpression(Reader $reader, &$expression)
     {
+        $expression = (string) $expression;
+
         if (mb_substr($expression, -3) === 'new' || mb_substr($expression, -5) === 'clone') {
             $expression .= $reader->getLastPeekResult();
             $reader->consume();
@@ -101,7 +103,7 @@ class AttributeScanner implements ScannerInterface
         $this->isTruncatedValue($expression);
     }
 
-    private function getAttributeValue(Reader $reader, array $chars = null)
+    private function getAttributeValue(Reader $reader, ?array $chars = null)
     {
         $chars = $chars ?: [
             ' ', "\t", "\n", ',', ')', '//',
@@ -118,13 +120,15 @@ class AttributeScanner implements ScannerInterface
         return $expression;
     }
 
-    private function readAttributeValue(Reader $reader, AttributeToken $token)
+    private function readAttributeValue(Reader $reader, AttributeToken $token, $expression = '')
     {
-        $expression = $this->getAttributeValue($reader);
+        $expression .= $this->getAttributeValue($reader);
+
         while ($this->isTruncatedExpression($reader, $expression)) {
             $this->skipComments($reader);
             $expression .= $this->getAttributeValue($reader);
         }
+
         $token->setValue($expression);
 
         //Ignore a comma if found
@@ -210,7 +214,7 @@ class AttributeScanner implements ScannerInterface
         $token->escape();
         $token->check();
 
-        if ($variadic = $reader->peekString('...')) {
+        if ($reader->peekString('...')) {
             $token->setIsVariadic(true);
             $reader->consume();
         }
@@ -218,9 +222,17 @@ class AttributeScanner implements ScannerInterface
         return $token;
     }
 
-    private function seedAttributeToken(State $state, AttributeToken $token, $expression)
+    private function seedAttributeToken(State $state, AttributeToken $token, $expression, array $options)
     {
         $reader = $state->getReader();
+        $allowName = isset($options['allow_name']) ? $options['allow_name'] : true;
+
+        if (!$allowName) {
+            $this->readAttributeValue($reader, $token, $expression);
+            $this->skipComments($reader);
+
+            return;
+        }
 
         $token->setName($expression);
 
@@ -252,7 +264,7 @@ class AttributeScanner implements ScannerInterface
         }
     }
 
-    private function scanParenthesesContent(State $state)
+    private function scanParenthesesContent(State $state, array $options)
     {
         $reader = $state->getReader();
 
@@ -263,7 +275,7 @@ class AttributeScanner implements ScannerInterface
                 continue;
             }
 
-            $this->seedAttributeToken($state, $token, $expression);
+            $this->seedAttributeToken($state, $token, $expression, $options);
 
             yield $token;
 
@@ -275,7 +287,7 @@ class AttributeScanner implements ScannerInterface
         }
     }
 
-    private function scanParentheses(State $state)
+    private function scanParentheses(State $state, array $options)
     {
         $reader = $state->getReader();
 
@@ -283,7 +295,7 @@ class AttributeScanner implements ScannerInterface
             return;
         }
 
-        foreach ($this->scanParenthesesContent($state) as $token) {
+        foreach ($this->scanParenthesesContent($state, $options) as $token) {
             yield $token;
         }
 
@@ -294,7 +306,7 @@ class AttributeScanner implements ScannerInterface
         }
     }
 
-    public function scan(State $state)
+    public function scan(State $state, array $options = [])
     {
         $reader = $state->getReader();
 
@@ -307,7 +319,7 @@ class AttributeScanner implements ScannerInterface
         $reader->consume();
         yield $state->endToken($start);
 
-        foreach ($this->scanParentheses($state) as $token) {
+        foreach ($this->scanParentheses($state, $options) as $token) {
             yield $token;
         }
 

package/support/vendor/phug/phug/src/Phug/Lexer/Lexer/Scanner/ConditionalScanner.php

@@ -26,7 +26,7 @@ class ConditionalScanner extends ControlStatementScanner
                 //Make sure spaces are replaced from `elseif`/`else if` to make a final keyword, "elseif"
                 $token->setName(preg_replace('/[ \t]/', '', $token->getName()));
 
-                if ($token->getName() === 'else' && !in_array($token->getSubject(), ['', false, null])) {
+                if ($token->getName() === 'else' && !in_array($token->getSubject(), ['', false, null], true)) {
                     $state->throwException(
                         'The `else`-conditional statement can\'t have a subject'
                     );

package/support/vendor/phug/phug/src/Phug/Lexer/Lexer/Scanner/FilterScanner.php

@@ -7,16 +7,18 @@
 namespace Phug\Lexer\Scanner;
 
 use Phug\Lexer\Analyzer\LineAnalyzer;
+use Phug\Lexer\Scanner\Partial\TrailingOutdentHandlerTrait;
 use Phug\Lexer\ScannerInterface;
 use Phug\Lexer\State;
 use Phug\Lexer\Token\FilterToken;
 use Phug\Lexer\Token\IndentToken;
 use Phug\Lexer\Token\NewLineToken;
-use Phug\Lexer\Token\OutdentToken;
 use Phug\Lexer\Token\TextToken;
 
 class FilterScanner implements ScannerInterface
 {
+    use TrailingOutdentHandlerTrait;
+
     public function scan(State $state)
     {
         $reader = $state->getReader();
@@ -55,7 +57,7 @@ class FilterScanner implements ScannerInterface
             $token = $state->createToken(TextToken::class);
             if ($maxIndent > 0 && $maxIndent < INF) {
                 foreach ($lines as &$line) {
-                    $line = mb_substr($line, $maxIndent) ?: '';
+                    $line = mb_substr((string) $line, $maxIndent);
                 }
             }
             $token->setValue(implode("\n", $lines));
@@ -66,14 +68,8 @@ class FilterScanner implements ScannerInterface
             $token->getSourceLocation()->setOffsetLength(1); //Let it have at least 1 length for debugging
             yield $token;
 
-            if ($reader->hasLength()) {
-                yield $state->createToken(NewLineToken::class);
-
-                $state->setLevel($analyzer->getNewLevel())->indent($analyzer->getLevel() + 1);
-
-                while ($state->nextOutdent() !== false) {
-                    yield $state->createToken(OutdentToken::class);
-                }
+            foreach ($this->yieldTrailingOutdent($analyzer, $state) as $token) {
+                yield $token;
             }
         }
     }

package/support/vendor/phug/phug/src/Phug/Lexer/Lexer/Scanner/IndentationScanner.php

@@ -53,7 +53,7 @@ class IndentationScanner implements ScannerInterface
         return $indentChar;
     }
 
-    public function getIndentLevel(State $state, $maxLevel = INF, callable $getIndentChar = null)
+    public function getIndentLevel(State $state, $maxLevel = INF, ?callable $getIndentChar = null)
     {
         if ($maxLevel <= 0) {
             return 0;
@@ -98,7 +98,7 @@ class IndentationScanner implements ScannerInterface
         $newLevel = $this->getIndentLevel($state, INF, function () use (&$indent) {
             $char = null;
 
-            if (mb_strlen($indent)) {
+            if ($indent !== null && mb_strlen($indent)) {
                 $char = mb_substr($indent, 0, 1);
                 $indent = mb_substr($indent, 1);
             }

package/support/vendor/phug/phug/src/Phug/Lexer/Lexer/Scanner/KeywordScanner.php

@@ -24,7 +24,7 @@ class KeywordScanner implements ScannerInterface
             )) {
                 $name = $reader->getMatch('name');
 
-                if (in_array($name, $keywords)) {
+                if (in_array($name, $keywords, true)) {
                     $value = $reader->getMatch('value');
                     if (mb_substr($value, 0, 1) === ' ') {
                         $value = mb_substr($value, 1);

package/support/vendor/phug/phug/src/Phug/Lexer/Lexer/Scanner/MultilineScanner.php

@@ -7,19 +7,21 @@
 namespace Phug\Lexer\Scanner;
 
 use Phug\Lexer\Analyzer\LineAnalyzer;
+use Phug\Lexer\Scanner\Partial\TrailingOutdentHandlerTrait;
 use Phug\Lexer\ScannerInterface;
 use Phug\Lexer\State;
 use Phug\Lexer\Token\IndentToken;
 use Phug\Lexer\Token\InterpolationEndToken;
 use Phug\Lexer\Token\InterpolationStartToken;
 use Phug\Lexer\Token\NewLineToken;
-use Phug\Lexer\Token\OutdentToken;
 use Phug\Lexer\Token\TagInterpolationEndToken;
 use Phug\Lexer\Token\TagInterpolationStartToken;
 use Phug\Lexer\Token\TextToken;
 
 class MultilineScanner implements ScannerInterface
 {
+    use TrailingOutdentHandlerTrait;
+
     protected function unEscapedToken(State $state, $buffer)
     {
         /** @var TextToken $token */
@@ -83,8 +85,6 @@ class MultilineScanner implements ScannerInterface
 
     private function yieldLines(State $state, array $lines, LineAnalyzer $analyzer)
     {
-        $reader = $state->getReader();
-
         yield $state->createToken(IndentToken::class);
 
         $maxIndent = $analyzer->getMaxIndent();
@@ -92,7 +92,7 @@ class MultilineScanner implements ScannerInterface
         if ($maxIndent > 0 && $maxIndent < INF) {
             foreach ($lines as &$line) {
                 if (count($line) && is_string($line[0])) {
-                    $line[0] = mb_substr($line[0], $maxIndent) ?: '';
+                    $line[0] = mb_substr((string) $line[0], $maxIndent);
                 }
             }
         }
@@ -101,14 +101,8 @@ class MultilineScanner implements ScannerInterface
             yield $token;
         }
 
-        if ($reader->hasLength()) {
-            yield $state->createToken(NewLineToken::class);
-
-            $state->setLevel($analyzer->getNewLevel())->indent($analyzer->getLevel() + 1);
-
-            while ($state->nextOutdent() !== false) {
-                yield $state->createToken(OutdentToken::class);
-            }
+        foreach ($this->yieldTrailingOutdent($analyzer, $state) as $token) {
+            yield $token;
         }
     }
 

package/support/vendor/phug/phug/src/Phug/Lexer/Lexer/Scanner/Partial/TrailingOutdentHandlerTrait.php

@@ -0,0 +1,26 @@
+<?php
+
+namespace Phug\Lexer\Scanner\Partial;
+
+use Phug\Lexer\Analyzer\LineAnalyzer;
+use Phug\Lexer\State;
+use Phug\Lexer\Token\NewLineToken;
+use Phug\Lexer\Token\OutdentToken;
+
+trait TrailingOutdentHandlerTrait
+{
+    private function yieldTrailingOutdent(LineAnalyzer $analyzer, State $state)
+    {
+        $reader = $state->getReader();
+
+        if ($reader->hasLength()) {
+            yield $state->createToken(NewLineToken::class);
+
+            $state->setLevel($analyzer->getNewLevel())->indent($analyzer->getLevel() + 1);
+
+            while ($state->nextOutdent() !== false) {
+                yield $state->createToken(OutdentToken::class);
+            }
+        }
+    }
+}

package/support/vendor/phug/phug/src/Phug/Lexer/Lexer/Scanner/TextScanner.php

@@ -19,7 +19,7 @@ class TextScanner implements ScannerInterface
 
     private function isTextStartToTrim(State $state, $text)
     {
-        return in_array(mb_substr($text, 0, 1), [' ', "\t"]) && !$state->isAfterInterpolation();
+        return in_array(mb_substr((string) $text, 0, 1), [' ', "\t"], true) && !$state->isAfterInterpolation();
     }
 
     private function leftTrimValueIfNotAfterInterpolation(State $state, TextToken $token)
@@ -27,7 +27,7 @@ class TextScanner implements ScannerInterface
         $text = $token->getValue();
 
         if ($this->isTextStartToTrim($state, $text)) {
-            $token->setValue(mb_substr($text, 1) ?: '');
+            $token->setValue(mb_substr((string) $text, 1));
         }
     }
 
@@ -87,7 +87,7 @@ class TextScanner implements ScannerInterface
             $text = mb_substr($text, 1);
         }
 
-        $text = preg_replace('/\\\\([#!]\\[|#\\{)/', '$1', $text);
+        $text = preg_replace('/\\\\([#!]\\[|#{)/', '$1', $text);
         $token->setValue($text);
 
         yield $state->endToken($token);

package/support/vendor/phug/phug/src/Phug/Lexer/Lexer/State.php

@@ -230,20 +230,20 @@ class State implements OptionInterface
      * use the `loopScan`-method
      *
      * @param array|string $scanners the scanners to run
+     * @param array        $options  options to be passed for the scanner
      *
      * @throws LexerException
      *
      * @return iterable the generator yielding all tokens found
      */
-    public function scan($scanners)
+    public function scan($scanners, array $options = [])
     {
         $scanners = $this->filterScanners($scanners);
 
-        foreach ($scanners as $key => $scanner) {
-
+        foreach ($scanners as $scanner) {
             /** @var ScannerInterface $scanner */
             $success = false;
-            foreach ($scanner->scan($this) as $token) {
+            foreach ($scanner->scan($this, $options) as $token) {
                 if (!($token instanceof TokenInterface)) {
                     $this->throwException(
                         'Scanner '.get_class($scanner).' generated a result that is not a '.TokenInterface::class
@@ -266,7 +266,7 @@ class State implements OptionInterface
      * If the second argument is true, it will throw an exception if none of the scanners
      * produced any valid tokens. The reading also stops when the end of the input as been reached.
      *
-     * @param $scanners
+     * @param      $scanners
      * @param bool $required
      *
      * @throws LexerException
@@ -329,7 +329,7 @@ class State implements OptionInterface
         return new $className(
             $this->createCurrentSourceLocation(),
             $this->level,
-            str_repeat($this->getIndentStyle(), $this->getIndentWidth())
+            str_repeat((string) $this->getIndentStyle(), (int) $this->getIndentWidth())
         );
     }
 
@@ -345,9 +345,9 @@ class State implements OptionInterface
      * in scanners as you can simply return it's value without having to check for it to be null.
      *
      *
-     * @param $className
-     * @param $pattern
-     * @param null $modifiers
+     * @param class-string $className
+     * @param string       $pattern
+     * @param string|null  $modifiers
      *
      * @return iterable
      */

package/support/vendor/phug/phug/src/Phug/Lexer/Lexer/TokenInterface.php

@@ -6,7 +6,7 @@ use Phug\Util\SourceLocationInterface;
 
 interface TokenInterface
 {
-    public function __construct(SourceLocationInterface $sourceLocation = null, $level = null, $indentation = null);
+    public function __construct(?SourceLocationInterface $sourceLocation = null, $level = null, $indentation = null);
 
     /**
      * @return SourceLocationInterface|null

package/support/vendor/phug/phug/src/Phug/Lexer/composer.json

@@ -11,8 +11,7 @@
             "email": "torben@talesoft.codes"
         },
         {
-            "name": "KyleKatarn",
-            "email": "jade-php@selfbuild.fr",
+            "name": "kylekatarnls",
             "homepage": "http://github.com/kylekatarnls"
         }
     ],
@@ -25,8 +24,8 @@
     "minimum-stability": "dev",
     "require": {
         "php": ">=5.5.0",
-        "phug/reader": "^0.2.0 || ^1.0",
-        "phug/util": "^1.5"
+        "phug/reader": "^0.2.0 || ^1.0 || ^2.0",
+        "phug/util": "^1.5 || ^2.0"
     },
     "autoload": {
         "psr-4": {
@@ -35,7 +34,7 @@
     },
     "extra": {
         "branch-alias": {
-            "dev-master": "1.x-dev"
+            "dev-master": "2.x-dev"
         }
     }
 }

package/support/vendor/phug/phug/src/Phug/Parser/Parser/Event/NodeEvent.php

@@ -4,6 +4,7 @@ namespace Phug\Parser\Event;
 
 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)
     {

package/support/vendor/phug/phug/src/Phug/Parser/Parser/Node/AssignmentNode.php

@@ -3,11 +3,15 @@
 namespace Phug\Parser\Node;
 
 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
+class AssignmentNode extends Node implements AttributesInterface, OrderableInterface
 {
     use NameTrait;
     use AttributeTrait;
+    use OrderTrait;
 }

package/support/vendor/phug/phug/src/Phug/Parser/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;
 }

package/support/vendor/phug/phug/src/Phug/Parser/Parser/Node/ElementNode.php

@@ -3,15 +3,19 @@
 namespace Phug\Parser\Node;
 
 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
+class ElementNode extends Node implements AttributesInterface, AttributesOrderInterface
 {
     use NameTrait;
     use AttributeTrait;
     use AssignmentTrait;
+    use AttributesOrderTrait;
 
     /**
      * @var bool

package/support/vendor/phug/phug/src/Phug/Parser/Parser/Node/FilterNode.php

@@ -3,10 +3,11 @@
 namespace Phug\Parser\Node;
 
 use Phug\Parser\Node;
+use Phug\Util\AttributesInterface;
 use Phug\Util\Partial\AttributeTrait;
 use Phug\Util\Partial\NameTrait;
 
-class FilterNode extends Node
+class FilterNode extends Node implements AttributesInterface
 {
     use NameTrait;
     use AttributeTrait;

package/support/vendor/phug/phug/src/Phug/Parser/Parser/Node/MixinCallNode.php

@@ -3,15 +3,19 @@
 namespace Phug\Parser\Node;
 
 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
+class MixinCallNode extends Node implements AttributesInterface, AttributesOrderInterface
 {
     use NameTrait;
     use AttributeTrait;
     use AssignmentTrait;
+    use AttributesOrderTrait;
 
     /**
      * @var bool

package/support/vendor/phug/phug/src/Phug/Parser/Parser/Node/MixinNode.php

@@ -3,13 +3,17 @@
 namespace Phug\Parser\Node;
 
 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
+class MixinNode extends Node implements AttributesInterface, AttributesOrderInterface
 {
     use NameTrait;
     use AttributeTrait;
     use AssignmentTrait;
+    use AttributesOrderTrait;
 }

package/support/vendor/phug/phug/src/Phug/Parser/Parser/Node.php

@@ -34,11 +34,11 @@ class Node extends AstNode implements NodeInterface
      * @param TokenInterface               $token          the token that created the node
      */
     public function __construct(
-        TokenInterface $token = null,
-        SourceLocationInterface $sourceLocation = null,
+        ?TokenInterface $token = null,
+        ?SourceLocationInterface $sourceLocation = null,
         $level = null,
-        NodeInterface $parent = null,
-        array $children = null
+        ?NodeInterface $parent = null,
+        ?array $children = null
     ) {
         parent::__construct($parent, $children);
 
@@ -77,7 +77,7 @@ class Node extends AstNode implements NodeInterface
      *
      * @return $this
      */
-    public function setOuterNode(NodeInterface $node = null)
+    public function setOuterNode(?NodeInterface $node = null)
     {
         $this->outerNode = $node;
 

package/support/vendor/phug/phug/src/Phug/Parser/Parser/State.php

@@ -101,7 +101,7 @@ class State implements OptionInterface, EventManagerInterface
      */
     private $interpolationNodes;
 
-    public function __construct(Parser $parser, \Iterator $tokens, array $options = null)
+    public function __construct(Parser $parser, \Iterator $tokens, ?array $options = null)
     {
         $this->parser = $parser;
         $this->level = 0;
@@ -329,7 +329,7 @@ class State implements OptionInterface, EventManagerInterface
      *
      * @return $this
      */
-    public function handleToken(TokenInterface $token = null)
+    public function handleToken(?TokenInterface $token = null)
     {
         $token = $token ?: $this->getToken();
         $className = get_class($token);
@@ -534,7 +534,7 @@ class State implements OptionInterface, EventManagerInterface
      *
      * @return Node The newly created node
      */
-    public function createNode($className, TokenInterface $token = null)
+    public function createNode($className, ?TokenInterface $token = null)
     {
         if (!is_subclass_of($className, Node::class)) {
             throw new \InvalidArgumentException(
@@ -630,7 +630,7 @@ class State implements OptionInterface, EventManagerInterface
      *
      * @throws ParserException
      */
-    public function throwException($message, $code = 0, TokenInterface $relatedToken = null, $previous = null)
+    public function throwException($message, $code = 0, ?TokenInterface $relatedToken = null, $previous = null)
     {
         $lexer = $this->parser->getLexer();
         //This will basically check for a source location for this Node. The process is like: