ClassType: added possibility to define trait resolution rules

Author: dg

src/PhpGenerator/ClassType.php

@@ -89,6 +89,12 @@ public function __construct($name = NULL, PhpNamespace $namespace = NULL)
 	 */
 	public function __toString()
 	{
+		$traits = [];
+		foreach ($this->traits as $trait => $resolutions) {
+			$traits[] = 'use ' . ($this->namespace ? $this->namespace->unresolveName($trait) : $trait)
+				. ($resolutions ? " {\n\t" . implode(";\n\t", $resolutions) . ";\n}" : ';');
+		}
+
 		$consts = [];
 		foreach ($this->consts as $const) {
 			$consts[] = Helpers::formatDocComment($const->getComment())
@@ -117,7 +123,7 @@ public function __toString()
 			. ($this->implements ? 'implements ' . implode(', ', $mapper($this->implements)) . ' ' : '')
 			. ($this->name ? "\n" : '') . "{\n"
 			. Strings::indent(
-				($this->traits ? 'use ' . implode(";\nuse ", $mapper($this->traits)) . ";\n\n" : '')
+				($this->traits ? implode("\n", $traits) . "\n\n" : '')
 				. ($this->consts ? implode('', $consts) . "\n" : '')
 				. ($this->properties ? implode("\n", $properties) . "\n" : '')
 				. ($this->methods ? "\n" . implode("\n\n\n", $this->methods) . "\n\n" : ''), 1)
@@ -293,7 +299,7 @@ public function addImplement($type)
 	 */
 	public function setTraits(array $traits)
 	{
-		$this->traits = $traits;
+		$this->traits = array_fill_keys($traits, []);
 		return $this;
 	}
 
@@ -303,17 +309,17 @@ public function setTraits(array $traits)
 	 */
 	public function getTraits()
 	{
-		return $this->traits;
+		return array_keys($this->traits);
 	}
 
 
 	/**
 	 * @param  string
 	 * @return static
 	 */
-	public function addTrait($trait)
+	public function addTrait($trait, array $resolutions = [])
 	{
-		$this->traits[] = (string) $trait;
+		$this->traits[$trait] = $resolutions;
 		return $this;
 	}
 

tests/PhpGenerator/ClassType.expect

@@ -7,6 +7,9 @@
 abstract final class Example extends ParentClass implements IExample, IOne
 {
 	use ObjectTrait;
+	use AnotherTrait {
+		sayHello as protected;
+	}
 
 	const ROLE = 'admin';
 	const ACTIVE = FALSE;

tests/PhpGenerator/ClassType.phpt

@@ -20,6 +20,7 @@ $class
 	->addImplement('IExample')
 	->addImplement('IOne')
 	->addTrait('ObjectTrait')
+	->addTrait('AnotherTrait', ['sayHello as protected'])
 	->addComment("Description of class.\nThis is example\n")
 	->addComment('@property-read Nette\Forms\Form $form')
 	->setConsts(['ROLE' => 'admin'])