Merge #467 - Use a strict array type

williamdes · williamdes · commit 5f0da174079f · 2023-06-05T19:41:54.000+02:00
Pull-request: #467 Signed-off-by: William Desportes <williamdes@wdes.fr>
diff --git a/src/Components/ArrayObj.php b/src/Components/ArrayObj.php
@@ -24,14 +24,14 @@ final class ArrayObj implements Component
      *
      * @var string[]
      */
-    public $raw = [];
+    public array $raw = [];
 
     /**
      * The array that contains the processed value of each token.
      *
      * @var string[]
      */
-    public $values = [];
+    public array $values = [];
 
     /**
      * @param string[] $raw    the unprocessed values
@@ -168,7 +168,7 @@ public static function build($component, array $options = []): string
             return implode(', ', $component);
         }
 
-        if (! empty($component->raw)) {
+        if ($component->raw !== []) {
             return '(' . implode(', ', $component->raw) . ')';
         }
 
diff --git a/src/Components/DataType.php b/src/Components/DataType.php
@@ -63,7 +63,7 @@ final class DataType implements Component
      *
      * @var int[]|string[]
      */
-    public $parameters = [];
+    public array $parameters = [];
 
     /**
      * The options of this data type.
@@ -162,7 +162,7 @@ public static function build($component, array $options = []): string
             $component->name : strtolower($component->name);
 
         $parameters = '';
-        if (! empty($component->parameters)) {
+        if ($component->parameters !== []) {
             $parameters = '(' . implode(',', $component->parameters) . ')';
         }
 
diff --git a/src/Components/Key.php b/src/Components/Key.php
@@ -198,7 +198,7 @@ public static function parse(Parser $parser, TokensList $list, array $options =
                         $state = 3;
                     } elseif (($token->value === ',') || ($token->value === ')')) {
                         $state = $token->value === ',' ? 2 : 4;
-                        if (! empty($lastColumn)) {
+                        if ($lastColumn !== []) {
                             $ret->columns[] = $lastColumn;
                             $lastColumn = [];
                         }
diff --git a/src/Statements/SelectStatement.php b/src/Statements/SelectStatement.php
@@ -236,14 +236,14 @@ class SelectStatement extends Statement
      *
      * @var Expression[]
      */
-    public $expr = [];
+    public array $expr = [];
 
     /**
      * Tables used as sources for this statement.
      *
      * @var Expression[]
      */
-    public $from = [];
+    public array $from = [];
 
     /**
      * Index hints
@@ -327,7 +327,7 @@ class SelectStatement extends Statement
      *
      * @var SelectStatement[]
      */
