Factory: constant values are tagged for resolving

Author: dg

src/PhpGenerator/Factory.php

@@ -219,9 +219,15 @@ public function fromParameterReflection(\ReflectionParameter $from): Parameter
 			$param->setType((string) $from->getType());
 		}
 		if ($from->isDefaultValueAvailable()) {
-			$param->setDefaultValue($from->isDefaultValueConstant()
-				? new Literal($from->getDefaultValueConstantName())
-				: $from->getDefaultValue());
+			if ($from->isDefaultValueConstant()) {
+				$parts = explode('::', $from->getDefaultValueConstantName());
+				if (count($parts) > 1) {
+					$parts[0] = Helpers::tagName($parts[0]);
+				}
+				$param->setDefaultValue(new Literal(implode('::', $parts)));
+			} else {
+				$param->setDefaultValue($from->getDefaultValue());
+			}
 			$param->setNullable($param->isNullable() && $param->getDefaultValue() !== null);
 		}
 		$param->setAttributes(self::getAttributes($from));

src/PhpGenerator/Helpers.php

@@ -85,7 +85,9 @@ public static function formatDocComment(string $content): string
 
 	public static function tagName(string $name, string $type = PhpNamespace::NAME_NORMAL): string
 	{
-		return "/*($type*/$name";
+		return isset(self::KEYWORDS[strtolower($name)])
+			? $name
+			: "/*($type*/$name";
 	}
 
 

tests/PhpGenerator/expected/ClassType.from.expect

@@ -55,7 +55,7 @@ class Class2 extends Class1 implements Interface2
 	}
 
 
-	private function func4(array $a = [], Class2 $b = null, $c = Abc\Unknown::ABC)
+	private function func4(array $a = [], Class2 $b = null, $c = Unknown::ABC)
 	{
 	}