From fda5caaa1ebdbb7472a16b9b9e383abb55b40e19 Mon Sep 17 00:00:00 2001
From: Diego Garcia <diego.g@onthegosystems.com>
Date: Fri, 27 Feb 2026 10:16:51 +0100
Subject: [PATCH 1/2] wpmldev-4407: PHP 8.4 compatibility

---
 src/Parser.php    | 4 ++--
 src/Statement.php | 6 +++---
 2 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/src/Parser.php b/src/Parser.php
index f09a210d6..09842f4b8 100644
--- a/src/Parser.php
+++ b/src/Parser.php
@@ -595,12 +595,12 @@ public function parse()
      * Creates a new error log.
      *
      * @param string $msg   the error message
-     * @param Token  $token the token that produced the error
+     * @param Token|null  $token the token that produced the error
      * @param int    $code  the code of the error
      *
      * @throws ParserException throws the exception, if strict mode is enabled
      */
-    public function error($msg, Token $token = null, $code = 0)
+    public function error($msg, $token = null, $code = 0)
     {
         $error = new ParserException(
             Translator::gettext($msg),
diff --git a/src/Statement.php b/src/Statement.php
index 4b47ea5f8..1c2ad510e 100644
--- a/src/Statement.php
+++ b/src/Statement.php
@@ -84,10 +84,10 @@ abstract class Statement
     /**
      * Constructor.
      *
-     * @param Parser     $parser the instance that requests parsing
-     * @param TokensList $list   the list of tokens to be parsed
+     * @param Parser|null     $parser the instance that requests parsing
+     * @param TokensList|null $list   the list of tokens to be parsed
      */
-    public function __construct(Parser $parser = null, TokensList $list = null)
+    public function __construct($parser = null, $list = null)
     {
         if (($parser !== null) && ($list !== null)) {
             $this->parse($parser, $list);

From 7ce9beb004f118f301b875abc576b3b4bcb4ac41 Mon Sep 17 00:00:00 2001
From: Diego Garcia <diego.g@onthegosystems.com>
Date: Wed, 4 Mar 2026 09:57:41 +0100
Subject: [PATCH 2/2] wpmldev-4407: PHP 8.4 compatibility

---
 src/Parser.php    | 2 +-
 src/Statement.php | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/Parser.php b/src/Parser.php
index 09842f4b8..5028fbf6a 100644
--- a/src/Parser.php
+++ b/src/Parser.php
@@ -600,7 +600,7 @@ public function parse()
      *
      * @throws ParserException throws the exception, if strict mode is enabled
      */
-    public function error($msg, $token = null, $code = 0)
+    public function error($msg, ?Token $token = null, $code = 0)
     {
         $error = new ParserException(
             Translator::gettext($msg),
diff --git a/src/Statement.php b/src/Statement.php
index 1c2ad510e..b8a014f88 100644
--- a/src/Statement.php
+++ b/src/Statement.php
@@ -87,7 +87,7 @@ abstract class Statement
      * @param Parser|null     $parser the instance that requests parsing
      * @param TokensList|null $list   the list of tokens to be parsed
      */
-    public function __construct($parser = null, $list = null)
+    public function __construct(?Parser $parser = null, ?TokensList $list = null)
     {
         if (($parser !== null) && ($list !== null)) {
             $this->parse($parser, $list);