gulp-phug 1.3.3 → 1.3.5

package/support/vendor/phug/phug/composer.json

@@ -7,9 +7,12 @@
     "homepage": "http://phug-lang.com",
     "authors": [
         {
-            "name": "KyleKatarn",
-            "email": "jade-php@selfbuild.fr",
+            "name": "kylekatarnls",
             "homepage": "http://github.com/kylekatarnls"
+        },
+        {
+            "name": "Torben Koehn",
+            "email": "torben@talesoft.codes"
         }
     ],
     "support": {
@@ -21,20 +24,21 @@
     "minimum-stability": "dev",
     "require": {
         "php": ">=5.5.0",
-        "symfony/var-dumper": "^3.4 || ^4.0 || ^5.0"
+        "symfony/var-dumper": "^3.4 || ^4.0 || ^5.0 || ^6.0 || ^7.0"
     },
     "require-dev": {
-        "phpunit/phpunit": "^4.8.35 || ^5.7 || ^6.0 || ^7.0",
-        "phpunit/php-code-coverage": "^2.2 || ^4.0 || ^5.2 || ^6.0 || ^7.0",
-        "squizlabs/php_codesniffer": "~3.4.2",
-        "js-phpize/js-phpize-phug": "^1.2 || ^2.2",
-        "pug-php/pug-filter-coffee-script": "^1.2",
-        "nodejs-php-fallback/coffeescript": "^1.0",
-        "nodejs-php-fallback/less": "^1.0",
-        "nodejs-php-fallback/uglify": "^1.0",
-        "nodejs-php-fallback/stylus": "^1.0",
         "cebe/markdown": "^1.1",
-        "kylekatarnls/multi-tester": "^1.4"
+        "js-phpize/js-phpize-phug": "^1.2 || ^2.2.1",
+        "nodejs-php-fallback/coffeescript": "^1.0.1",
+        "nodejs-php-fallback/less": "^1.0.5",
+        "nodejs-php-fallback/stylus": "^1.0.4",
+        "nodejs-php-fallback/uglify": "^1.0.4",
+        "phpunit/phpunit": "^4.8.36 || ^5.7.27 || ^6.5.14 || ^8.5.34 || ^9.6.13",
+        "phpunit/php-code-coverage": "^2.2.4 || ^4.0.8 || ^5.3.2 || ^6.1.4 || ^7.0.15 || ^9.2.28",
+        "phpunit/php-invoker": "^1.1.4 || ^3.1.1",
+        "pug-php/pug": "^2.7.3 || ^3.4.1",
+        "pug-php/pug-filter-coffee-script": "^1.3.1",
+        "squizlabs/php_codesniffer": "^3.7.2"
     },
     "replace": {
         "phug/ast": "self.version",
@@ -65,9 +69,9 @@
                 "./src/Phug/Lexer/",
                 "./src/Phug/Parser/",
                 "./src/Phug/Reader/",
-                "./src/Phug/Renderer/",
-                "./src/Phug/Util/"
-            ]
+                "./src/Phug/Renderer/"
+            ],
+            "Phug\\Util\\": "./src/Phug/Util/Util/"
         }
     },
     "autoload-dev": {
@@ -81,5 +85,10 @@
             "dev-master": "1.x-dev",
             "dev-facade": "0.4.x-dev"
         }
+    },
+    "config": {
+        "allow-plugins": {
+            "nodejs-php-fallback/nodejs-php-fallback": true
+        }
     }
 }

package/support/vendor/phug/phug/phpcs.xml

@@ -2,6 +2,10 @@
 <ruleset name="PSR-2">
     <rule ref="PSR2">
         <exclude-pattern>*.js</exclude-pattern>
+        <exclude-pattern>*/src/Phug/Renderer/Renderer/Adapter/Stream/Template.php</exclude-pattern>
+        <exclude-pattern>*/src/Phug/Util/Util/TestCase.php</exclude-pattern>
+        <exclude-pattern>*/src/Phug/Util/CompatibilityUtil/TestCaseTyped.php</exclude-pattern>
+        <exclude-pattern>*/src/Phug/Util/CompatibilityUtil/TestCaseUntyped.php</exclude-pattern>
     </rule>
     <file>src</file>
 </ruleset>

