even a little more stricter

Author: mvorisek

src/Tokenizer.php

@@ -105,10 +105,8 @@ final class Tokenizer
         'FOREIGN',
         'FROM',
         'FULLTEXT',
-        'FUNCTION',
         'GRANT',
         'GROUP',
-        'GROUPS',
         'HAVING',
         'HIGH_PRIORITY',
         'HOUR_MICROSECOND',
@@ -170,7 +168,6 @@ final class Tokenizer
         'NOT',
         'NULL',
         'NUMERIC',
-        'OFFSET',
         'ON',
         'OPTIMIZE',
         'OPTION',
@@ -205,7 +202,6 @@ final class Tokenizer
         'REVOKE',
         'RIGHT',
         'RLIKE',
-        'ROW',
         'ROW_NUMBER',
         'ROWS',
         'SCHEMA',
@@ -321,8 +317,10 @@ final class Tokenizer
         'FLUSH',
         'FOLLOWING',
         'FULL',
+        'FUNCTION',
         'GLOBAL',
         'GRANTS',
+        'GROUPS',
         'HEAP',
         'HOSTS',
         'HOUR',
@@ -358,6 +356,7 @@ final class Tokenizer
         'MRG_MYISAM',
         'MYISAM',
         'NAMES',
+        'OFFSET',
         'OPEN',
         'PACK_KEYS',
         'PAGE',
@@ -382,6 +381,7 @@ final class Tokenizer
         'RESTORE',
         'RETURNS',
         'ROLLBACK',
+        'ROW',
         'ROW_FORMAT',
         'SECOND',
         'SECURITY',

tests/TokenizerTest.php

@@ -14,6 +14,7 @@
 use function array_intersect;
 use function array_merge;
 use function array_unique;
+use function array_values;
 use function explode;
 use function preg_match;
 use function strtoupper;
@@ -555,8 +556,8 @@ public function testKeywordsReservedAreUpperCasedAndWithoutWhitespace(): void
         $tokenizerReflClass = new ReflectionClass(Tokenizer::class);
         /** @var list<string> $tokenizerReserved */
         $tokenizerReserved = array_unique(array_merge(
-            $tokenizerReflClass->getProperty('reserved')->getDefaultValue(),
-            $tokenizerReflClass->getProperty('nonreserved')->getDefaultValue(),
+            (array) $tokenizerReflClass->getProperty('reserved')->getDefaultValue(),
+            (array) $tokenizerReflClass->getProperty('nonreserved')->getDefaultValue(),
         ));
 
         $kwsDiff = array_filter($tokenizerReserved, static function ($v) {
@@ -571,8 +572,8 @@ public function testKeywordsReservedToplevelAndNewlineAreReserved(): void
         $tokenizerReflClass = new ReflectionClass(Tokenizer::class);
         /** @var list<string> $tokenizerReserved */
         $tokenizerReserved = array_unique(array_merge(
-            $tokenizerReflClass->getProperty('reserved')->getDefaultValue(),
-            $tokenizerReflClass->getProperty('nonreserved')->getDefaultValue(),
+            (array) $tokenizerReflClass->getProperty('reserved')->getDefaultValue(),
+            (array) $tokenizerReflClass->getProperty('nonreserved')->getDefaultValue(),
         ));
         /** @var list<string> $tokenizerReservedToplevel */
         $tokenizerReservedToplevel = $tokenizerReflClass->getProperty('reservedToplevel')->getDefaultValue();
@@ -587,24 +588,19 @@ public function testKeywordsReservedToplevelAndNewlineAreReserved(): void
             }
         }
 
-        $kwsDiff = array_diff($kws, $tokenizerReserved);
-
-        self::assertSame([], $kwsDiff);
+        self::assertSame([], array_diff($kws, $tokenizerReserved));
     }
 
-    public function testKeywordsReservedMysqlAreReserved(): void
+    public function testKeywordsReservedAreStrictlyMysqlAndMariadbReserved(): void
     {
         $tokenizerReflClass = new ReflectionClass(Tokenizer::class);
         /** @var list<string> $tokenizerReserved */
         $tokenizerReserved = $tokenizerReflClass->getProperty('reserved')->getDefaultValue();
 
-        $kwsDiff = array_diff(array_intersect(self::KEYWORDS_RESERVED_MYSQL, self::KEYWORDS_RESERVED_MARIADB), $tokenizerReserved);
-
-        self::assertSame([], $kwsDiff);
-
-        $kwsDiff = array_diff($tokenizerReserved, array_unique(array_merge(self::KEYWORDS_RESERVED_MYSQL, self::KEYWORDS_RESERVED_MARIADB)));
-
-        self::assertSame([], $kwsDiff);
+        self::assertSame(
+            $tokenizerReserved,
+            array_values(array_intersect(self::KEYWORDS_RESERVED_MYSQL, self::KEYWORDS_RESERVED_MARIADB)),
+        );
     }
 
     #[DoesNotPerformAssertions]