diff --git a/composer.json b/composer.json
index be4612f0d..5a313900c 100644
--- a/composer.json
+++ b/composer.json
@@ -1,5 +1,5 @@
 {
-    "name": "phpmyadmin/sql-parser",
+    "name": "wpml/sql-parser",
     "description": "A validating SQL lexer and parser with a focus on MySQL dialect.",
     "license": "GPL-2.0-or-later",
     "keywords": ["sql", "lexer", "parser", "analysis"],
diff --git a/src/Components/Condition.php b/src/Components/Condition.php
index 700b071ef..ace8da553 100644
--- a/src/Components/Condition.php
+++ b/src/Components/Condition.php
@@ -87,7 +87,7 @@ class Condition extends Component
      */
     public function __construct($expr = null)
     {
-        $this->expr = trim($expr);
+        $this->expr = trim((string) $expr);
     }
 
     /**
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);
diff --git a/src/TokensList.php b/src/TokensList.php
index 4a3eec6a1..7517d1cab 100644
--- a/src/TokensList.php
+++ b/src/TokensList.php
@@ -153,6 +153,7 @@ public function getNextOfTypeAndValue($type, $value)
      * @param int   $offset the offset to be set
      * @param Token $value  the token to be saved
      */
+    #[\ReturnTypeWillChange]
     public function offsetSet($offset, $value)
     {
         if ($offset === null) {
@@ -169,6 +170,7 @@ public function offsetSet($offset, $value)
      *
      * @return Token
      */
+    #[\ReturnTypeWillChange]
     public function offsetGet($offset)
     {
         return $offset < $this->count ? $this->tokens[$offset] : null;
@@ -181,6 +183,7 @@ public function offsetGet($offset)
      *
      * @return bool
      */
+    #[\ReturnTypeWillChange]
     public function offsetExists($offset)
     {
         return $offset < $this->count;
@@ -191,6 +194,7 @@ public function offsetExists($offset)
      *
      * @param int $offset the offset to be unset
      */
+    #[\ReturnTypeWillChange]
     public function offsetUnset($offset)
     {
         unset($this->tokens[$offset]);