-    public $union = [];
+    public array $union = [];
 
     /**
      * The end options of this query.
@@ -349,7 +349,7 @@ public function getClauses()
         // This is a cheap fix for `SELECT` statements that contain `UNION`.
         // The `ORDER BY` and `LIMIT` clauses should be at the end of the
         // statement.
-        if (! empty($this->union)) {
+        if ($this->union !== []) {
             $clauses = static::$clauses;
             unset($clauses['ORDER BY'], $clauses['LIMIT']);
             $clauses['ORDER BY'] = [
@@ -376,7 +376,7 @@ public function getClauses()
      */
     public function getAliases(string $database): array
     {
-        if (empty($this->expr) || empty($this->from)) {
+        if ($this->expr === [] || $this->from === []) {
             return [];
         }
 
diff --git a/src/TokensList.php b/src/TokensList.php
@@ -47,7 +47,7 @@ class TokensList implements ArrayAccess
      */
     public function __construct(array $tokens = [], $count = -1)
     {
-        if (empty($tokens)) {
+        if ($tokens === []) {
             return;
         }
 
diff --git a/src/Utils/Query.php b/src/Utils/Query.php
@@ -287,12 +287,12 @@ class Query
      * @return array<string, bool|string>
      * @psalm-return QueryFlagsType
      */
-    private static function getFlagsSelect($statement, $flags)
+    private static function getFlagsSelect(SelectStatement $statement, $flags)
     {
         $flags['querytype'] = 'SELECT';
         $flags['is_select'] = true;
 
-        if (! empty($statement->from)) {
+        if ($statement->from !== []) {
             $flags['select_from'] = true;
         }
 
@@ -343,7 +343,7 @@ private static function getFlagsSelect($statement, $flags)
             $flags['having'] = true;
         }
 
-        if (! empty($statement->union)) {
+        if ($statement->union !== []) {
             $flags['union'] = true;
         }
 

Original file line number	Diff line number	Diff line change
`@@ -24,14 +24,14 @@ final class ArrayObj implements Component`
`24`	`24`	`*`
`25`	`25`	`* @var string[]`
`26`	`26`	`*/`
`27`		`- public $raw = [];`
	`27`	`+ public array $raw = [];`
`28`	`28`
`29`	`29`	`/**`
`30`	`30`	`* The array that contains the processed value of each token.`
`31`	`31`	`*`
`32`	`32`	`* @var string[]`
`33`	`33`	`*/`
`34`		`- public $values = [];`
	`34`	`+ public array $values = [];`
`35`	`35`
`36`	`36`	`/**`
`37`	`37`	`* @param string[] $raw the unprocessed values`
`@@ -168,7 +168,7 @@ public static function build($component, array $options = []): string`
`168`	`168`	`return implode(', ', $component);`
`169`	`169`	`}`
`170`	`170`
`171`		`- if (! empty($component->raw)) {`
	`171`	`+ if ($component->raw !== []) {`
`172`	`172`	`return '(' . implode(', ', $component->raw) . ')';`
`173`	`173`	`}`
`174`	`174`
Original file line number	Diff line number	Diff line change
`@@ -63,7 +63,7 @@ final class DataType implements Component`
`63`	`63`	`*`
`64`	`64`	`* @var int[]\|string[]`
`65`	`65`	`*/`
`66`		`- public $parameters = [];`
	`66`	`+ public array $parameters = [];`
`67`	`67`
`68`	`68`	`/**`
`69`	`69`	`* The options of this data type.`
`@@ -162,7 +162,7 @@ public static function build($component, array $options = []): string`
`162`	`162`	`$component->name : strtolower($component->name);`
`163`	`163`
`164`	`164`	`$parameters = '';`
`165`		`- if (! empty($component->parameters)) {`
	`165`	`+ if ($component->parameters !== []) {`
`166`	`166`	`$parameters = '(' . implode(',', $component->parameters) . ')';`
`167`	`167`	`}`
`168`	`168`
Original file line number	Diff line number	Diff line change
`@@ -198,7 +198,7 @@ public static function parse(Parser $parser, TokensList $list, array $options =`
`198`	`198`	`$state = 3;`
`199`	`199`	`} elseif (($token->value === ',') \|\| ($token->value === ')')) {`
`200`	`200`	`$state = $token->value === ',' ? 2 : 4;`
`201`		`- if (! empty($lastColumn)) {`
	`201`	`+ if ($lastColumn !== []) {`
`202`	`202`	`$ret->columns[] = $lastColumn;`
`203`	`203`	`$lastColumn = [];`
`204`	`204`	`}`
Original file line number	Diff line number	Diff line change
`@@ -47,7 +47,7 @@ class TokensList implements ArrayAccess`
`47`	`47`	`*/`
`48`	`48`	`public function __construct(array $tokens = [], $count = -1)`
`49`	`49`	`{`
`50`		`- if (empty($tokens)) {`
	`50`	`+ if ($tokens === []) {`
`51`	`51`	`return;`
`52`	`52`	`}`
`53`	`53`
Original file line number	Diff line number	Diff line change
`@@ -287,12 +287,12 @@ class Query`
`287`	`287`	`* @return array<string, bool\|string>`
`288`	`288`	`* @psalm-return QueryFlagsType`
`289`	`289`	`*/`
`290`		`- private static function getFlagsSelect($statement, $flags)`
	`290`	`+ private static function getFlagsSelect(SelectStatement $statement, $flags)`
`291`	`291`	`{`
`292`	`292`	`$flags['querytype'] = 'SELECT';`
`293`	`293`	`$flags['is_select'] = true;`
`294`	`294`
`295`		`- if (! empty($statement->from)) {`
	`295`	`+ if ($statement->from !== []) {`
`296`	`296`	`$flags['select_from'] = true;`
`297`	`297`	`}`
`298`	`298`
`@@ -343,7 +343,7 @@ private static function getFlagsSelect($statement, $flags)`
`343`	`343`	`$flags['having'] = true;`
`344`	`344`	`}`
`345`	`345`
`346`		`- if (! empty($statement->union)) {`
	`346`	`+ if ($statement->union !== []) {`
`347`	`347`	`$flags['union'] = true;`
`348`	`348`	`}`
`349`	`349`