tests: improved trait test

tests/PhpGenerator/ClassType.from.trait.phpt

@@ -10,38 +10,23 @@ use Nette\PhpGenerator\ClassType;
 
 
 require __DIR__ . '/../bootstrap.php';
+require __DIR__ . '/fixtures/traits.php';
 
 
-/**
- * Trait1
- */
-trait Trait1
-{
-	public function func1()
-	{
-	}
-}
-
-trait Trait2
-{
-	protected function func2()
-	{
-	}
-}
-
-abstract class Class1
-{
-	use Trait1;
-	use Trait2;
-}
-
-class Class2 extends Class1
-{
-}
-
 $res[] = ClassType::from('Trait1');
 $res[] = ClassType::from('Trait2');
 $res[] = ClassType::from('Class1');
 $res[] = ClassType::from('Class2');
+$res[] = ClassType::from('Class3');
 
 sameFile(__DIR__ . '/expected/ClassType.from.trait.expect', implode("\n", $res));
+
+
+$res = [];
+$res[] = ClassType::withBodiesFrom('Trait1');
+$res[] = ClassType::withBodiesFrom('Trait2');
+$res[] = ClassType::withBodiesFrom('Class1');
+$res[] = ClassType::withBodiesFrom('Class2');
+$res[] = ClassType::withBodiesFrom('Class3');
+
+sameFile(__DIR__ . '/expected/ClassType.from.trait.bodies.expect', implode("\n", $res));

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

@@ -0,0 +1,84 @@
+/**
+ * Trait1
+ */
+trait Trait1
+{
+	public $x1;
+
+
+	public function f1()
+	{
+		echo 'Trait1::f1';
+	}
+}
+
+trait Trait2
+{
+	protected $x2;
+	public $x1;
+
+
+	public function f2()
+	{
+		echo 'Trait2::f2';
+	}
+
+
+	public function f1()
+	{
+	}
+}
+
+class Class1 extends ParentClass
+{
+	protected $x2;
+
+
+	public function f1()
+	{
+	}
+
+
+	public function f2()
+	{
+	}
+}
+
+class Class2 extends ParentClass
+{
+	public $x1;
+	protected $x2;
+
+
+	public function f1()
+	{
+		echo 'Class2::f1';
+	}
+
+
+	public function f2()
+	{
+	}
+}
+
+class Class3 extends ParentClass
+{
+	public $x1;
+	protected $x2;
+
+
+	public function f1()
+	{
+		echo 'Class3::f1';
+	}
+
+
+	public function f2()
+	{
+	}
+
+
+	public function aliased()
+	{
+	}
+}

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

@@ -3,30 +3,78 @@
  */
 trait Trait1
 {
-	public function func1()
+	public $x1;
+
+
+	public function f1()
 	{
 	}
 }
 
 trait Trait2
 {
-	protected function func2()
+	protected $x2;
+	public $x1;
+
+
+	public function f2()
+	{
+	}
+
+
+	public function f1()
 	{
 	}
 }
 
-abstract class Class1
+class Class1 extends ParentClass
 {
-	public function func1()
+	protected $x2;
+
+
+	public function f1()
 	{
 	}
 
 
-	protected function func2()
+	public function f2()
 	{
 	}
 }
 
-class Class2 extends Class1
+class Class2 extends ParentClass
 {
+	public $x1;
+	protected $x2;
+
+
+	public function f1()
+	{
+	}
+
+
+	public function f2()
+	{
+	}
+}
+
+class Class3 extends ParentClass
+{
+	public $x1;
+	protected $x2;
+
+
+	public function f1()
+	{
+	}
+
+
+	public function f2()
+	{
+	}
+
+
+	public function aliased()
+	{
+	}
 }

tests/PhpGenerator/fixtures/traits.php

@@ -0,0 +1,79 @@
+<?php
+
+declare(strict_types=1);
+
+/**
+ * Trait1
+ */
+trait Trait1
+{
+	public $x1;
+
+
+	public function f1()
+	{
+		echo 'Trait1::f1';
+	}
+}
+
+
+trait Trait2
+{
+	use Trait1;
+
+	protected $x2;
+
+
+	public function f2()
+	{
+		echo 'Trait2::f2';
+	}
+}
+
+
+class ParentClass
+{
+	public $x1;
+
+
+	public function f1()
+	{
+		echo 'ParentClass::f1';
+	}
+}
+
+
+class Class1 extends ParentClass
+{
+	use Trait2;
+}
+
+
+class Class2 extends ParentClass
+{
+	use Trait2;
+
+	public $x1;
+
+
+	public function f1()
+	{
+		echo 'Class2::f1';
+	}
+}
+
+
+class Class3 extends ParentClass
+{
+	use Trait2 {
+		Trait2::f1 as aliased;
+	}
+
+	public $x1;
+
+
+	public function f1()
+	{
+		echo 'Class3::f1';
+	}
+}