Security update for Core, with self-updated composer

[yaffs-website] / vendor / doctrine / annotations / lib / Doctrine / Common / Annotations / TokenParser.php

diff --git a/vendor/doctrine/annotations/lib/Doctrine/Common/Annotations/TokenParser.php b/vendor/doctrine/annotations/lib/Doctrine/Common/Annotations/TokenParser.php
index 9bdcccec92d21bfeb445ca34cea091fb93e89a91..bf1b71339072bece909f4513604fd3322ca29bd3 100644 (file)
--- a/vendor/doctrine/annotations/lib/Doctrine/Common/Annotations/TokenParser.php
+++ b/vendor/doctrine/annotations/lib/Doctrine/Common/Annotations/TokenParser.php
@@ -99,6 +99,8 @@ class TokenParser
      */
     public function parseUseStatement()
     {
+
+        $groupRoot = '';
         $class = '';
         $alias = '';
         $statements = array();
@@ -114,13 +116,18 @@ class TokenParser
                 $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;
             }