phug-php · kylekatarnls · Mar 7, 2025 · Mar 7, 2025
diff --git a/src/Phug/Ast/Ast/Node.php b/src/Phug/Ast/Ast/Node.php
@@ -31,7 +31,7 @@ class Node implements NodeInterface
      * @param NodeInterface $parent
      * @param array         $children
      */
-    public function __construct(NodeInterface $parent = null, array $children = null)
+    public function __construct(?NodeInterface $parent = null, ?array $children = null)
     {
         $this->parent = null;
         $this->children = [];
@@ -77,7 +77,7 @@ public function getParent()
     /**
      * {@inheritdoc}
      */
-    public function setParent(NodeInterface $parent = null)
+    public function setParent(?NodeInterface $parent = null)
     {
         if ($this->parent === $parent) {
             return $this;

diff --git a/src/Phug/Compiler/Compiler.php b/src/Phug/Compiler/Compiler.php
@@ -499,7 +499,7 @@ public function getBlocks()
      *
      * @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 @@ public function compileNode(NodeInterface $node, ElementInterface $parent = null
      * @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) {

diff --git a/src/Phug/Compiler/Compiler/AbstractNodeCompiler.php b/src/Phug/Compiler/Compiler/AbstractNodeCompiler.php
@@ -41,7 +41,7 @@ public function getCompiler()
      *
      * @return ElementInterface[]
      */
-    public function getCompiledNodeList($nodeList, ElementInterface $element = null)
+    public function getCompiledNodeList($nodeList, ?ElementInterface $element = null)
     {
         return array_values(array_filter(array_map(
             function (NodeInterface $childNode) use ($element) {
@@ -59,7 +59,7 @@ function (NodeInterface $childNode) use ($element) {
      *
      * @return ElementInterface[]
      */
-    public function getCompiledChildren(NodeInterface $node, ElementInterface $element = null)
+    public function getCompiledChildren(NodeInterface $node, ?ElementInterface $element = null)
     {
         return $this->getCompiledNodeList($node->getChildren(), $element);
     }
@@ -71,7 +71,7 @@ public function getCompiledChildren(NodeInterface $node, ElementInterface $eleme
      * @param NodeInterface         $node
      * @param ElementInterface|null $element
      */
-    public function compileNodeChildren(NodeInterface $node, ElementInterface $element = null)
+    public function compileNodeChildren(NodeInterface $node, ?ElementInterface $element = null)
     {
         $children = array_filter($node->getChildren());
         array_walk($children, function (NodeInterface $childNode) use ($element) {
@@ -109,7 +109,7 @@ protected function getTextChildren(ParserNodeInterface $node)
         }, $children));
     }
 
-    private function compileParserNode(NodeInterface $node, ElementInterface $element = null)
+    private function compileParserNode(NodeInterface $node, ?ElementInterface $element = null)
     {
         return $node instanceof ParserNodeInterface
             ? $this->getCompiler()->compileNode($node, $element)

diff --git a/src/Phug/Compiler/Compiler/Element/BlockElement.php b/src/Phug/Compiler/Compiler/Element/BlockElement.php
@@ -22,9 +22,9 @@ class BlockElement extends AbstractElement
     public function __construct(
         CompilerInterface $compiler,
         $name = '',
-        ParserNode $originNode = null,
-        NodeInterface $parent = null,
-        array $children = null
+        ?ParserNode $originNode = null,
+        ?NodeInterface $parent = null,
+        ?array $children = null
     ) {
         $blocks = &$compiler->getBlocksByName($name);
         $blocks[] = $this;

diff --git a/src/Phug/Compiler/Compiler/NodeCompiler/AssignmentListNodeCompiler.php b/src/Phug/Compiler/Compiler/NodeCompiler/AssignmentListNodeCompiler.php
@@ -9,7 +9,7 @@
 
 class AssignmentListNodeCompiler extends AbstractNodeCompiler
 {
-    public function compileNode(NodeInterface $node, ElementInterface $parent = null)
+    public function compileNode(NodeInterface $node, ?ElementInterface $parent = null)
     {
         $this->getCompiler()->assert(
             $node instanceof AssignmentListNode,

diff --git a/src/Phug/Compiler/Compiler/NodeCompiler/AssignmentNodeCompiler.php b/src/Phug/Compiler/Compiler/NodeCompiler/AssignmentNodeCompiler.php
@@ -13,7 +13,7 @@
 
 class AssignmentNodeCompiler extends AbstractNodeCompiler
 {
-    public function compileNode(NodeInterface $node, ElementInterface $parent = null)
+    public function compileNode(NodeInterface $node, ?ElementInterface $parent = null)
     {
         $this->getCompiler()->assert(
             $node instanceof AssignmentNode,

diff --git a/src/Phug/Compiler/Compiler/NodeCompiler/AttributeListNodeCompiler.php b/src/Phug/Compiler/Compiler/NodeCompiler/AttributeListNodeCompiler.php
@@ -9,7 +9,7 @@
 
 class AttributeListNodeCompiler extends AbstractNodeCompiler
 {
-    public function compileNode(NodeInterface $node, ElementInterface $parent = null)
+    public function compileNode(NodeInterface $node, ?ElementInterface $parent = null)
     {
         $this->getCompiler()->assert(
             $node instanceof AttributeListNode,

diff --git a/src/Phug/Compiler/Compiler/NodeCompiler/AttributeNodeCompiler.php b/src/Phug/Compiler/Compiler/NodeCompiler/AttributeNodeCompiler.php
@@ -57,7 +57,7 @@ protected function compileValue(AttributeNode $node)
         return $value;
     }
 
-    public function compileNode(NodeInterface $node, ElementInterface $parent = null)
+    public function compileNode(NodeInterface $node, ?ElementInterface $parent = null)
     {
         $this->getCompiler()->assert(
             $node instanceof AttributeNode,

diff --git a/src/Phug/Compiler/Compiler/NodeCompiler/BlockNodeCompiler.php b/src/Phug/Compiler/Compiler/NodeCompiler/BlockNodeCompiler.php
@@ -12,7 +12,7 @@
 
 class BlockNodeCompiler extends AbstractNodeCompiler
 {
-    protected function compileAnonymousBlock(BlockNode $node, ElementInterface $parent = null)
+    protected function compileAnonymousBlock(BlockNode $node, ?ElementInterface $parent = null)
     {
         $mixin = $node;
         while ($mixin->hasParent() && !($mixin instanceof MixinNode)) {
@@ -38,7 +38,7 @@ protected function hasBlockParent(BlockNode $node)
         return false;
     }
 
-    protected function compileNamedBlock($name, BlockNode $node, ElementInterface $parent = null)
+    protected function compileNamedBlock($name, BlockNode $node, ?ElementInterface $parent = null)
     {
         $compiler = $this->getCompiler();
         $layout = $compiler->getLayout();
@@ -63,7 +63,7 @@ protected function compileNamedBlock($name, BlockNode $node, ElementInterface $p
         );
     }
 
-    public function compileNode(NodeInterface $node, ElementInterface $parent = null)
+    public function compileNode(NodeInterface $node, ?ElementInterface $parent = null)
     {
         $this->getCompiler()->assert(
             $node instanceof BlockNode,

diff --git a/src/Phug/Compiler/Compiler/NodeCompiler/CaseNodeCompiler.php b/src/Phug/Compiler/Compiler/NodeCompiler/CaseNodeCompiler.php
@@ -8,7 +8,7 @@
 
 class CaseNodeCompiler extends AbstractStatementNodeCompiler
 {
-    public function compileNode(NodeInterface $node, ElementInterface $parent = null)
+    public function compileNode(NodeInterface $node, ?ElementInterface $parent = null)
     {
         $this->getCompiler()->assert(
             $node instanceof CaseNode,

diff --git a/src/Phug/Compiler/Compiler/NodeCompiler/CodeNodeCompiler.php b/src/Phug/Compiler/Compiler/NodeCompiler/CodeNodeCompiler.php
@@ -12,7 +12,7 @@
 
 class CodeNodeCompiler extends AbstractNodeCompiler
 {
-    public function compileNode(NodeInterface $node, ElementInterface $parent = null)
+    public function compileNode(NodeInterface $node, ?ElementInterface $parent = null)
     {
         $this->getCompiler()->assert(
             $node instanceof CodeNode,
@@ -42,7 +42,7 @@ public function compileNode(NodeInterface $node, ElementInterface $parent = null
         return $code;
     }
 
-    private function getCodeElement(CodeNode $node, array $texts, array $children, ElementInterface $parent = null)
+    private function getCodeElement(CodeNode $node, array $texts, array $children, ?ElementInterface $parent = null)
     {
         if (count($texts) === count($children)) {
             return new CodeElement($this->getTextChildren($node), $node);

diff --git a/src/Phug/Compiler/Compiler/NodeCompiler/CommentNodeCompiler.php b/src/Phug/Compiler/Compiler/NodeCompiler/CommentNodeCompiler.php
@@ -10,7 +10,7 @@
 
 class CommentNodeCompiler extends AbstractNodeCompiler
 {
-    public function compileNode(NodeInterface $node, ElementInterface $parent = null)
+    public function compileNode(NodeInterface $node, ?ElementInterface $parent = null)
     {
         $this->getCompiler()->assert(
             $node instanceof CommentNode,

diff --git a/src/Phug/Compiler/Compiler/NodeCompiler/ConditionalNodeCompiler.php b/src/Phug/Compiler/Compiler/NodeCompiler/ConditionalNodeCompiler.php
@@ -9,7 +9,7 @@
 
 class ConditionalNodeCompiler extends AbstractStatementNodeCompiler
 {
-    public function compileNode(NodeInterface $node, ElementInterface $parent = null)
+    public function compileNode(NodeInterface $node, ?ElementInterface $parent = null)
     {
         $compiler = $this->getCompiler();
 

diff --git a/src/Phug/Compiler/Compiler/NodeCompiler/DoNodeCompiler.php b/src/Phug/Compiler/Compiler/NodeCompiler/DoNodeCompiler.php
@@ -8,7 +8,7 @@
 
 class DoNodeCompiler extends AbstractStatementNodeCompiler
 {
-    public function compileNode(NodeInterface $node, ElementInterface $parent = null)
+    public function compileNode(NodeInterface $node, ?ElementInterface $parent = null)
     {
         $this->getCompiler()->assert(
             $node instanceof DoNode,

diff --git a/src/Phug/Compiler/Compiler/NodeCompiler/DoctypeNodeCompiler.php b/src/Phug/Compiler/Compiler/NodeCompiler/DoctypeNodeCompiler.php
@@ -10,7 +10,7 @@
 
 class DoctypeNodeCompiler extends AbstractNodeCompiler
 {
-    public function compileNode(NodeInterface $node, ElementInterface $parent = null)
+    public function compileNode(NodeInterface $node, ?ElementInterface $parent = null)
     {
         $compiler = $this->getCompiler();
         $compiler->assert(

diff --git a/src/Phug/Compiler/Compiler/NodeCompiler/DocumentNodeCompiler.php b/src/Phug/Compiler/Compiler/NodeCompiler/DocumentNodeCompiler.php
@@ -10,7 +10,7 @@
 
 class DocumentNodeCompiler extends AbstractNodeCompiler
 {
-    public function compileNode(NodeInterface $node, ElementInterface $parent = null)
+    public function compileNode(NodeInterface $node, ?ElementInterface $parent = null)
     {
         $this->getCompiler()->assert(
             $node instanceof DocumentNode,

diff --git a/src/Phug/Compiler/Compiler/NodeCompiler/EachNodeCompiler.php b/src/Phug/Compiler/Compiler/NodeCompiler/EachNodeCompiler.php
@@ -76,7 +76,7 @@ protected function compileLoop(NodeInterface $node, $items, $key, $item)
         return $loop;
     }
 
-    public function compileNode(NodeInterface $node, ElementInterface $parent = null)
+    public function compileNode(NodeInterface $node, ?ElementInterface $parent = null)
     {
         $this->getCompiler()->assert(
             $node instanceof EachNode,

diff --git a/src/Phug/Compiler/Compiler/NodeCompiler/ElementNodeCompiler.php b/src/Phug/Compiler/Compiler/NodeCompiler/ElementNodeCompiler.php
@@ -14,7 +14,7 @@
 
 class ElementNodeCompiler extends AbstractNodeCompiler
 {
-    public function compileNode(NodeInterface $node, ElementInterface $parent = null)
+    public function compileNode(NodeInterface $node, ?ElementInterface $parent = null)
     {
         $compiler = $this->getCompiler();
         $compiler->assert(

diff --git a/src/Phug/Compiler/Compiler/NodeCompiler/ExpressionNodeCompiler.php b/src/Phug/Compiler/Compiler/NodeCompiler/ExpressionNodeCompiler.php
@@ -10,7 +10,7 @@
 
 class ExpressionNodeCompiler extends AbstractNodeCompiler
 {
-    public function compileNode(NodeInterface $node, ElementInterface $parent = null)
+    public function compileNode(NodeInterface $node, ?ElementInterface $parent = null)
     {
         $this->getCompiler()->assert(
             $node instanceof ExpressionNode,

diff --git a/src/Phug/Compiler/Compiler/NodeCompiler/FilterNodeCompiler.php b/src/Phug/Compiler/Compiler/NodeCompiler/FilterNodeCompiler.php
@@ -40,7 +40,7 @@ protected function compileText($name, $children, $parent, $indentLevel)
         }, $children));
     }
 
-    public function compileNode(NodeInterface $node, ElementInterface $parent = null)
+    public function compileNode(NodeInterface $node, ?ElementInterface $parent = null)
     {
         $compiler = $this->getCompiler();
         $compiler->assert(

diff --git a/src/Phug/Compiler/Compiler/NodeCompiler/ForNodeCompiler.php b/src/Phug/Compiler/Compiler/NodeCompiler/ForNodeCompiler.php
@@ -8,7 +8,7 @@
 
 class ForNodeCompiler extends EachNodeCompiler
 {
-    public function compileNode(NodeInterface $node, ElementInterface $parent = null)
+    public function compileNode(NodeInterface $node, ?ElementInterface $parent = null)
     {
         $this->getCompiler()->assert(
             $node instanceof ForNode,

diff --git a/src/Phug/Compiler/Compiler/NodeCompiler/ImportNodeCompiler.php b/src/Phug/Compiler/Compiler/NodeCompiler/ImportNodeCompiler.php
@@ -51,7 +51,7 @@ protected function isPugImport($path)
      *
      * @return null|ElementInterface
      */
-    public function compileNode(NodeInterface $node, ElementInterface $parent = null)
+    public function compileNode(NodeInterface $node, ?ElementInterface $parent = null)
     {
         $compiler = $this->getCompiler();
         $compiler->assert(

diff --git a/src/Phug/Compiler/Compiler/NodeCompiler/KeywordNodeCompiler.php b/src/Phug/Compiler/Compiler/NodeCompiler/KeywordNodeCompiler.php
@@ -10,7 +10,7 @@
 
 class KeywordNodeCompiler extends AbstractNodeCompiler
 {
-    public function compileNode(NodeInterface $node, ElementInterface $parent = null)
+    public function compileNode(NodeInterface $node, ?ElementInterface $parent = null)
     {
         $this->getCompiler()->assert(
             $node instanceof KeywordNode,

diff --git a/src/Phug/Compiler/Compiler/NodeCompiler/MixinCallNodeCompiler.php b/src/Phug/Compiler/Compiler/NodeCompiler/MixinCallNodeCompiler.php
@@ -14,7 +14,7 @@
 
 class MixinCallNodeCompiler extends AbstractNodeCompiler
 {
-    public function compileNode(ParserNodeInterface $node, ElementInterface $parent = null)
+    public function compileNode(ParserNodeInterface $node, ?ElementInterface $parent = null)
     {
         $compiler = $this->getCompiler();
         $compiler->assert(

diff --git a/src/Phug/Compiler/Compiler/NodeCompiler/MixinNodeCompiler.php b/src/Phug/Compiler/Compiler/NodeCompiler/MixinNodeCompiler.php
@@ -13,7 +13,7 @@
 
 class MixinNodeCompiler extends AbstractNodeCompiler
 {
-    public function compileNode(NodeInterface $node, ElementInterface $parent = null)
+    public function compileNode(NodeInterface $node, ?ElementInterface $parent = null)
     {
         $compiler = $this->getCompiler();
         $compiler->assert(

diff --git a/src/Phug/Compiler/Compiler/NodeCompiler/TextNodeCompiler.php b/src/Phug/Compiler/Compiler/NodeCompiler/TextNodeCompiler.php
@@ -10,7 +10,7 @@
 
 class TextNodeCompiler extends AbstractNodeCompiler
 {
-    public function compileNode(NodeInterface $node, ElementInterface $parent = null)
+    public function compileNode(NodeInterface $node, ?ElementInterface $parent = null)
     {
         $this->getCompiler()->assert(
             $node instanceof TextNode,

diff --git a/src/Phug/Compiler/Compiler/NodeCompiler/VariableNodeCompiler.php b/src/Phug/Compiler/Compiler/NodeCompiler/VariableNodeCompiler.php
@@ -10,7 +10,7 @@
 
 class VariableNodeCompiler extends AbstractNodeCompiler
 {
-    public function compileNode(NodeInterface $node, ElementInterface $parent = null)
+    public function compileNode(NodeInterface $node, ?ElementInterface $parent = null)
     {
         $compiler = $this->getCompiler();
         $compiler->assert(

diff --git a/src/Phug/Compiler/Compiler/NodeCompiler/WhenNodeCompiler.php b/src/Phug/Compiler/Compiler/NodeCompiler/WhenNodeCompiler.php
@@ -10,7 +10,7 @@
 
 class WhenNodeCompiler extends AbstractNodeCompiler
 {
-    public function compileNode(NodeInterface $node, ElementInterface $parent = null)
+    public function compileNode(NodeInterface $node, ?ElementInterface $parent = null)
     {
         $this->getCompiler()->assert(
             $node instanceof WhenNode,

diff --git a/src/Phug/Compiler/Compiler/NodeCompiler/WhileNodeCompiler.php b/src/Phug/Compiler/Compiler/NodeCompiler/WhileNodeCompiler.php
@@ -9,7 +9,7 @@
 
 class WhileNodeCompiler extends AbstractStatementNodeCompiler
 {
-    public function compileNode(NodeInterface $node, ElementInterface $parent = null)
+    public function compileNode(NodeInterface $node, ?ElementInterface $parent = null)
     {
         $compiler = $this->getCompiler();
         $compiler->assert(

diff --git a/src/Phug/Compiler/Compiler/NodeCompiler/YieldNodeCompiler.php b/src/Phug/Compiler/Compiler/NodeCompiler/YieldNodeCompiler.php
@@ -10,7 +10,7 @@
 
 class YieldNodeCompiler extends AbstractNodeCompiler
 {
-    public function compileNode(NodeInterface $node, ElementInterface $parent = null)
+    public function compileNode(NodeInterface $node, ?ElementInterface $parent = null)
     {
         $compiler = $this->getCompiler();
         $compiler->assert(

diff --git a/src/Phug/Compiler/Compiler/NodeCompilerInterface.php b/src/Phug/Compiler/Compiler/NodeCompilerInterface.php
@@ -16,31 +16,31 @@ interface NodeCompilerInterface
      *
      * @return array
      */
-    public function getCompiledNodeList($nodeList, ElementInterface $parent = null);
+    public function getCompiledNodeList($nodeList, ?ElementInterface $parent = null);
 
     /**
      * @param NodeInterface    $node
      * @param ElementInterface $parent
      *
      * @return array
      */
-    public function getCompiledChildren(NodeInterface $node, ElementInterface $parent = null);
+    public function getCompiledChildren(NodeInterface $node, ?ElementInterface $parent = null);
 
     /**
      * @param NodeInterface         $node
      * @param ElementInterface|null $element
      *
      * @return mixed
      */
-    public function compileNodeChildren(NodeInterface $node, ElementInterface $element = null);
+    public function compileNodeChildren(NodeInterface $node, ?ElementInterface $element = null);
 
     /**
      * @param ParserNodeInterface $node
      * @param ElementInterface    $parent
      *
      * @return null|BlockElement|ElementInterface
      */
-    public function compileNode(ParserNodeInterface $node, ElementInterface $parent = null);
+    public function compileNode(ParserNodeInterface $node, ?ElementInterface $parent = null);
 
     /**
      * @return CompilerInterface

diff --git a/src/Phug/Compiler/CompilerInterface.php b/src/Phug/Compiler/CompilerInterface.php
@@ -92,7 +92,7 @@ public function getBlocks();
      * @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 @@ public function getCurrentImportPaths();
      *
      * @return null|ElementInterface
      */
-    public function compileNode(NodeInterface $node, ElementInterface $parent = null);
+    public function compileNode(NodeInterface $node, ?ElementInterface $parent = null);
 
     /**
      * @param string $input