Factory: loads method bodies from traits

Author: dg

src/PhpGenerator/Factory.php

@@ -52,12 +52,17 @@ public function fromClassReflection(\ReflectionClass $from, bool $withBodies = f
 		}
 		$class->setProperties($props);
 
-		$bodies = $withBodies ? $this->loadMethodBodies($from) : [];
+		$bodies = [];
 		foreach ($from->getMethods() as $method) {
 			if ($method->getDeclaringClass()->name === $from->name) {
 				$methods[] = $m = $this->fromMethodReflection($method);
-				if (isset($bodies[$method->name])) {
-					$m->setBody($bodies[$method->name]);
+				if ($withBodies) {
+					$srcMethod = Nette\Utils\Reflection::getMethodDeclaringMethod($method);
+					$srcClass = $srcMethod->getDeclaringClass()->name;
+					$b = $bodies[$srcClass] = $bodies[$srcClass] ?? $this->loadMethodBodies($srcMethod->getDeclaringClass());
+					if (isset($b[$srcMethod->name])) {
+						$m->setBody($b[$srcMethod->name]);
+					}
 				}
 			}
 		}

tests/PhpGenerator/ClassType.from.bodies.phpt

@@ -17,6 +17,9 @@ Assert::exception(function () {
 
 Assert::exception(function () {
 	ClassType::withBodiesFrom(new class {
+		public function f()
+		{
+		}
 	});
 }, Nette\NotSupportedException::class, 'Anonymous classes are not supported.');
 

tests/PhpGenerator/ClassType.from.trait.phpt

@@ -18,6 +18,8 @@ $res[] = ClassType::from('Trait2');
 $res[] = ClassType::from('Class1');
 $res[] = ClassType::from('Class2');
 $res[] = ClassType::from('Class3');
+$res[] = ClassType::from('Class4');
+$res[] = ClassType::from('Class5');
 
 sameFile(__DIR__ . '/expected/ClassType.from.trait.expect', implode("\n", $res));
 
@@ -28,5 +30,7 @@ $res[] = ClassType::withBodiesFrom('Trait2');
 $res[] = ClassType::withBodiesFrom('Class1');
 $res[] = ClassType::withBodiesFrom('Class2');
 $res[] = ClassType::withBodiesFrom('Class3');
+$res[] = ClassType::withBodiesFrom('Class4');
+$res[] = ClassType::withBodiesFrom('Class5');
 
 sameFile(__DIR__ . '/expected/ClassType.from.trait.bodies.expect', implode("\n", $res));

tests/PhpGenerator/expected/ClassType.from.trait.bodies.expect

@@ -26,6 +26,7 @@ trait Trait2
 
 	public function f1()
 	{
+		echo 'Trait1::f1';
 	}
 }
 
@@ -36,11 +37,13 @@ class Class1 extends ParentClass
 
 	public function f1()
 	{
+		echo 'Trait1::f1';
 	}
 
 
 	public function f2()
 	{
+		echo 'Trait2::f2';
 	}
 }
 
@@ -58,6 +61,7 @@ class Class2 extends ParentClass
 
 	public function f2()
 	{
+		echo 'Trait2::f2';
 	}
 }
 
@@ -75,10 +79,46 @@ class Class3 extends ParentClass
 
 	public function f2()
 	{
+		echo 'Trait2::f2';
+	}
+
+
+	public function aliased()
+	{
+		echo 'Trait1::f1';
 	}
+}
+
+class Class4 extends ParentClass
+{
+	protected $x2;
 
 
 	public function aliased()
 	{
+		echo 'Class4::aliased';
+	}
+
+
+	public function f1()
+	{
+		echo 'Trait1::f1';
+	}
+
+
+	public function f2()
+	{
+		echo 'Trait2::f2';
+	}
+}
+
+class Class5
+{
+	public $x1;
+
+
+	public function f1()
+	{
+		echo 'Trait1b::f1';
 	}
 }

tests/PhpGenerator/expected/ClassType.from.trait.expect

@@ -78,3 +78,33 @@ class Class3 extends ParentClass
 	{
 	}
 }
+
+class Class4 extends ParentClass
+{
+	protected $x2;
+
+
+	public function aliased()
+	{
+	}
+
+
+	public function f1()
+	{
+	}
+
+
+	public function f2()
+	{
+	}
+}
+
+class Class5
+{
+	public $x1;
+
+
+	public function f1()
+	{
+	}
+}

tests/PhpGenerator/fixtures/traits.php

@@ -77,3 +77,34 @@ public function f1()
 		echo 'Class3::f1';
 	}
 }
+
+
+class Class4 extends ParentClass
+{
+	use Trait2 {
+		Trait2::f1 as aliased;
+	}
+
+
+	public function aliased()
+	{
+		echo 'Class4::aliased';
+	}
+}
+
+
+trait Trait1b
+{
+	public function f1()
+	{
+		echo 'Trait1b::f1';
+	}
+}
+
+
+class Class5
+{
+	use Trait1, Trait1b {
+		Trait1b::f1 insteadof Trait1;
+	}
+}