Merge pull request #126 from doctrine/1.4.x

Merge 1.4.x up into 1.5.x

Author: greg0ire

src/Tokenizer.php

@@ -29,6 +29,7 @@ final class Tokenizer
     private array $reserved = [
         'ACCESSIBLE',
         'ACTION',
+        'ADD',
         'AFTER',
         'AGAINST',
         'AGGREGATE',
@@ -37,19 +38,25 @@ final class Tokenizer
         'ALTER',
         'ANALYSE',
         'ANALYZE',
+        'AND',
         'AS',
         'ASC',
         'AUTOCOMMIT',
         'AUTO_INCREMENT',
         'BACKUP',
         'BEGIN',
         'BETWEEN',
+        'BIGINT',
+        'BINARY',
         'BINLOG',
+        'BLOB',
         'BOTH',
+        'BY',
         'CASCADE',
         'CASE',
         'CHANGE',
         'CHANGED',
+        'CHAR',
         'CHARACTER',
         'CHARSET',
         'CHECK',
@@ -76,6 +83,7 @@ final class Tokenizer
         'DAY_HOUR',
         'DAY_MINUTE',
         'DAY_SECOND',
+        'DECIMAL',
         'DEFAULT',
         'DEFINER',
         'DELAYED',
@@ -87,6 +95,8 @@ final class Tokenizer
         'DISTINCTROW',
         'DIV',
         'DO',
+        'DOUBLE',
+        'DROP',
         'DUMPFILE',
         'DUPLICATE',
         'DYNAMIC',
@@ -99,23 +109,30 @@ final class Tokenizer
         'ESCAPE',
         'ESCAPED',
         'EVENTS',
+        'EXCEPT',
+        'EXCLUDE',
         'EXEC',
         'EXECUTE',
         'EXISTS',
         'EXPLAIN',
         'EXTENDED',
+        'FALSE',
         'FAST',
         'FETCH',
         'FIELDS',
         'FILE',
         'FILTER',
         'FIRST',
         'FIXED',
+        'FLOAT',
+        'FLOAT4',
+        'FLOAT8',
         'FLUSH',
         'FOLLOWING',
         'FOR',
         'FORCE',
         'FOREIGN',
+        'FROM',
         'FULL',
         'FULLTEXT',
         'FUNCTION',
@@ -124,6 +141,7 @@ final class Tokenizer
         'GRANTS',
         'GROUP',
         'GROUPS',
+        'HAVING',
         'HEAP',
         'HIGH_PRIORITY',
         'HOSTS',
@@ -138,28 +156,43 @@ final class Tokenizer
         'INDEX',
         'INDEXES',
         'INFILE',
+        'INNER',
         'INSERT',
         'INSERT_ID',
         'INSERT_METHOD',
+        'INT',
+        'INT1',
+        'INT2',
+        'INT3',
+        'INT4',
+        'INT8',
+        'INTEGER',
+        'INTERSECT',
         'INTERVAL',
         'INTO',
         'INVOKER',
         'IS',
         'ISOLATION',
+        'JOIN',
         'KEY',
         'KEYS',
         'KILL',
         'LAST_INSERT_ID',
         'LEADING',
+        'LEFT',
         'LEVEL',
         'LIKE',
+        'LIMIT',
         'LINEAR',
         'LINES',
         'LOAD',
         'LOCAL',
         'LOCK',
         'LOCKS',
         'LOGS',
+        'LONG',
+        'LONGBLOB',
+        'LONGTEXT',
         'LOW_PRIORITY',
         'MARIA',
         'MASTER',
@@ -173,24 +206,32 @@ final class Tokenizer
         'MAX_UPDATES_PER_HOUR',
         'MAX_USER_CONNECTIONS',
         'MEDIUM',
+        'MEDIUMBLOB',
+        'MEDIUMINT',
+        'MEDIUMTEXT',
         'MERGE',
         'MINUTE',
         'MINUTE_SECOND',
         'MIN_ROWS',
         'MODE',
+        'MODIFY',
         'MONTH',
         'MRG_MYISAM',
         'MYISAM',
         'NAMES',
         'NATURAL',
         'NOT',
         'NULL',
+        'NUMERIC',
         'OFFSET',
         'ON',
         'OPEN',
         'OPTIMIZE',
         'OPTION',
         'OPTIONALLY',
+        'OR',
+        'ORDER',
+        'OUTER',
         'OUTFILE',
         'OVER',
         'PACK_KEYS',
@@ -215,6 +256,7 @@ final class Tokenizer
         'READ',
         'READ_ONLY',
         'READ_WRITE',
+        'REAL',
         'RECURSIVE',
         'REFERENCES',
         'REGEXP',
@@ -230,13 +272,15 @@ final class Tokenizer
         'RETURN',
         'RETURNS',
         'REVOKE',
+        'RIGHT',
         'RLIKE',
         'ROLLBACK',
         'ROW',
         'ROWS',
         'ROW_FORMAT',
         'SECOND',
         'SECURITY',
+        'SELECT',
         'SEPARATOR',
         'SERIALIZABLE',
         'SESSION',
@@ -245,6 +289,7 @@ final class Tokenizer
         'SHOW',
         'SHUTDOWN',
         'SLAVE',
+        'SMALLINT',
         'SONAME',
         'SOUNDS',
         'SQL',
@@ -282,6 +327,9 @@ final class Tokenizer
         'TERMINATED',
         'THEN',
         'TIES',
+        'TINYBLOB',
+        'TINYINT',
+        'TINYTEXT',
         'TO',
         'TRAILING',
         'TRANSACTIONAL',
@@ -291,18 +339,27 @@ final class Tokenizer
         'TYPES',
         'UNBOUNDED',
         'UNCOMMITTED',
+        'UNION',
         'UNIQUE',
         'UNLOCK',
         'UNSIGNED',
+        'UPDATE',
         'USAGE',
         'USE',
         'USING',
+        'VALUES',
+        'VARBINARY',
+        'VARCHAR',
+        'VARCHARACTER',
         'VARIABLES',
         'VIEW',
         'WHEN',
+        'WHERE',
+        'WINDOW',
         'WITH',
         'WORK',
         'WRITE',
+        'XOR',
         'YEAR_MONTH',
     ];
 
