Merge pull request #276 from alcaeus/php-7.4-compat

Fix lookahead on PHP 7.4
doctrine · Aug 8, 2019 · fa4c4e8 · fa4c4e8
2 parents 3f35255 + 635b79b
commit fa4c4e8
Show file tree

Hide file tree

Showing 3 changed files with 10 additions and 6 deletions.
diff --git a/.travis.yml b/.travis.yml
@@ -6,7 +6,6 @@ php:
   - 7.1
   - 7.2
   - 7.3
-  - 7.4snapshot
   - nightly
 
 cache:
@@ -24,10 +23,13 @@ script:
 
 jobs:
   allow_failures:
-    - php: 7.4snapshot
     - php: nightly
 
   include:
+    - stage: Test
+      php: 7.4snapshot
+      install: travis_retry composer require --dev phpunit/phpunit:^7.5@dev
+
     - stage: Lint
       before_script:
         - travis_retry composer require --dev --prefer-dist --prefer-stable phpstan/phpstan:^0.7

diff --git a/composer.json b/composer.json
@@ -18,7 +18,7 @@
     },
     "require-dev": {
         "doctrine/cache": "1.*",
-        "phpunit/phpunit": "^7.0"
+        "phpunit/phpunit": "^7.5@dev"
     },
     "config": {
         "sort-packages": true

diff --git a/lib/Doctrine/Common/Annotations/DocParser.php b/lib/Doctrine/Common/Annotations/DocParser.php
@@ -997,9 +997,11 @@ private function Identifier()
 
         $className = $this->lexer->token['value'];
 
-        while ($this->lexer->lookahead['position'] === ($this->lexer->token['position'] + strlen($this->lexer->token['value']))
-                && $this->lexer->isNextToken(DocLexer::T_NAMESPACE_SEPARATOR)) {
-
+        while (
+            null !== $this->lexer->lookahead &&
+            $this->lexer->lookahead['position'] === ($this->lexer->token['position'] + strlen($this->lexer->token['value'])) &&
+            $this->lexer->isNextToken(DocLexer::T_NAMESPACE_SEPARATOR)
+        ) {
             $this->match(DocLexer::T_NAMESPACE_SEPARATOR);
             $this->matchAny(self::$classIdentifiers);