PHP 8.4 compatibility

.github/workflows/tests.yml

@@ -17,10 +17,10 @@ jobs:
     strategy:
       fail-fast: false
       matrix:
-        php: ['7.2', '7.3', '7.4', '8.0', '8.1', '8.2']
+        php: ['7.2', '7.3', '7.4', '8.0', '8.1', '8.2', '8.3', '8.4']
 
     steps:
-      - uses: actions/checkout@v3
+      - uses: actions/checkout@v4
 
       - name: Setup PHP
         uses: shivammathur/setup-php@v2

src/Behavior/CdataSection.php

@@ -39,7 +39,7 @@ public function getName(): string
         return '#cdata-section';
     }
 
-    public function handle(NodeInterface $node, ?DOMNode $domNode, Context $context, Behavior $behavior = null): ?DOMNode
+    public function handle(NodeInterface $node, ?DOMNode $domNode, Context $context, ?Behavior $behavior = null): ?DOMNode
     {
         if (!$this->secure || $domNode === null) {
             return $domNode;

src/Behavior/Comment.php

@@ -39,7 +39,7 @@ public function getName(): string
         return '#comment';
     }
 
-    public function handle(NodeInterface $node, ?DOMNode $domNode, Context $context, Behavior $behavior = null): ?DOMNode
+    public function handle(NodeInterface $node, ?DOMNode $domNode, Context $context, ?Behavior $behavior = null): ?DOMNode
     {
         if (!$this->secure || $domNode === null) {
             return $domNode;

src/Behavior/Handler/AsTextHandler.php

@@ -23,7 +23,7 @@
 
 class AsTextHandler implements HandlerInterface
 {
-    public function handle(NodeInterface $node, ?DOMNode $domNode, Context $context, Behavior $behavior = null): ?DOMNode
+    public function handle(NodeInterface $node, ?DOMNode $domNode, Context $context, ?Behavior $behavior = null): ?DOMNode
     {
         if ($domNode === null) {
             return null;

src/Behavior/Handler/ClosureHandler.php

@@ -34,7 +34,7 @@ public function __construct(Closure $closure)
         $this->closure = $closure;
     }
 
-    public function handle(NodeInterface $node, ?DOMNode $domNode, Context $context, Behavior $behavior = null): ?DOMNode
+    public function handle(NodeInterface $node, ?DOMNode $domNode, Context $context, ?Behavior $behavior = null): ?DOMNode
     {
         $result = call_user_func($this->closure, $node, $domNode, $context, $behavior);
         if ($result !== null && !$result instanceof DOMNode) {

src/Behavior/HandlerInterface.php

@@ -20,5 +20,5 @@
 
 interface HandlerInterface
 {
-    public function handle(NodeInterface $node, ?DOMNode $domNode, Context $context, Behavior $behavior = null): ?DOMNode;
+    public function handle(NodeInterface $node, ?DOMNode $domNode, Context $context, ?Behavior $behavior = null): ?DOMNode;
 }

src/Behavior/Tag.php

@@ -62,7 +62,7 @@ class Tag implements NodeInterface
      */
     protected $attrs = [];
 
-    public function __construct(string $name, int $flags = null)
+    public function __construct(string $name, ?int $flags = null)
     {
         $this->name = $name;
         // using `null` as default - potentially allows switching

src/Context.php

@@ -32,7 +32,7 @@ class Context
      */
     public $initiator;
 
-    public function __construct(HTML5 $parser, InitiatorInterface $initiator = null)
+    public function __construct(HTML5 $parser, ?InitiatorInterface $initiator = null)
     {
         $this->parser = $parser;
         $this->initiator = $initiator;

src/Sanitizer.php

@@ -92,7 +92,7 @@ public function __construct(...$items)
         $this->parser = $this->createParser();
     }
 
-    public function sanitize(string $html, InitiatorInterface $initiator = null): string
+    public function sanitize(string $html, ?InitiatorInterface $initiator = null): string
     {
         $root = $this->parse($html);
         // @todo drop deprecated property
@@ -109,7 +109,7 @@ protected function parse(string $html): DOMDocumentFragment
         return $this->parser->parseFragment($html);
     }
 
-    protected function handle(DOMNode $domNode, InitiatorInterface $initiator = null): DOMNode
+    protected function handle(DOMNode $domNode, ?InitiatorInterface $initiator = null): DOMNode
     {
         $this->context = new Context($this->parser, $initiator);
         $this->beforeTraverse();
@@ -195,7 +195,7 @@ protected function replaceNode(DOMNode $source, ?DOMNode $target): ?DOMNode
         return $target;
     }
 
-    protected function createRules(InitiatorInterface $initiator = null): Rules
+    protected function createRules(?InitiatorInterface $initiator = null): Rules
     {
         $stream = fopen('php://temp', 'wb');
         return (new Rules($stream, self::mastermindsDefaultOptions))