@@ -392,21 +449,16 @@ final class Tokenizer
         'CEIL',
         'CEILING',
         'CENTROID',
-        'CHAR',
         'CHARACTER_LENGTH',
-        'CHARSET',
         'CHAR_LENGTH',
         'CHECKSUM_AGG',
         'COALESCE',
         'COERCIBILITY',
-        'COLLATION',
         'COMPRESS',
         'CONCAT',
         'CONCAT_WS',
         'CONNECTION_ID',
-        'CONTAINS',
         'CONV',
-        'CONVERT',
         'CONVERT_TZ',
         'CONVEXHULL',
         'COS',
@@ -419,23 +471,19 @@ final class Tokenizer
         'CURDATE',
         'CURRENT_DATE',
         'CURRENT_TIME',
-        'CURRENT_TIMESTAMP',
         'CURRENT_USER',
         'CURTIME',
-        'DATABASE',
         'DATE',
         'DATEDIFF',
         'DATE_ADD',
         'DATE_DIFF',
         'DATE_FORMAT',
         'DATE_SUB',
-        'DAY',
         'DAYNAME',
         'DAYOFMONTH',
         'DAYOFWEEK',
         'DAYOFYEAR',
         'DECODE',
-        'DEFAULT',
         'DEGREES',
         'DENSE_RANK',
         'DES_DECRYPT',
@@ -483,17 +531,12 @@ final class Tokenizer
         'GROUP_CONCAT',
         'GROUP_UNIQUE_USERS',
         'HEX',
-        'HOUR',
-        'IF',
-        'IFNULL',
         'INET_ATON',
         'INET_NTOA',
-        'INSERT',
         'INSTR',
         'INTERIORRINGN',
         'INTERSECTION',
         'INTERSECTS',
-        'INTERVAL',
         'ISCLOSED',
         'ISEMPTY',
         'ISNULL',
@@ -503,12 +546,10 @@ final class Tokenizer
         'IS_USED_LOCK',
         'LAG',
         'LAST_DAY',
-        'LAST_INSERT_ID',
         'LAST_VALUE',
         'LCASE',
         'LEAD',
         'LEAST',
-        'LEFT',
         'LENGTH',
         'LINEFROMTEXT',
         'LINEFROMWKB',
@@ -543,11 +584,9 @@ final class Tokenizer
         'MICROSECOND',
         'MID',
         'MIN',
-        'MINUTE',
         'MLINEFROMTEXT',
         'MLINEFROMWKB',
         'MOD',
-        'MONTH',
         'MONTHNAME',
         'MPOINTFROMTEXT',
         'MPOINTFROMWKB',
@@ -575,7 +614,6 @@ final class Tokenizer
         'OLD_PASSWORD',
         'ORD',
         'OVERLAPS',
-        'PASSWORD',
         'PERCENTILE_CONT',
         'PERCENTILE_DISC',
         'PERCENT_RANK',
@@ -603,16 +641,13 @@ final class Tokenizer
         'RELATED',
         'RELEASE_LOCK',
         'REPEAT',
-        'REPLACE',
         'REVERSE',
-        'RIGHT',
         'ROUND',
         'ROW_COUNT',
         'ROW_NUMBER',
         'RPAD',
         'RTRIM',
         'SCHEMA',
-        'SECOND',
         'SEC_TO_TIME',
         'SESSION_USER',
         'SHA',
@@ -654,7 +689,6 @@ final class Tokenizer
         'TOUCHES',
         'TO_DAYS',
         'TRIM',
-        'TRUNCATE',
         'UCASE',
         'UNCOMPRESS',
         'UNCOMPRESSED_LENGTH',

tests/SqlFormatterTest.php

@@ -68,7 +68,7 @@ public function testHighlightBinary(): void
         $html = '<pre style="color: black; background-color: white;">' .
             '<span style="font-weight:bold;">SELECT</span> <span style="color: blue;">' .
             $binaryData .
-            '</span> <span style="font-weight:bold;">AS</span> <span style="color: #333;">BINARY</span></pre>';
+            '</span> <span style="font-weight:bold;">AS</span> <span style="font-weight:bold;">BINARY</span></pre>';
 
         $this->assertSame($html, $this->formatter->highlight($sql));
     }