[BUGFIX] Require doctrine/lexer to get removed lexer classes 89/57589/4
authorAndreas Fernandez <a.fernandez@scripting-base.de>
Fri, 13 Jul 2018 18:15:30 +0000 (20:15 +0200)
committerMarkus Klein <markus.klein@typo3.org>
Sat, 14 Jul 2018 17:19:40 +0000 (19:19 +0200)
With the release of doctrine/dbal in version 2.8, the class
`Doctrine\Common\Lexer` got removed. To circumvent this issue, the
package `doctrine/lexer` will be used.

Used composer command:

    composer require doctrine/lexer:^1.0

Resolves: #85552
Releases: master, 8.7
Change-Id: I5dd007c3b95be42dfd3305f750606ae4fcabedf2
Reviewed-on: https://review.typo3.org/57589
Reviewed-by: Benni Mack <benni@typo3.org>
Tested-by: Benni Mack <benni@typo3.org>
Tested-by: TYPO3com <no-reply@typo3.com>
Reviewed-by: Markus Klein <markus.klein@typo3.org>
Tested-by: Markus Klein <markus.klein@typo3.org>
composer.json
composer.lock
typo3/sysext/core/Classes/Database/Schema/Parser/Lexer.php

index 290ebcb..a2b87e0 100644 (file)
@@ -40,6 +40,7 @@
                "doctrine/annotations": "^1.3",
                "doctrine/dbal": "^2.7",
                "doctrine/instantiator": "~1.0.4",
+               "doctrine/lexer": "^1.0",
                "guzzlehttp/guzzle": "^6.3.0",
                "mso/idna-convert": "^1.1.0",
                "nikic/php-parser": "^4.0",
index db907ae..3401a01 100644 (file)
@@ -4,7 +4,7 @@
         "Read more about it at https://getcomposer.org/doc/01-basic-usage.md#installing-dependencies",
         "This file is @generated automatically"
     ],
-    "content-hash": "cdd3f50178d65296d5e324c3258fc785",
+    "content-hash": "aaf1db876f7b24fb81c6bfba76365511",
     "packages": [
         {
             "name": "cogpowered/finediff",
index 3df756c..59909ad 100644 (file)
@@ -19,7 +19,7 @@ namespace TYPO3\CMS\Core\Database\Schema\Parser;
 /**
  * Scans a MySQL CREATE TABLE statement for tokens.
  */
-class Lexer extends \Doctrine\Common\Lexer
+class Lexer extends \Doctrine\Common\Lexer\AbstractLexer
 {
     // All tokens that are not valid identifiers must be < 100
     const T_NONE = 1;