Mercurial > hg > isophonics-drupal-site
diff vendor/doctrine/annotations/lib/Doctrine/Common/Annotations/TokenParser.php @ 12:7a779792577d
Update Drupal core to v8.4.5 (via Composer)
author | Chris Cannam |
---|---|
date | Fri, 23 Feb 2018 15:52:07 +0000 |
parents | 4c8ae668cc8c |
children |
line wrap: on
line diff
--- a/vendor/doctrine/annotations/lib/Doctrine/Common/Annotations/TokenParser.php Fri Feb 23 15:51:18 2018 +0000 +++ b/vendor/doctrine/annotations/lib/Doctrine/Common/Annotations/TokenParser.php Fri Feb 23 15:52:07 2018 +0000 @@ -99,6 +99,8 @@ */ public function parseUseStatement() { + + $groupRoot = ''; $class = ''; $alias = ''; $statements = array(); @@ -114,13 +116,18 @@ $explicitAlias = true; $alias = ''; } else if ($token === ',') { - $statements[strtolower($alias)] = $class; + $statements[strtolower($alias)] = $groupRoot . $class; $class = ''; $alias = ''; $explicitAlias = false; } else if ($token === ';') { - $statements[strtolower($alias)] = $class; + $statements[strtolower($alias)] = $groupRoot . $class; break; + } else if ($token === '{' ) { + $groupRoot = $class; + $class = ''; + } else if ($token === '}' ) { + continue; } else { break; }