Don't assign null to $delimiter

Signed-off-by: Kamil Tekiela <[email protected]>
phpmyadmin · Jan 16, 2024 · 5f7535e · 5f7535e
1 parent fe06c29
commit 5f7535e
Show file tree

Hide file tree

Showing 3 changed files with 2 additions and 11 deletions.
diff --git a/phpstan-baseline.neon b/phpstan-baseline.neon
@@ -385,11 +385,6 @@ parameters:
 			count: 3
 			path: src/Lexer.php
 
-		-
-			message: "#^Property PhpMyAdmin\\\\SqlParser\\\\Lexer\\:\\:\\$delimiter \\(string\\) does not accept null\\.$#"
-			count: 1
-			path: src/Lexer.php
-
 		-
 			message: "#^Strict comparison using \\=\\=\\= between non\\-empty\\-array\\<non\\-empty\\-string, int\\> and array\\{\\} will always evaluate to false\\.$#"
 			count: 1

diff --git a/psalm-baseline.xml b/psalm-baseline.xml
@@ -590,7 +590,6 @@
       <code>$token</code>
     </PossiblyNullArgument>
     <PossiblyNullOperand>
-      <code><![CDATA[$this->delimiter]]></code>
       <code><![CDATA[$this->str[$this->last++]]]></code>
       <code><![CDATA[$this->str[$this->last++]]]></code>
       <code><![CDATA[$this->str[$this->last]]]></code>
@@ -616,9 +615,6 @@
       <code><![CDATA[$this->str[++$this->last]]]></code>
       <code><![CDATA[$this->str[++$this->last]]]></code>
     </PossiblyNullOperand>
-    <PossiblyNullPropertyAssignmentValue>
-      <code>null</code>
-    </PossiblyNullPropertyAssignmentValue>
     <PossiblyNullPropertyFetch>
       <code><![CDATA[$next->type]]></code>
       <code><![CDATA[$next->value]]></code>

diff --git a/src/Lexer.php b/src/Lexer.php
@@ -239,7 +239,7 @@ public function lex(): void
                 $pos = $this->last + 1;
 
                 // Parsing the delimiter.
-                $this->delimiter = null;
+                $this->delimiter = '';
                 $delimiterLen = 0;
                 while (
                     ++$this->last < $this->len
@@ -250,7 +250,7 @@ public function lex(): void
                     ++$delimiterLen;
                 }
 
-                if (empty($this->delimiter)) {
+                if ($this->delimiter === '') {
                     $this->error('Expected delimiter.', '', $this->last);
                     $this->delimiter = ';';
                 }