package/support/vendor/phug/phug/phpunit.xml

@@ -7,6 +7,8 @@
          convertErrorsToExceptions="true"
          convertNoticesToExceptions="true"
          convertWarningsToExceptions="true"
+         enforceTimeLimit="true"
+         defaultTimeLimit="1"
          verbose="true">
     <testsuites>
         <testsuite name="Phug">

package/support/vendor/phug/phug/phug

@@ -19,7 +19,7 @@ if (!file_exists($autoload)) {
 
 include $autoload;
 
-$cli = new Cli('Phug', [
+$cli = new Cli('Phug\Phug', [
     'render',
     'renderFile',
     'renderDirectory',

package/support/vendor/phug/phug/release.php

@@ -1,5 +1,13 @@
 <?php
 
+/**
+ * Example:
+ * ```
+ * php release.php minor stable message.md
+ * ```.
+ *
+ * Put release notes in message.md as Markdown format.
+ */
 $settings = parse_ini_file('.env');
 
 function env($var)

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

@@ -4,6 +4,7 @@ namespace Phug\Ast;
 
 use InvalidArgumentException;
 use Phug\AstException;
+use ReturnTypeWillChange;
 
 /**
  * Represents a node in a tree-like data structure.
@@ -369,7 +370,6 @@ class Node implements NodeInterface
         $level = $level ?: 0;
 
         foreach ($this->children as $child) {
-
             /** @var NodeInterface $child */
             if ($child->is($callback)) {
                 yield $child;
@@ -418,6 +418,7 @@ class Node implements NodeInterface
     /**
      * {@inheritdoc}
      */
+    #[ReturnTypeWillChange]
     public function getIterator()
     {
         foreach ($this->children as $child) {
@@ -428,6 +429,7 @@ class Node implements NodeInterface
     /**
      * {@inheritdoc}
      */
+    #[ReturnTypeWillChange]
     public function count()
     {
         return $this->getChildCount();
@@ -436,6 +438,7 @@ class Node implements NodeInterface
     /**
      * {@inheritdoc}
      */
+    #[ReturnTypeWillChange]
     public function offsetExists($offset)
     {
         return $this->hasChildAt($offset);
@@ -444,6 +447,7 @@ class Node implements NodeInterface
     /**
      * {@inheritdoc}
      */
+    #[ReturnTypeWillChange]
     public function offsetGet($offset)
     {
         return $this->getChildAt($offset);
@@ -452,6 +456,7 @@ class Node implements NodeInterface
     /**
      * {@inheritdoc}
      */
+    #[ReturnTypeWillChange]
     public function offsetSet($offset, $value)
     {
         if (!($value instanceof NodeInterface)) {
@@ -475,6 +480,7 @@ class Node implements NodeInterface
     /**
      * {@inheritdoc}
      */
+    #[ReturnTypeWillChange]
     public function offsetUnset($offset)
     {
         $this->removeChildAt($offset);

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

@@ -11,8 +11,7 @@
             "email": "torben@talesoft.codes"
         },
         {
-            "name": "KyleKatarn",
-            "email": "jade-php@selfbuild.fr",
+            "name": "kylekatarnls",
             "homepage": "http://github.com/kylekatarnls"
         }
     ],

package/support/vendor/phug/phug/src/Phug/Compiler/Compiler/Element/BlockElement.php

@@ -51,7 +51,7 @@ class BlockElement extends AbstractElement
      */
     public function addCompiler(CompilerInterface $compiler)
     {
-        if (!in_array($compiler, $this->compilers)) {
+        if (!in_array($compiler, $this->compilers, true)) {
             $blocks = &$compiler->getBlocksByName($this->name);
             $blocks[] = $this;
             $this->compilers[] = $compiler;

package/support/vendor/phug/phug/src/Phug/Compiler/Compiler/NodeCompiler/AssignmentNodeCompiler.php

@@ -8,6 +8,7 @@ use Phug\Formatter\ElementInterface;
 use Phug\Parser\Node\AssignmentNode;
 use Phug\Parser\Node\AttributeNode;
 use Phug\Parser\NodeInterface;
+use Phug\Util\OrderableInterface;
 use SplObjectStorage;
 
 class AssignmentNodeCompiler extends AbstractNodeCompiler
@@ -25,9 +26,16 @@ class AssignmentNodeCompiler extends AbstractNodeCompiler
          */
         $name = $node->getName();
         $attributes = new SplObjectStorage();
+
         foreach ($node->getAttributes() as $attribute) {
             /* @var AttributeNode $attribute */
-            $attributes->attach($this->getCompiler()->compileNode($attribute, $parent));
+            $attributeElement = $this->getCompiler()->compileNode($attribute, $parent);
+
+            if ($attribute instanceof OrderableInterface && $attributeElement instanceof OrderableInterface) {
+                $attributeElement->setOrder($attribute->getOrder());
+            }
+
+            $attributes->attach($attributeElement);
         }
 
         return new AssignmentElement($name, $attributes, null, $node);

package/support/vendor/phug/phug/src/Phug/Compiler/Compiler/NodeCompiler/AttributeNodeCompiler.php

@@ -71,6 +71,7 @@ class AttributeNodeCompiler extends AbstractNodeCompiler
         $name = $this->compileName($node);
         $value = $this->compileValue($node);
         $attribute = new AttributeElement($name, $value, $node);
+        $attribute->setOrder($node->getOrder());
         $attribute->setIsVariadic($node->isVariadic());
 
         return $attribute;

package/support/vendor/phug/phug/src/Phug/Compiler/Compiler/NodeCompiler/ElementNodeCompiler.php

@@ -9,6 +9,7 @@ use Phug\Formatter\ElementInterface;
 use Phug\Parser\Node\ElementNode;
 use Phug\Parser\Node\ExpressionNode;
 use Phug\Parser\NodeInterface;
+use Phug\Util\OrderableInterface;
 use SplObjectStorage;
 
 class ElementNodeCompiler extends AbstractNodeCompiler
@@ -35,6 +36,11 @@ class ElementNodeCompiler extends AbstractNodeCompiler
         $markup = new MarkupElement($name, $node->isAutoClosed(), $attributes, $node);
         foreach ($node->getAssignments() as $assignment) {
             $compiledAssignment = $compiler->compileNode($assignment, $parent);
+
+            if ($compiledAssignment instanceof OrderableInterface && $assignment instanceof OrderableInterface) {
+                $compiledAssignment->setOrder($assignment->getOrder());
+            }
+
             if ($compiledAssignment instanceof AssignmentElement) {
                 $markup->addAssignment($compiledAssignment);
             }

package/support/vendor/phug/phug/src/Phug/Compiler/Compiler/NodeCompiler/ImportNodeCompiler.php

@@ -23,11 +23,11 @@ class ImportNodeCompiler extends AbstractNodeCompiler
     protected function isPugImport($path)
     {
         $compiler = $this->getCompiler();
-        $extension = pathinfo($path, PATHINFO_EXTENSION) ?: '';
+        $extension = pathinfo((string) $path, PATHINFO_EXTENSION);
         $extensions = $compiler->getOption('extensions');
 
         if ($extension === '') {
-            return in_array('', $extensions);
+            return in_array('', $extensions, true);
         }
 
         if (!$compiler->getOption('allow_composite_extensions')) {
@@ -72,7 +72,7 @@ class ImportNodeCompiler extends AbstractNodeCompiler
 
         $paths = $isAbsolutePath
             ? null
-            : [dirname($compiler->getPath()) ?: '.'];
+            : [dirname((string) $compiler->getPath()) ?: '.'];
 
         $path = $compiler->resolve($node->getPath(), $paths);
         $compiler->registerImportPath($path);
@@ -135,7 +135,7 @@ class ImportNodeCompiler extends AbstractNodeCompiler
                 'input',
                 'meta',
                 'hr',
-            ])) {
+            ], true)) {
                 $yield = $yield->getParent();
             }
             if ($compiler->getImportNode()) {

package/support/vendor/phug/phug/src/Phug/Compiler/Compiler/NodeCompilerInterface.php

@@ -11,7 +11,7 @@ use Phug\Parser\NodeInterface as ParserNodeInterface;
 interface NodeCompilerInterface
 {
     /**
-     * @param $nodeList
+     * @param                  $nodeList
      * @param ElementInterface $parent
      *
      * @return array

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

@@ -7,9 +7,12 @@
     "homepage": "http://phug-lang.com",
     "authors": [
         {
-            "name": "KyleKatarn",
-            "email": "jade-php@selfbuild.fr",
+            "name": "kylekatarnls",
             "homepage": "http://github.com/kylekatarnls"
+        },
+        {
+            "name": "Torben Koehn",
+            "email": "torben@talesoft.codes"
         }
     ],
     "support": {

package/support/vendor/phug/phug/src/Phug/DependencyInjection/DependencyInjection.php

@@ -305,7 +305,7 @@ class DependencyInjection implements DependencyInjectionInterface
                 return call_user_func_array($this->cache[$cacheKey], func_get_args());
             };
             $arguments = array_map(function ($dependencyName) use ($exclude, $callee) {
-                return in_array($dependencyName, $exclude)
+                return in_array($dependencyName, $exclude, true)
                     ? $callee
                     : $this->get($dependencyName, $exclude);
             }, $dependency->getDependencies());

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

@@ -11,8 +11,7 @@
             "email": "torben@talesoft.codes"
         },
         {
-            "name": "KyleKatarn",
-            "email": "jade-php@selfbuild.fr",
+            "name": "kylekatarnls",
             "homepage": "http://github.com/kylekatarnls"
         }
     ],

package/support/vendor/phug/phug/src/Phug/Event/Event/ListenerQueue.php

@@ -2,10 +2,12 @@
 
 namespace Phug\Event;
 
+use ReturnTypeWillChange;
 use SplPriorityQueue;
 
 class ListenerQueue extends SplPriorityQueue
 {
+    #[ReturnTypeWillChange]
     public function compare($priority, $priorityToCompare)
     {
         if ($priority === $priorityToCompare) {
@@ -15,6 +17,7 @@ class ListenerQueue extends SplPriorityQueue
         return $priority > $priorityToCompare ? -1 : 1;
     }
 
+    #[ReturnTypeWillChange]
     public function insert($value, $priority)
     {
         if (!is_callable($value)) {

package/support/vendor/phug/phug/src/Phug/Event/EventManagerTrait.php

@@ -50,7 +50,7 @@ trait EventManagerTrait
             $listeners->setExtractFlags(ListenerQueue::EXTR_BOTH);
 
             foreach ($listeners as $listener) {
-                if (!in_array($listener['data'], $queue)) {
+                if (!in_array($listener['data'], $queue, true)) {
                     $this->attach($eventName, $listener['data'], $listener['priority']);
                 }
             }

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

@@ -11,8 +11,7 @@
             "email": "torben@talesoft.codes"
         },
         {
-            "name": "KyleKatarn",
-            "email": "jade-php@selfbuild.fr",
+            "name": "kylekatarnls",
             "homepage": "http://github.com/kylekatarnls"
         }
     ],

package/support/vendor/phug/phug/src/Phug/Formatter/Formatter/AbstractFormat.php

@@ -51,7 +51,7 @@ abstract class AbstractFormat implements FormatInterface, OptionInterface
         is_object($_pug_temp = %s) && method_exists($_pug_temp, "__toBoolean")
             ? $_pug_temp->__toBoolean()
             : $_pug_temp';
-    const HTML_EXPRESSION_ESCAPE = 'htmlspecialchars(%s)';
+    const HTML_EXPRESSION_ESCAPE = 'htmlspecialchars((string) (%s))';
     const HTML_TEXT_ESCAPE = 'htmlspecialchars';
     const PAIR_TAG = '%s%s%s';
     const TRANSFORM_EXPRESSION = '%s';
@@ -233,7 +233,7 @@ abstract class AbstractFormat implements FormatInterface, OptionInterface
     /**
      * @param string|ElementInterface $element
      * @param bool                    $noDebug
-     * @param $element
+     * @param                         $element
      *
      * @return string
      */
@@ -248,7 +248,7 @@ abstract class AbstractFormat implements FormatInterface, OptionInterface
             if (is_a($element, $className)) {
                 $elementCode = $handler($element);
                 $debugCode = $debug ? $this->getDebugInfo($element) : '';
-                $glue = mb_strlen($debugCode) && in_array(mb_substr($elementCode, 0, 1), ["\n", "\r"])
+                $glue = mb_strlen($debugCode) && in_array(mb_substr($elementCode, 0, 1), ["\n", "\r"], true)
                     ? "\n"
                     : '';
 
@@ -460,13 +460,16 @@ abstract class AbstractFormat implements FormatInterface, OptionInterface
             return 'null';
         }
 
-        if ($value instanceof ExpressionElement &&
-            in_array(($code = strtolower($value->getValue())), ['true', 'false', 'null', 'undefined'])
-        ) {
-            return $code;
+        if ($value instanceof ExpressionElement) {
+            $code = strtolower($value->getValue());
+
+            if (in_array($code, ['true', 'false', 'null', 'undefined'], true)) {
+                return $code;
+            }
         }
 
         $code = $this->formatAssignmentValue($value);
+
         if ($value instanceof ExpressionElement && $value->isEscaped()) {
             return $this->exportHelper('array_escape', [$formattedName, $code]);
         }
@@ -767,7 +770,7 @@ abstract class AbstractFormat implements FormatInterface, OptionInterface
             '        }',
             '    }',
             '    foreach ($__pug_mixin_vars as $__pug_key => &$__pug_value) {',
-            '        if (!in_array($__pug_key, $__pug_names)) {',
+            '        if (!in_array($__pug_key, $__pug_names, true)) {',
             '            $$__pug_key = &$__pug_value;',
             '        }',
             '    }',
@@ -866,13 +869,13 @@ abstract class AbstractFormat implements FormatInterface, OptionInterface
             '$__pug_mixin_vars = [];',
             'foreach (array_keys(get_defined_vars()) as $__local_pug_key) {',
             '    if (mb_substr($__local_pug_key, 0, 6) === \'__pug_\' || '.
-                'in_array($__local_pug_key, [\'attributes\', \'block\', \''.$variablesVariable.'\'])) {',
+                'in_array($__local_pug_key, [\'attributes\', \'block\', \''.$variablesVariable.'\'], true)) {',
             '        continue;',
             '    }',
             '    $'.$variablesVariable.'[$__local_pug_key] = &$$__local_pug_key;',
             '    $__local_pug_ref = &$GLOBALS[$__local_pug_key];',
             '    $__local_pug_value = &$$__local_pug_key;',
-            '    if($__local_pug_ref !== $__local_pug_value){',
+            '    if ($__local_pug_ref !== $__local_pug_value) {',
             '        $__pug_mixin_vars[$__local_pug_key] = &$__local_pug_value;',
 
             '        continue;',
@@ -917,7 +920,7 @@ abstract class AbstractFormat implements FormatInterface, OptionInterface
                 '        }'."\n".
                 (
                     $variablesVariable
-                        ? '        if(isset($'.$variablesVariable.'[$__local_pug_key])){'."\n".
+                        ? '        if (isset($'.$variablesVariable.'[$__local_pug_key])) {'."\n".
                         '            $$__local_pug_key = &$'.$variablesVariable.'[$__local_pug_key];'."\n".
                         '            continue;'."\n".
                         '        }'."\n"
@@ -925,7 +928,7 @@ abstract class AbstractFormat implements FormatInterface, OptionInterface
                 ).
                 '        $__local_pug_ref = &$GLOBALS[$__local_pug_key];'."\n".
                 '        $__local_pug_value = &$__pug_children_vars[$__local_pug_key];'."\n".
-                '        if($__local_pug_ref !== $__local_pug_value){'."\n".
+                '        if ($__local_pug_ref !== $__local_pug_value) {'."\n".
                 '            $$__local_pug_key = &$__local_pug_value;'."\n".
                 '            continue;'."\n".
                 '        }'."\n".

package/support/vendor/phug/phug/src/Phug/Formatter/Formatter/AssignmentContainerInterface.php

@@ -3,8 +3,9 @@
 namespace Phug\Formatter;
 
 use Phug\Formatter\Element\AssignmentElement;
+use Phug\Util\AttributesOrderInterface;
 
-interface AssignmentContainerInterface extends ElementInterface
+interface AssignmentContainerInterface extends ElementInterface, AttributesOrderInterface
 {
     public function getName();
 

package/support/vendor/phug/phug/src/Phug/Formatter/Formatter/Element/AbstractAssignmentContainerElement.php

@@ -4,10 +4,16 @@ namespace Phug\Formatter\Element;
 
 use Phug\Formatter\AbstractElement;
 use Phug\Formatter\AssignmentContainerInterface;
+use Phug\Util\Partial\AttributesOrderTrait;
 use SplObjectStorage;
 
 abstract class AbstractAssignmentContainerElement extends AbstractElement implements AssignmentContainerInterface
 {
+    use AttributesOrderTrait;
+
+    /**
+     * @var SplObjectStorage<AssignmentElement>
+     */
     private $assignments;
 
     /**
@@ -19,6 +25,10 @@ abstract class AbstractAssignmentContainerElement extends AbstractElement implem
      */
     public function addAssignment(AssignmentElement $element)
     {
+        if ($element->getOrder() === null) {
+            $element->setOrder($this->getNextAttributeIndex());
+        }
+
         $element->setContainer($this);
         $this->getAssignments()->attach($element);
 
@@ -42,7 +52,7 @@ abstract class AbstractAssignmentContainerElement extends AbstractElement implem
     /**
      * Return markup assignments list.
      *
-     * @return SplObjectStorage[AssignmentElement]
+     * @return SplObjectStorage<AssignmentElement>
      */
     public function getAssignments()
     {

package/support/vendor/phug/phug/src/Phug/Formatter/Formatter/Element/AbstractMarkupElement.php

@@ -19,7 +19,7 @@ abstract class AbstractMarkupElement extends AbstractAssignmentContainerElement
     public function belongsTo(array $tagList)
     {
         if (is_string($this->getName())) {
-            return in_array(strtolower($this->getName()), $tagList);
+            return in_array(strtolower($this->getName()), $tagList, true);
         }
 
         return false;

package/support/vendor/phug/phug/src/Phug/Formatter/Formatter/Element/AssignmentElement.php

@@ -6,27 +6,32 @@ use Phug\Ast\NodeInterface;
 use Phug\Formatter\AbstractElement;
 use Phug\Formatter\AssignmentContainerInterface;
 use Phug\Parser\NodeInterface as ParserNode;
+use Phug\Util\AttributesInterface;
+use Phug\Util\OrderableInterface;
 use Phug\Util\Partial\AttributeTrait;
 use Phug\Util\Partial\NameTrait;
+use Phug\Util\Partial\OrderTrait;
+use SplObjectStorage;
 
-class AssignmentElement extends AbstractElement
+class AssignmentElement extends AbstractElement implements AttributesInterface, OrderableInterface
 {
     use AttributeTrait;
     use NameTrait;
+    use OrderTrait;
 
     /**
      * AssignmentElement constructor.
      *
      * @param string                            $name
-     * @param \SplObjectStorage|null            $attributes
-     * @param AssignmentContainerInterface|null $markup
+     * @param SplObjectStorage|null             $attributes
+     * @param AssignmentContainerInterface|null $container
      * @param ParserNode|null                   $originNode
      * @param NodeInterface|null                $parent
      * @param array|null                        $children
      */
     public function __construct(
         $name,
-        \SplObjectStorage $attributes = null,
+        SplObjectStorage $attributes = null,
         AssignmentContainerInterface $container = null,
         ParserNode $originNode = null,
         NodeInterface $parent = null,

package/support/vendor/phug/phug/src/Phug/Formatter/Formatter/Element/AttributeElement.php

@@ -4,12 +4,15 @@ namespace Phug\Formatter\Element;
 
 use Phug\Ast\NodeInterface;
 use Phug\Parser\NodeInterface as ParserNode;
+use Phug\Util\OrderableInterface;
 use Phug\Util\Partial\NameTrait;
+use Phug\Util\Partial\OrderTrait;
 use Phug\Util\Partial\VariadicTrait;
 
-class AttributeElement extends AbstractValueElement
+class AttributeElement extends AbstractValueElement implements OrderableInterface
 {
     use NameTrait;
+    use OrderTrait;
     use VariadicTrait;
 
     /**

package/support/vendor/phug/phug/src/Phug/Formatter/Formatter/Element/CodeElement.php

@@ -82,7 +82,7 @@ class CodeElement extends AbstractValueElement implements TransformableInterface
                 T_TRAIT,
                 T_TRY,
                 T_WHILE,
-            ]);
+            ], true);
     }
 
     public function hasBlockContent()
@@ -106,7 +106,7 @@ class CodeElement extends AbstractValueElement implements TransformableInterface
                 $this->isCodeBlockOpening() &&
                 !$this->hasBlockContent()
             )
-        ) && !in_array(end($tokens), [';', '{']);
+        ) && !in_array(end($tokens), [';', '{'], true);
     }
 
     /**

package/support/vendor/phug/phug/src/Phug/Formatter/Formatter/Element/MarkupElement.php

@@ -4,10 +4,12 @@ namespace Phug\Formatter\Element;
 
 use Phug\Ast\NodeInterface;
 use Phug\Parser\NodeInterface as ParserNode;
+use Phug\Util\AttributesInterface;
 use Phug\Util\Partial\AttributeTrait;
 use Phug\Util\Partial\NameTrait;
+use SplObjectStorage;
 
-class MarkupElement extends AbstractMarkupElement
+class MarkupElement extends AbstractMarkupElement implements AttributesInterface
 {
     use AttributeTrait;
     use NameTrait;
@@ -20,17 +22,17 @@ class MarkupElement extends AbstractMarkupElement
     /**
      * MarkupElement constructor.
      *
-     * @param string                 $name
-     * @param bool                   $autoClosed
-     * @param \SplObjectStorage|null $attributes
-     * @param ParserNode|null        $originNode
-     * @param NodeInterface|null     $parent
-     * @param array|null             $children
+     * @param string                $name
+     * @param bool                  $autoClosed
+     * @param SplObjectStorage|null $attributes
+     * @param ParserNode|null       $originNode
+     * @param NodeInterface|null    $parent
+     * @param array|null            $children
      */
     public function __construct(
         $name,
         $autoClosed = false,
-        \SplObjectStorage $attributes = null,
+        SplObjectStorage $attributes = null,
         ParserNode $originNode = null,
         NodeInterface $parent = null,
         array $children = null

package/support/vendor/phug/phug/src/Phug/Formatter/Formatter/Element/MixinCallElement.php

@@ -2,10 +2,11 @@
 
 namespace Phug\Formatter\Element;
 
+use Phug\Util\AttributesInterface;
 use Phug\Util\Partial\AttributeTrait;
 use Phug\Util\Partial\NameTrait;
 
-class MixinCallElement extends AbstractAssignmentContainerElement
+class MixinCallElement extends AbstractAssignmentContainerElement implements AttributesInterface
 {
     use AttributeTrait;
     use NameTrait;