Merge #479 - $name property can never be a string

williamdes · williamdes · commit f9c7db59a8c0 · 2023-06-29T12:28:20.000+02:00
Pull-request: #479 Signed-off-by: William Desportes <williamdes@wdes.fr>
diff --git a/phpstan-baseline.neon b/phpstan-baseline.neon
@@ -620,11 +620,6 @@ parameters:
 			count: 1
 			path: src/Statements/CreateStatement.php
 
-		-
-			message: "#^Strict comparison using \\=\\=\\= between PhpMyAdmin\\\\SqlParser\\\\Components\\\\Expression and '' will always evaluate to false\\.$#"
-			count: 1
-			path: src/Statements/CreateStatement.php
-
 		-
 			message: "#^array\\<PhpMyAdmin\\\\SqlParser\\\\Token\\>\\|string does not accept PhpMyAdmin\\\\SqlParser\\\\Token\\.$#"
 			count: 4
diff --git a/psalm-baseline.xml b/psalm-baseline.xml
@@ -990,10 +990,6 @@
     </PossiblyNullPropertyFetch>
   </file>
   <file src="src/Statements/CreateStatement.php">
-    <DocblockTypeContradiction>
-      <code><![CDATA[$this->name === '']]></code>
-      <code><![CDATA[$this->name === '']]></code>
-    </DocblockTypeContradiction>
     <MixedArgument>
       <code><![CDATA[$this->$field]]></code>
     </MixedArgument>
diff --git a/src/Components/Expression.php b/src/Components/Expression.php
@@ -155,11 +155,9 @@ public function __construct($database = null, $table = null, $column = null, $al
      * @param TokensList           $list    the list of tokens that are being parsed
      * @param array<string, mixed> $options parameters for parsing
      *
-     * @return Expression|null
-     *
      * @throws ParserException
      */
-    public static function parse(Parser $parser, TokensList $list, array $options = [])
+    public static function parse(Parser $parser, TokensList $list, array $options = []): Expression|null
     {
         $ret = new static();
 
diff --git a/src/Statements/CreateStatement.php b/src/Statements/CreateStatement.php
@@ -279,10 +279,8 @@ class CreateStatement extends Statement
      * The name of the entity that is created.
      *
      * Used by all `CREATE` statements.
-     *
-     * @var Expression|null
      */
-    public $name;
+    public Expression|null $name = null;
 
     /**
      * The options of the entity (table, procedure, function, etc.).
@@ -548,7 +546,7 @@ public function parse(Parser $parser, TokensList $list): void
             ]
         );
 
-        if (! isset($this->name) || ($this->name === '')) {
+        if ($this->name === null) {
             $parser->error('The name of the entity was expected.', $list->tokens[$list->idx]);
         } else {
             ++$list->idx; // Skipping field.

Original file line number	Diff line number	Diff line change
`@@ -155,11 +155,9 @@ public function __construct($database = null, $table = null, $column = null, $al`
`155`	`155`	`* @param TokensList $list the list of tokens that are being parsed`
`156`	`156`	`* @param array<string, mixed> $options parameters for parsing`
`157`	`157`	`*`
`158`		`- * @return Expression\|null`
`159`		`- *`
`160`	`158`	`* @throws ParserException`
`161`	`159`	`*/`
`162`		`- public static function parse(Parser $parser, TokensList $list, array $options = [])`
	`160`	`+ public static function parse(Parser $parser, TokensList $list, array $options = []): Expression\|null`
`163`	`161`	`{`
`164`	`162`	`$ret = new static();`
`165`	`163`