Merge branch '6.0.x'

Signed-off-by: Maurício Meneghini Fauth <mauricio@mfauth.com.br>

Author: MauricioFauth

.github/workflows/tests.yml

@@ -15,12 +15,12 @@ jobs:
     continue-on-error: ${{ matrix.experimental }}
     strategy:
       matrix:
-        php-version: [ '8.2', '8.3', '8.4' ]
+        php-version: [ '8.2', '8.3', '8.4', '8.5' ]
         os: [ ubuntu-latest ]
         experimental: [ false ]
         composer-options: [ '' ]
         include:
-          - { php-version: '8.5', experimental: true, os: ubuntu-latest, composer-options: '--ignore-platform-req=php+' }
+          - { php-version: '8.6', experimental: true, os: ubuntu-latest, composer-options: '--ignore-platform-req=php+' }
     steps:
       - name: Checkout code
         uses: actions/checkout@v6
@@ -83,12 +83,12 @@ jobs:
     continue-on-error: ${{ matrix.experimental }}
     strategy:
       matrix:
-        php-version: [ '8.2', '8.3', '8.4' ]
+        php-version: [ '8.2', '8.3', '8.4', '8.5' ]
         os: [ ubuntu-latest ]
         experimental: [ false ]
         composer-options: [ '' ]
         include:
-          - { php-version: '8.5', experimental: true, os: ubuntu-latest, composer-options: '--ignore-platform-req=php+' }
+          - { php-version: '8.6', experimental: true, os: ubuntu-latest, composer-options: '--ignore-platform-req=php+' }
     steps:
       - name: Checkout code
         uses: actions/checkout@v6

tests/Builder/StatementTest.php

@@ -162,14 +162,8 @@ public static function getAliasesProvider(): array
                     'shop' => [
                         'alias' => null,
                         'tables' => [
-                            'mytable' => [
-                                'alias' => null,
-                                'columns' => ['a' => 'x'],
-                            ],
-                            'other' => [
-                                'alias' => 'o',
-                                'columns' => ['b' => 'y'],
-                            ],
+                            'mytable' => ['alias' => null, 'columns' => ['a' => 'x']],
+                            'other' => ['alias' => 'o', 'columns' => ['b' => 'y']],
                         ],
                     ],
                 ],

tests/Utils/QueryTest.php

@@ -666,7 +666,6 @@ 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', '');