Factory: generates trait resolutions

Author: dg

src/PhpGenerator/Factory.php

@@ -84,7 +84,7 @@ public function fromClassReflection(
 		}
 		$class->setProperties($props);
 
-		$methods = [];
+		$methods = $resolutions = [];
 		foreach ($from->getMethods() as $method) {
 			$realMethod = Reflection::getMethodDeclaringMethod($method);
 			$declaringClass = ($materializeTraits ? $method : $realMethod)->getDeclaringClass();
@@ -103,12 +103,21 @@ public function fromClassReflection(
 					}
 				}
 			}
+
+			$modifier = $realMethod->getModifiers() !== $method->getModifiers()
+				? ' ' . $this->getVisibility($method)
+				: null;
+			$alias = $realMethod->name !== $method->name ? ' ' . $method->name : '';
+			if ($modifier || $alias) {
+				$resolutions[] = $realMethod->name . ' as' . $modifier . $alias;
+			}
 		}
 		$class->setMethods($methods);
 
 		if (!$materializeTraits) {
 			foreach ($from->getTraitNames() as $trait) {
-				$class->addTrait($trait);
+				$class->addTrait($trait, $resolutions);
+				$resolutions = [];
 			}
 		}
 

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

@@ -108,7 +108,7 @@ class Class3 extends ParentClass
 	}
 
 
-	public function aliased()
+	protected function aliased()
 	{
 		echo 'Trait1::f1';
 	}
@@ -144,7 +144,7 @@ class Class5
 	public $x1;
 
 
-	public function f1()
+	private function f1()
 	{
 		echo 'Trait1b::f1';
 	}

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

@@ -97,7 +97,7 @@ class Class3 extends ParentClass
 	}
 
 
-	public function aliased()
+	protected function aliased()
 	{
 	}
 }
@@ -129,7 +129,7 @@ class Class5
 	public $x1;
 
 
-	public function f1()
+	private function f1()
 	{
 	}
 }

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

@@ -62,7 +62,9 @@ class Class2 extends ParentClass
 
 class Class3 extends ParentClass
 {
-	use Trait2;
+	use Trait2 {
+		f1 as protected aliased;
+	}
 
 	/** info */
 	public $x1;
@@ -86,6 +88,8 @@ class Class4 extends ParentClass
 
 class Class5
 {
-	use Trait1;
+	use Trait1 {
+		f1 as private;
+	}
 	use Trait1b;
 }

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

@@ -57,7 +57,9 @@ class Class2 extends ParentClass
 
 class Class3 extends ParentClass
 {
-	use Trait2;
+	use Trait2 {
+		f1 as protected aliased;
+	}
 
 	/** info */
 	public $x1;
@@ -79,6 +81,8 @@ class Class4 extends ParentClass
 
 class Class5
 {
-	use Trait1;
+	use Trait1 {
+		f1 as private;
+	}
 	use Trait1b;
 }

tests/PhpGenerator/fixtures/traits.php

@@ -67,7 +67,8 @@ public function f1()
 class Class3 extends ParentClass
 {
 	use Trait2 {
-		Trait2::f1 as aliased;
+		f1 as protected aliased;
+		f1 as private; // ignored because Class3::f1() exists
 	}
 
 	/** info */
@@ -84,7 +85,7 @@ public function f1()
 class Class4 extends ParentClass
 {
 	use Trait2 {
-		Trait2::f1 as aliased;
+		f1 as protected aliased; // ignored because Class4::aliased() exists
 	}
 
 
@@ -107,6 +108,7 @@ public function f1()
 class Class5
 {
 	use Trait1, Trait1b {
-		Trait1b::f1 insteadof Trait1;
+		Trait1b::f1 insteadof Trait1; // not yet supported
+		Trait1b::f1 as private;
 	}
 }