Factory: reads class constants with visibility & phpDoc

Author: dg

src/PhpGenerator/Factory.php

@@ -41,7 +41,7 @@ public function fromClassReflection(\ReflectionClass $from): ClassType
 			$class->setExtends($from->getParentClass()->getName());
 			$class->setImplements(array_diff($class->getImplements(), $from->getParentClass()->getInterfaceNames()));
 		}
-		$props = $methods = [];
+		$props = $methods = $consts = [];
 		foreach ($from->getProperties() as $prop) {
 			if ($prop->isDefault() && $prop->getDeclaringClass()->getName() === $from->getName()) {
 				$props[] = $this->fromPropertyReflection($prop);
@@ -54,7 +54,14 @@ public function fromClassReflection(\ReflectionClass $from): ClassType
 			}
 		}
 		$class->setMethods($methods);
-		$class->setConstants($from->getConstants());
+
+		foreach ($from->getReflectionConstants() as $const) {
+			if ($const->getDeclaringClass()->name === $from->name) {
+				$consts[] = $this->fromConstantReflection($const);
+			}
+		}
+		$class->setConstants($consts);
+
 		return $class;
 	}
 
@@ -127,6 +134,19 @@ public function fromParameterReflection(\ReflectionParameter $from): Parameter
 	}
 
 
+	public function fromConstantReflection(\ReflectionClassConstant $from): Constant
+	{
+		$const = new Constant($from->name);
+		$const->setValue($from->getValue());
+		$const->setVisibility($from->isPrivate()
+			? ClassType::VISIBILITY_PRIVATE
+			: ($from->isProtected() ? ClassType::VISIBILITY_PROTECTED : ClassType::VISIBILITY_PUBLIC)
+		);
+		$const->setComment(Helpers::unformatDocComment((string) $from->getDocComment()));
+		return $const;
+	}
+
+
 	public function fromPropertyReflection(\ReflectionProperty $from): Property
 	{
 		$defaults = $from->getDeclaringClass()->getDefaultProperties();

tests/PhpGenerator/expected/ClassType.from.expect

@@ -59,7 +59,7 @@ class Class3
 
 class Class4
 {
-	const THE_CONSTANT = 9;
+	public const THE_CONSTANT = 9;
 }
 
 class Class5
@@ -79,8 +79,9 @@ class Class5
 	}
 }
 
-class Class6
+class Class6 extends Class4
 {
-	const THE_PRIVATE_CONSTANT = 9;
-	const THE_PUBLIC_CONSTANT = 9;
+	/** const doc */
+	private const THE_PRIVATE_CONSTANT = 9;
+	public const THE_PUBLIC_CONSTANT = 9;
 }

tests/PhpGenerator/fixtures/classes.php

@@ -92,8 +92,9 @@ public function func3(): void
 }
 
 
-class Class6
+class Class6 extends Class4
 {
+	/** const doc */
 	private const THE_PRIVATE_CONSTANT = 9;
 	public const THE_PUBLIC_CONSTANT = 9;
 }