Factory::fromClassReflection() refactoring

Author: dg

src/PhpGenerator/Factory.php

@@ -37,11 +37,18 @@ public function fromClassReflection(
 			throw new Nette\NotSupportedException('The $withBodies parameter cannot be used for anonymous or internal classes or interfaces.');
 		}
 
-		$enumIface = null;
+		$from = $from->isEnum() ? new \ReflectionEnum($from->getName()) : $from;
+		$class = $this->createClassObject($from);
+		$this->setupInheritance($class, $from);
+		$this->populateMembers($class, $from, $withBodies);
+		return $class;
+	}
+
+
+	private function createClassObject(\ReflectionClass $from): ClassLike
+	{
 		if ($from->isEnum()) {
 			$class = new EnumType($from->getShortName());
-			$from = new \ReflectionEnum($from->getName());
-			$enumIface = $from->isBacked() ? \BackedEnum::class : \UnitEnum::class;
 		} elseif ($from->isAnonymous()) {
 			$class = new ClassType;
 		} elseif ($from->isInterface()) {
@@ -57,16 +64,21 @@ public function fromClassReflection(
 		if (!$from->isAnonymous()) {
 			(new PhpNamespace($from->getNamespaceName()))->add($class);
 		}
+		return $class;
+	}
 
+
+	private function setupInheritance(ClassLike $class, \ReflectionClass $from): void
+	{
 		$ifaces = $from->getInterfaceNames();
 		foreach ($ifaces as $iface) {
 			$ifaces = array_filter($ifaces, fn(string $item): bool => !is_subclass_of($iface, $item));
 		}
+		$ifaces = array_diff($ifaces, [\BackedEnum::class, \UnitEnum::class]);
 
 		if ($from->isInterface()) {
 			$class->setExtends($ifaces);
 		} elseif ($ifaces) {
-			$ifaces = array_diff($ifaces, [$enumIface]);
 			$class->setImplements($ifaces);
 		}
 
@@ -76,7 +88,12 @@ public function fromClassReflection(
 			$class->setExtends($from->getParentClass()->name);
 			$class->setImplements(array_diff($class->getImplements(), $from->getParentClass()->getInterfaceNames()));
 		}
+	}
+
 
+	private function populateMembers(ClassLike $class, \ReflectionClass $from, bool $withBodies): void
+	{
+		// Properties
 		$props = [];
 		foreach ($from->getProperties() as $prop) {
 			$declaringClass = Reflection::getPropertyDeclaringClass($prop);
@@ -100,14 +117,15 @@ public function fromClassReflection(
 			$class->setProperties($props);
 		}
 
+		// Methods and trait resolutions
 		$methods = $resolutions = [];
 		foreach ($from->getMethods() as $method) {
 			$declaringMethod = Reflection::getMethodDeclaringMethod($method);
 			$declaringClass = $declaringMethod->getDeclaringClass();
 
 			if (
 				$declaringClass->name === $from->name
-				&& (!$enumIface || !method_exists($enumIface, $method->name))
+				&& (!$from->isEnum() || !method_exists($from->isBacked() ? \BackedEnum::class : \UnitEnum::class, $method->name))
 			) {
 				$methods[] = $m = $this->fromMethodReflection($method);
 				if ($withBodies) {
@@ -130,6 +148,7 @@ public function fromClassReflection(
 
 		$class->setMethods($methods);
 
+		// Traits
 		foreach ($from->getTraitNames() as $trait) {
 			$trait = $class->addTrait($trait);
 			foreach ($resolutions as $resolution) {
@@ -138,6 +157,7 @@ public function fromClassReflection(
 			$resolutions = [];
 		}
 
+		// Constants and enum cases
 		$consts = $cases = [];
 		foreach ($from->getReflectionConstants() as $const) {
 			if ($class->isEnum() && $from->hasCase($const->name)) {
@@ -153,8 +173,6 @@ public function fromClassReflection(
 		if ($cases) {
 			$class->setCases($cases);
 		}
-
-		return $class;
 	}