Merge pull request #534 from kamil-tekiela/types-in-Token

Add native property types in Token
phpmyadmin · Jan 16, 2024 · 69db6d8 · 69db6d8
2 parents 31bf535 + 26d1c5f
commit 69db6d8
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 23 deletions.
diff --git a/psalm-baseline.xml b/psalm-baseline.xml
@@ -178,10 +178,6 @@
     <PossiblyInvalidPropertyFetch>
       <code><![CDATA[ArrayObj::parse($parser, $list)->values]]></code>
     </PossiblyInvalidPropertyFetch>
-    <PossiblyNullArgument>
-      <code><![CDATA[$token->keyword]]></code>
-      <code><![CDATA[$token->keyword]]></code>
-    </PossiblyNullArgument>
     <PossiblyNullOperand>
       <code><![CDATA[$this->dest]]></code>
     </PossiblyNullOperand>
@@ -431,9 +427,9 @@
     <PossiblyNullPropertyAssignmentValue>
       <code><![CDATA[$tmp->expr]]></code>
     </PossiblyNullPropertyAssignmentValue>
-    <RedundantConditionGivenDocblockType>
+    <RedundantCondition>
       <code><![CDATA[$token->value === ',']]></code>
-    </RedundantConditionGivenDocblockType>
+    </RedundantCondition>
   </file>
   <file src="src/Components/UnionKeyword.php">
     <PossiblyUnusedMethod>
@@ -630,7 +626,6 @@
     </MixedArrayOffset>
     <PossiblyNullArrayOffset>
       <code><![CDATA[$list->tokens]]></code>
-      <code>self::STATEMENT_PARSERS</code>
     </PossiblyNullArrayOffset>
     <PossiblyNullOperand>
       <code><![CDATA[$list->idx]]></code>
@@ -783,9 +778,6 @@
       <code><![CDATA[$fromExpr->column]]></code>
       <code><![CDATA[$fromExpr->table]]></code>
     </MixedPropertyFetch>
-    <PossiblyNullArgument>
-      <code><![CDATA[$token->keyword]]></code>
-    </PossiblyNullArgument>
     <PossiblyNullIterator>
       <code><![CDATA[$this->from]]></code>
     </PossiblyNullIterator>
@@ -1095,10 +1087,6 @@
       <code><![CDATA[$clauses[$token->keyword]]]></code>
       <code><![CDATA[$clauses[$token->keyword]]]></code>
     </MixedArrayOffset>
-    <MixedArrayTypeCoercion>
-      <code><![CDATA[$clauses[$token->keyword]]]></code>
-      <code><![CDATA[$clauses[$token->keyword]]]></code>
-    </MixedArrayTypeCoercion>
     <MixedAssignment>
       <code>$expr</code>
       <code>$expressions[]</code>

diff --git a/src/Token.php b/src/Token.php
@@ -69,17 +69,13 @@ class Token
 
     /**
      * The value this token contains (i.e. token after some evaluation).
-     *
-     * @var mixed
      */
-    public $value;
+    public mixed $value;
 
     /**
      * The keyword value this token contains, always uppercase.
-     *
-     * @var mixed|string|null
      */
-    public $keyword = null;
+    public mixed $keyword = null;
 
     /**
      * The type of this token.
@@ -96,10 +92,8 @@ class Token
      *
      * The position is counted in chars, not bytes, so you should
      * use mb_* functions to properly handle utf-8 multibyte chars.
-     *
-     * @var int|null
      */
-    public $position;
+    public int|null $position = null;
 
     /**
      * @param string    $token the value of the token