Merge #658 - Avoid using a null alias as an array offset in getAliases()

Pull-request: #658
Signed-off-by: William Desportes <williamdes@wdes.fr>

Author: williamdes

psalm-baseline.xml

@@ -1359,9 +1359,6 @@
     <MixedArrayOffset occurrences="1">
       <code>$tables[$thisDb][$expr-&gt;table]</code>
     </MixedArrayOffset>
-    <PossiblyNullArrayOffset occurrences="1">
-      <code>$tables[$thisDb]</code>
-    </PossiblyNullArrayOffset>
   </file>
   <file src="src/Utils/Query.php">
     <InvalidNullableReturnType occurrences="1">

src/Utils/Misc.php

@@ -68,6 +68,10 @@ public static function getAliases($statement, $database)
                 ];
             }
 
+            if ($expr->alias === null || $expr->alias === '') {
+                continue;
+            }
+
             if (! isset($tables[$thisDb])) {
                 $tables[$thisDb] = [];
             }

tests/Utils/MiscTest.php

@@ -132,6 +132,25 @@ public static function getAliasesProvider(): array
                     ],
                 ],
             ],
+            [
+                'SELECT mytable.a x, o.b y FROM mytable JOIN other o ON o.id = mytable.id',
+                'shop',
+                [
+                    'shop' => [
+                        'alias' => null,
+                        'tables' => [
+                            'mytable' => [
+                                'alias' => null,
+                                'columns' => ['a' => 'x'],
+                            ],
+                            'other' => [
+                                'alias' => 'o',
+                                'columns' => ['b' => 'y'],
+                            ],
+                        ],
+                    ],
+                ],
+            ],
         ];
     }
 }