Ast: improved parsing of class names

czproject · May 14, 2024 · 28bdde0 · 28bdde0
1 parent 7d481f0
commit 28bdde0
Show file tree

Hide file tree

Showing 4 changed files with 38 additions and 4 deletions.
diff --git a/src/Ast/ClassNode.php b/src/Ast/ClassNode.php
@@ -164,8 +164,9 @@ public static function parse(NodeParser $parser)
 			$implements = NULL;
 			$blockOpener = '';
 
-			if ($parser->isCurrent(T_STRING)) { // class name
-				$name = Name::parse($parser->createSubParser());
+			$name = Name::tryParseClassName($parser->createSubParser());
+
+			if ($name !== NULL) { // class name
 				$parser->tryConsumeWhitespace();
 
 			} elseif ($parser->isCurrent('(')) {

diff --git a/src/Ast/InterfaceNode.php b/src/Ast/InterfaceNode.php
@@ -108,7 +108,7 @@ public static function parse(NodeParser $parser)
 			$extends = NULL;
 			$blockOpener = '';
 
-			$name = Name::parse($parser->createSubParser());
+			$name = Name::parseClassName($parser->createSubParser());
 			$parser->tryConsumeWhitespace();
 
 			if ($parser->isCurrent(T_EXTENDS)) {

diff --git a/src/Ast/Name.php b/src/Ast/Name.php
@@ -128,4 +128,37 @@ public static function parse(NodeParser $parser)
 			$parser->close();
 			return new self($nodeIndentation, $name);
 		}
+
+
+		/**
+		 * @return self
+		 */
+		public static function parseClassName(NodeParser $parser)
+		{
+			$name = self::tryParseClassName($parser);
+
+			if ($name === NULL) {
+				$parser->errorUnknowToken('Missing name');
+			}
+
+			return $name;
+		}
+
+
+		/**
+		 * @return self|NULL
+		 */
+		public static function tryParseClassName(NodeParser $parser)
+		{
+			$nodeIndentation = '';
+			$name = '';
+
+			if ($parser->isCurrent(T_STRING)) {
+				$nodeIndentation = $parser->consumeNodeIndentation();
+				$name = $parser->consumeTokenAsText(T_STRING);
+			}
+
+			$parser->close();
+			return $name !== '' ? new self($nodeIndentation, $name) : NULL;
+		}
 	}
diff --git a/src/Ast/TraitNode.php b/src/Ast/TraitNode.php
@@ -100,7 +100,7 @@ public static function parse(NodeParser $parser)
 			$parser->tryConsumeWhitespace();
 			$blockOpener = '';
 
-			$name = Name::parse($parser->createSubParser());
+			$name = Name::parseClassName($parser->createSubParser());
 			$parser->tryConsumeWhitespace();
 
 			$parser->tryConsumeWhitespace();