Merge branch '5.8.x'

williamdes · williamdes · commit 201822cdcb96 · 2023-04-22T00:22:35.000+02:00
diff --git a/psalm-baseline.xml b/psalm-baseline.xml
@@ -304,8 +304,8 @@
   </file>
   <file src="src/Components/IntoKeyword.php">
     <MixedArgument>
-      <code><![CDATA[$token->value]]></code>
-      <code><![CDATA[$token->value]]></code>
+      <code><![CDATA[$token->keyword]]></code>
+      <code><![CDATA[$token->keyword]]></code>
     </MixedArgument>
     <MixedAssignment>
       <code><![CDATA[$ret->dest]]></code>
@@ -319,6 +319,8 @@
     <PossiblyNullArgument>
       <code><![CDATA[$component->fieldsOptions]]></code>
       <code><![CDATA[$component->linesOptions]]></code>
+      <code><![CDATA[$token->keyword]]></code>
+      <code><![CDATA[$token->keyword]]></code>
     </PossiblyNullArgument>
     <PossiblyNullOperand>
       <code><![CDATA[$component->dest]]></code>
