Add null to properties not set in constructors

Fixes Psalm's PropertyNotSetInConstructor issues.

Signed-off-by: Maurício Meneghini Fauth <[email protected]>

Author: MauricioFauth

phpstan-baseline.neon

@@ -25,7 +25,7 @@ class CaseExpression extends Component
     /**
      * The value to be compared.
      *
-     * @var Expression
+     * @var Expression|null
      */
     public $value;
 
@@ -53,14 +53,14 @@ class CaseExpression extends Component
     /**
      * The result in ELSE section of expr.
      *
-     * @var Expression
+     * @var Expression|null
      */
     public $else_result;
 
     /**
      * The alias of this CASE statement.
      *
-     * @var string
+     * @var string|null
      */
     public $alias;
 

psalm-baseline.xml

@@ -110,51 +110,51 @@ class CreateDefinition extends Component
     /**
      * The name of the new column.
      *
-     * @var string
+     * @var string|null
      */
     public $name;
 
     /**
      * Whether this field is a constraint or not.
      *
-     * @var bool
+     * @var bool|null
      */
     public $isConstraint;
 
     /**
      * The data type of thew new column.
      *
-     * @var DataType
+     * @var DataType|null
      */
     public $type;
 
     /**
      * The key.
      *
-     * @var Key
+     * @var Key|null
      */
     public $key;
 
     /**
      * The table that is referenced.
      *
-     * @var Reference
+     * @var Reference|null
      */
     public $references;
 
     /**
      * The options of this field.
      *
-     * @var OptionsArray
+     * @var OptionsArray|null
      */
     public $options;
 
     /**
-     * @param string       $name         the name of the field
-     * @param OptionsArray $options      the options of this field
-     * @param DataType|Key $type         the data type of this field or the key
-     * @param bool         $isConstraint whether this field is a constraint or not
-     * @param Reference    $references   references
+     * @param string|null       $name         the name of the field
+     * @param OptionsArray|null $options      the options of this field
+     * @param DataType|Key|null $type         the data type of this field or the key
+     * @param bool              $isConstraint whether this field is a constraint or not
+     * @param Reference|null    $references   references
      */
     public function __construct(
         $name = null,

src/Components/CaseExpression.php

@@ -52,35 +52,35 @@ class Expression extends Component
     /**
      * The name of this database.
      *
-     * @var string
+     * @var string|null
      */
     public $database;
 
     /**
      * The name of this table.
      *
-     * @var string
+     * @var string|null
      */
     public $table;
 
     /**
      * The name of the column.
      *
-     * @var string
+     * @var string|null
      */
     public $column;
 
     /**
      * The sub-expression.
      *
-     * @var string
+     * @var string|null
      */
     public $expr = '';
 
     /**
      * The alias of this expression.
      *
-     * @var string
+     * @var string|null
      */
     public $alias;
 
@@ -94,7 +94,7 @@ class Expression extends Component
     /**
      * The type of subquery.
      *
-     * @var string
+     * @var string|null
      */
     public $subquery;
 
@@ -108,12 +108,10 @@ class Expression extends Component
      * If the database, table or column name is not required, pass an empty
      * string.
      *
-     * @param string $database The name of the database or the the expression.
-     *                         the the expression.
-     * @param string $table    The name of the table or the alias of the expression.
-     *                         the alias of the expression.
-     * @param string $column   the name of the column
-     * @param string $alias    the name of the alias
+     * @param string|null $database The name of the database or the expression.
+     * @param string|null $table    The name of the table or the alias of the expression.
+     * @param string|null $column   the name of the column
+     * @param string|null $alias    the name of the alias
      */
     public function __construct($database = null, $table = null, $column = null, $alias = null)
     {

src/Components/CreateDefinition.php

@@ -24,20 +24,20 @@ class FunctionCall extends Component
     /**
      * The name of this function.
      *
-     * @var string
+     * @var string|null
      */
     public $name;
 
     /**
      * The list of parameters.
      *
-     * @var ArrayObj
+     * @var ArrayObj|null
      */
     public $parameters;
 
     /**
-     * @param string         $name       the name of the function to be called
-     * @param array|ArrayObj $parameters the parameters of this function
+     * @param string|null         $name       the name of the function to be called
+     * @param array|ArrayObj|null $parameters the parameters of this function
      */
     public function __construct($name = null, $parameters = null)
     {

src/Components/Expression.php

@@ -62,28 +62,28 @@ class IntoKeyword extends Component
     /**
      * Type of target (OUTFILE or SYMBOL).
      *
-     * @var string
+     * @var string|null
      */
     public $type;
 
     /**
      * The destination, which can be a table or a file.
      *
-     * @var string|Expression
+     * @var string|Expression|null
      */
     public $dest;
 
     /**
      * The name of the columns.
      *
-     * @var array
+     * @var array|null
      */
     public $columns;
 
     /**
      * The values to be selected into (SELECT .. INTO @var1).
      *
-     * @var Expression[]
+     * @var Expression[]|null
      */
     public $values;
 
@@ -92,14 +92,14 @@ class IntoKeyword extends Component
      *
      * @see static::$FIELDS_OPTIONS
      *
-     * @var OptionsArray
+     * @var OptionsArray|null
      */
     public $fields_options;
 
     /**
      * Whether to use `FIELDS` or `COLUMNS` while building.
      *
-     * @var bool
+     * @var bool|null
      */
     public $fields_keyword;
 
@@ -108,17 +108,17 @@ class IntoKeyword extends Component
      *
      * @see static::$LINES_OPTIONS
      *
-     * @var OptionsArray
+     * @var OptionsArray|null
      */
     public $lines_options;
 
     /**
-     * @param string            $type          type of destination (may be OUTFILE)
-     * @param string|Expression $dest          actual destination
-     * @param array             $columns       column list of destination
-     * @param array             $values        selected fields
-     * @param OptionsArray      $fieldsOptions options for FIELDS/COLUMNS keyword
-     * @param bool              $fieldsKeyword options for OPTIONS keyword
+     * @param string|null            $type          type of destination (may be OUTFILE)
+     * @param string|Expression|null $dest          actual destination
+     * @param array|null             $columns       column list of destination
+     * @param array|null             $values        selected fields
+     * @param OptionsArray|null      $fieldsOptions options for FIELDS/COLUMNS keyword
+     * @param bool|null              $fieldsKeyword options for OPTIONS keyword
      */
     public function __construct(
         $type = null,

src/Components/FunctionCall.php

@@ -24,7 +24,7 @@ final class WithKeyword extends Component
     /** @var ArrayObj[] */
     public $columns = [];
 
-    /** @var Parser */
+    /** @var Parser|null */
     public $statement;
 
     public function __construct(string $name)

src/Components/IntoKeyword.php

@@ -338,7 +338,7 @@ class Parser extends Core
     /**
      * The list of tokens that are parsed.
      *
-     * @var TokensList
+     * @var TokensList|null
      */
     public $list;
 
@@ -357,8 +357,8 @@ class Parser extends Core
     public $brackets = 0;
 
     /**
-     * @param string|UtfString|TokensList $list   the list of tokens to be parsed
-     * @param bool                        $strict whether strict mode should be enabled or not
+     * @param string|UtfString|TokensList|null $list   the list of tokens to be parsed
+     * @param bool                             $strict whether strict mode should be enabled or not
      */
     public function __construct($list = null, $strict = false)
     {

src/Components/WithKeyword.php

@@ -69,27 +69,27 @@ abstract class Statement implements Stringable
      *
      * @see static::$OPTIONS
      *
-     * @var OptionsArray
+     * @var OptionsArray|null
      */
     public $options;
 
     /**
      * The index of the first token used in this statement.
      *
-     * @var int
+     * @var int|null
      */
     public $first;
 
     /**
      * The index of the last token used in this statement.
      *
-     * @var int
+     * @var int|null
      */
     public $last;
 
     /**
-     * @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)
     {