Merge branch '5.11.x'

Author: williamdes

phpstan-baseline.neon

@@ -1965,12 +1965,6 @@ parameters:
 			count: 1
 			path: src/Utils/Query.php
 
-		-
-			message: '#^Cannot access property \$keyword on PhpMyAdmin\\SqlParser\\Token\|null\.$#'
-			identifier: property.nonObject
-			count: 1
-			path: src/Utils/Query.php
-
 		-
 			message: '#^Cannot call method has\(\) on PhpMyAdmin\\SqlParser\\Components\\OptionsArray\|null\.$#'
 			identifier: method.nonObject

psalm-baseline.xml

@@ -1122,7 +1122,6 @@
       <code><![CDATA[$i]]></code>
     </PossiblyNullOperand>
     <PossiblyNullPropertyFetch>
-      <code><![CDATA[$lexer->list->getNextOfType(TokenType::Keyword)->keyword]]></code>
       <code><![CDATA[$statement->into->dest]]></code>
     </PossiblyNullPropertyFetch>
     <PossiblyNullReference>

src/Utils/Query.php

@@ -410,12 +410,12 @@ public static function getClause(
         /**
          * The type of this clause.
          */
-        $clauseType = $lexer->list->getNextOfType(TokenType::Keyword)->keyword;
+        $clauseType = $lexer->list->getNextOfType(TokenType::Keyword);
 
         /**
          * The index of this clause.
          */
-        $clauseIdx = $clauses[$clauseType] ?? -1;
+        $clauseIdx = $clauseType !== null ? $clauses[$clauseType->keyword] ?? -1 : -1;
 
         $firstClauseIdx = $clauseIdx;
         $lastClauseIdx = $clauseIdx;

tests/Utils/QueryTest.php

@@ -5,6 +5,7 @@
 namespace PhpMyAdmin\SqlParser\Tests\Utils;
 
 use PhpMyAdmin\SqlParser\Parser;
+use PhpMyAdmin\SqlParser\Statement;
 use PhpMyAdmin\SqlParser\Tests\TestCase;
 use PhpMyAdmin\SqlParser\Utils\Query;
 use PhpMyAdmin\SqlParser\Utils\StatementFlags;
@@ -379,6 +380,40 @@ public function testGetAll(): void
         );
     }
 
+    public function testGetAllTableWithDotsAndReplaceClause(): void
+    {
+        $query = 'SELECT * FROM `test.2024-11-01` ORDER BY `test.2024-11-01`.`id` ASC;';
+
+        $statements = Query::getAll($query);
+
+        self::assertInstanceOf(Statement::class, $statements->statement);
+        self::assertNotNull($statements->parser->list);
+
+        $fromClause = Query::replaceClause($statements->statement, $statements->parser->list, 'ORDER BY', '');
+        self::assertEquals('SELECT * FROM `test.2024-11-01`  ', $fromClause);
+
+        $fromClause = Query::replaceClause($statements->statement, $statements->parser->list, 'ORDER BY');
+        self::assertEquals('SELECT * FROM `test.2024-11-01` ORDER BY ', $fromClause);
+
+        // With spaces
+        $fromClause = Query::replaceClause($statements->statement, $statements->parser->list, 'ORDER BY  ');
+        self::assertEquals('SELECT * FROM `test.2024-11-01` ORDER BY   ', $fromClause);
+    }
+
+    public function testGetAllTableWithDotsAndReplaceClauseEmptyName(): void
+    {
+        $query = 'SELECT * FROM `test.2024-11-01` ORDER BY `test.2024-11-01`.`id` ASC;';
+
+        $statements = Query::getAll($query);
+
+        self::assertInstanceOf(Statement::class, $statements->statement);
+        self::assertNotNull($statements->parser->list);
+
+        // No clause name
+        $result = Query::replaceClause($statements->statement, $statements->parser->list, '');
+        self::assertEquals('  SELECT * FROM `test.2024-11-01` ORDER BY `test.2024-11-01`.`id` ASC', $result);
+    }
+
     /** @param string[] $expected */
     #[DataProvider('getTablesProvider')]
     public function testGetTables(string $query, array $expected): void
@@ -626,6 +661,25 @@ public function testReplaceNonExistingPart(): void
         );
     }
 
+    public function testReplaceClauseTableWithDots(): void
+    {
+        $query = 'SELECT * FROM `test.2024-11-01` ORDER BY `test.2024-11-01`.`id` ASC;';
+
+        $parser = new Parser($query);
+
+        self::assertNotNull($parser->list);
+
+        $fromClause = Query::replaceClause($parser->statements[0], $parser->list, 'ORDER BY', '');
+        self::assertEquals('SELECT * FROM `test.2024-11-01`  ', $fromClause);
+
+        $fromClause = Query::replaceClause($parser->statements[0], $parser->list, 'ORDER BY');
+        self::assertEquals('SELECT * FROM `test.2024-11-01` ORDER BY ', $fromClause);
+
+        // With spaces
+        $fromClause = Query::replaceClause($parser->statements[0], $parser->list, 'ORDER BY  ', '');
+        self::assertEquals('SELECT * FROM `test.2024-11-01`  ', $fromClause);
+    }
+
     public function testReplaceClauses(): void
     {
         $parser = new Parser('SELECT *, (SELECT 1) FROM film LIMIT 0, 10;');