gulp-phug 1.3.4 → 2.0.0

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

@@ -11,12 +11,12 @@ use Phug\Parser\NodeInterface as ParserNodeInterface;
 interface NodeCompilerInterface
 {
     /**
-     * @param $nodeList
+     * @param                  $nodeList
      * @param ElementInterface $parent
      *
      * @return array
      */
-    public function getCompiledNodeList($nodeList, ElementInterface $parent = null);
+    public function getCompiledNodeList($nodeList, ?ElementInterface $parent = null);
 
     /**
      * @param NodeInterface    $node
@@ -24,7 +24,7 @@ interface NodeCompilerInterface
      *
      * @return array
      */
-    public function getCompiledChildren(NodeInterface $node, ElementInterface $parent = null);
+    public function getCompiledChildren(NodeInterface $node, ?ElementInterface $parent = null);
 
     /**
      * @param NodeInterface         $node
@@ -32,7 +32,7 @@ interface NodeCompilerInterface
      *
      * @return mixed
      */
-    public function compileNodeChildren(NodeInterface $node, ElementInterface $element = null);
+    public function compileNodeChildren(NodeInterface $node, ?ElementInterface $element = null);
 
     /**
      * @param ParserNodeInterface $node
@@ -40,7 +40,7 @@ interface NodeCompilerInterface
      *
      * @return null|BlockElement|ElementInterface
      */
-    public function compileNode(ParserNodeInterface $node, ElementInterface $parent = null);
+    public function compileNode(ParserNodeInterface $node, ?ElementInterface $parent = null);
 
     /**
      * @return CompilerInterface

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

@@ -499,7 +499,7 @@ class Compiler implements ModuleContainerInterface, CompilerInterface, WithUpper
      *
      * @return ElementInterface
      */
-    public function compileNode(NodeInterface $node, ElementInterface $parent = null)
+    public function compileNode(NodeInterface $node, ?ElementInterface $parent = null)
     {
         $nodeEvent = new NodeEvent($node);
         $this->trigger($nodeEvent);
@@ -537,7 +537,7 @@ class Compiler implements ModuleContainerInterface, CompilerInterface, WithUpper
      * @param BlockElement $block
      * @param array        $children
      */
-    public function replaceBlock(BlockElement $block, array $children = null)
+    public function replaceBlock(BlockElement $block, ?array $children = null)
     {
         if ($parent = $block->getParent()) {
             foreach (array_reverse($children ?: $block->getChildren()) as $child) {

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

@@ -92,7 +92,7 @@ interface CompilerInterface extends ModuleContainerInterface
      * @param BlockElement $block
      * @param array        $children
      */
-    public function replaceBlock(BlockElement $block, array $children = null);
+    public function replaceBlock(BlockElement $block, ?array $children = null);
 
     /**
      * @throws CompilerException
@@ -133,7 +133,7 @@ interface CompilerInterface extends ModuleContainerInterface
      *
      * @return null|ElementInterface
      */
-    public function compileNode(NodeInterface $node, ElementInterface $parent = null);
+    public function compileNode(NodeInterface $node, ?ElementInterface $parent = null);
 
     /**
      * @param string $input

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": {
@@ -21,10 +24,10 @@
     "minimum-stability": "dev",
     "require": {
         "php": ">=5.5.0",
-        "phug/util": "^0.4.0 || ^1.0",
-        "phug/formatter": "^0.5.50 || ^1.0",
-        "phug/dependency-injection": "^1.1.2",
-        "phug/parser": "^0.5.0 || ^1.0"
+        "phug/util": "^0.4.0 || ^1.0 || ^2.0",
+        "phug/formatter": "^0.5.50 || ^1.0 || ^2.0",
+        "phug/dependency-injection": "^1.1.2 || ^2.0",
+        "phug/parser": "^0.5.0 || ^1.0 || ^2.0"
     },
     "autoload": {
         "psr-4": {
@@ -33,7 +36,7 @@
     },
     "extra": {
         "branch-alias": {
-            "dev-master": "1.x-dev"
+            "dev-master": "2.x-dev"
         }
     }
 }

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"
         }
     ],
@@ -24,7 +23,7 @@
     },
     "minimum-stability": "dev",
     "require": {
-        "phug/util": "^0.4.0 || ^1.0"
+        "phug/util": "^0.4.0 || ^1.0 || ^2.0"
     },
     "autoload": {
         "psr-4": {
@@ -33,7 +32,7 @@
     },
     "extra": {
         "branch-alias": {
-            "dev-master": "1.x-dev"
+            "dev-master": "2.x-dev"
         }
     }
 }

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"
         }
     ],
@@ -33,7 +32,7 @@
     },
     "extra": {
         "branch-alias": {
-            "dev-master": "1.x-dev"
+            "dev-master": "2.x-dev"
         }
     }
 }

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

@@ -20,7 +20,7 @@ abstract class AbstractElement extends Node implements ElementInterface
      * @param NodeInterface|null $parent
      * @param array|null         $children
      */
-    public function __construct(ParserNode $originNode = null, NodeInterface $parent = null, array $children = null)
+    public function __construct(?ParserNode $originNode = null, ?NodeInterface $parent = null, ?array $children = null)
     {
         $this->originNode = $originNode;
 

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';
@@ -77,7 +77,7 @@ abstract class AbstractFormat implements FormatInterface, OptionInterface
      */
     private $debugCommentPattern = null;
 
-    public function __construct(Formatter $formatter = null)
+    public function __construct(?Formatter $formatter = null)
     {
         $patterns = [
             'class_attribute'        => static::CLASS_ATTRIBUTE,
@@ -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".
@@ -1000,7 +1003,7 @@ abstract class AbstractFormat implements FormatInterface, OptionInterface
         return $this->formatElementChildren($document, 0);
     }
 
-    protected function throwException($message, ElementInterface $element = null)
+    protected function throwException($message, ?ElementInterface $element = null)
     {
         $location = ($node = $element->getOriginNode()) && ($loc = $node->getSourceLocation())
             ? clone $loc

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/AbstractValueElement.php

@@ -21,9 +21,9 @@ abstract class AbstractValueElement extends AbstractElement
      */
     public function __construct(
         $value = null,
-        ParserNode $originNode = null,
-        NodeInterface $parent = null,
-        array $children = null
+        ?ParserNode $originNode = null,
+        ?NodeInterface $parent = null,
+        ?array $children = null
     ) {
         parent::__construct($originNode, $parent, $children);
 

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

@@ -7,7 +7,7 @@ use Phug\Parser\NodeInterface as ParserNode;
 
 class AnonymousBlockElement extends ExpressionElement
 {
-    public function __construct(ParserNode $originNode = null, NodeInterface $parent = null, array $children = null)
+    public function __construct(?ParserNode $originNode = null, ?NodeInterface $parent = null, ?array $children = null)
     {
         parent::__construct('$__pug_children(get_defined_vars())', $originNode, $parent, $children);
         $this->uncheck();

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

@@ -6,31 +6,36 @@ 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,
-        AssignmentContainerInterface $container = null,
-        ParserNode $originNode = null,
-        NodeInterface $parent = null,
-        array $children = null
+        ?SplObjectStorage $attributes = null,
+        ?AssignmentContainerInterface $container = null,
+        ?ParserNode $originNode = null,
+        ?NodeInterface $parent = null,
+        ?array $children = null
     ) {
         parent::__construct($originNode, $parent, $children);
 

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;
 
     /**
@@ -24,9 +27,9 @@ class AttributeElement extends AbstractValueElement
     public function __construct(
         $name,
         $value,
-        ParserNode $originNode = null,
-        NodeInterface $parent = null,
-        array $children = null
+        ?ParserNode $originNode = null,
+        ?NodeInterface $parent = null,
+        ?array $children = null
     ) {
         parent::__construct($originNode, $parent, $children);
 

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

@@ -34,9 +34,9 @@ class CodeElement extends AbstractValueElement implements TransformableInterface
      */
     public function __construct(
         $value = null,
-        ParserNode $originNode = null,
-        NodeInterface $parent = null,
-        array $children = null
+        ?ParserNode $originNode = null,
+        ?NodeInterface $parent = null,
+        ?array $children = null
     ) {
         parent::__construct($value, $originNode, $parent, $children);
 
@@ -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/KeywordElement.php

@@ -27,9 +27,9 @@ class KeywordElement extends AbstractElement
     public function __construct(
         $name,
         $value,
-        ParserNode $originNode = null,
-        NodeInterface $parent = null,
-        array $children = null
+        ?ParserNode $originNode = null,
+        ?NodeInterface $parent = null,
+        ?array $children = null
     ) {
         parent::__construct($originNode, $parent, $children);
 

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,20 +22,20 @@ 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,
-        ParserNode $originNode = null,
-        NodeInterface $parent = null,
-        array $children = null
+        ?SplObjectStorage $attributes = null,
+        ?ParserNode $originNode = null,
+        ?NodeInterface $parent = null,
+        ?array $children = null
     ) {
         parent::__construct($originNode, $parent, $children);
 

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;

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

@@ -3,10 +3,11 @@
 namespace Phug\Formatter\Element;
 
 use Phug\Formatter\AbstractElement;
+use Phug\Util\AttributesInterface;
 use Phug\Util\Partial\AttributeTrait;
 use Phug\Util\Partial\NameTrait;
 
-class MixinElement extends AbstractElement
+class MixinElement extends AbstractElement implements AttributesInterface
 {
     use AttributeTrait;
     use NameTrait;

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

@@ -28,11 +28,11 @@ class VariableElement extends AbstractElement
      * @param array|null             $children
      */
     public function __construct(
-        CodeElement $variable = null,
-        ExpressionElement $expression = null,
-        ParserNode $originNode = null,
-        NodeInterface $parent = null,
-        array $children = null
+        ?CodeElement $variable = null,
+        ?ExpressionElement $expression = null,
+        ?ParserNode $originNode = null,
+        ?NodeInterface $parent = null,
+        ?array $children = null
     ) {
         parent::__construct($originNode, $parent, $children);
 

package/support/vendor/phug/phug/src/Phug/Formatter/Formatter/Event/FormatEvent.php

@@ -37,7 +37,7 @@ class FormatEvent extends Event
     /**
      * @param ElementInterface $element
      */
-    public function setElement(ElementInterface $element = null)
+    public function setElement(?ElementInterface $element = null)
     {
         $this->element = $element;
     }

package/support/vendor/phug/phug/src/Phug/Formatter/Formatter/Format/HtmlFormat.php

@@ -11,7 +11,7 @@ class HtmlFormat extends XhtmlFormat
     const EXPLICIT_CLOSING_TAG = '<%s/>';
     const BOOLEAN_ATTRIBUTE_PATTERN = ' %s';
 
-    public function __construct(Formatter $formatter = null)
+    public function __construct(?Formatter $formatter = null)
     {
         parent::__construct($formatter);
 

package/support/vendor/phug/phug/src/Phug/Formatter/Formatter/Format/XhtmlFormat.php

@@ -13,7 +13,7 @@ abstract class XhtmlFormat extends XmlFormat
     const DOCTYPE_LANGUAGE = 'html';
     const SELF_CLOSING_TAG = '<%s />';
 
-    public function __construct(Formatter $formatter = null)
+    public function __construct(?Formatter $formatter = null)
     {
         $this->setOptionsRecursive([
             'white_space_sensitive_tags' => [