Merge branch '5.11.x'

Author: williamdes

psalm-baseline.xml

@@ -806,7 +806,6 @@
       <code><![CDATA[array<string, array<string, array<string, array<string, array<string, string>|string|null>>|null>>]]></code>
     </MixedReturnTypeCoercion>
     <PossiblyNullArrayOffset>
-      <code><![CDATA[$tables[$thisDb]]]></code>
       <code><![CDATA[Parser::STATEMENT_PARSERS]]></code>
     </PossiblyNullArrayOffset>
     <PossiblyUnusedProperty>

src/Statements/SelectStatement.php

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

tests/Builder/StatementTest.php

@@ -155,6 +155,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'],
+                            ],
+                        ],
+                    ],
+                ],
+            ],
         ];
     }
 }