More tests on detecting traits

Author: gossi

src/model/PhpClass.php

@@ -38,14 +38,21 @@ public static function fromReflection(\ReflectionClass $ref) {
 			$class->setLongDescription($docblock->getLongDescription());
 		}
 
+		// methods
 		foreach ($ref->getMethods() as $method) {
 			$class->setMethod(static::createMethod($method));
 		}
 
+		// properties
 		foreach ($ref->getProperties() as $property) {
 			$class->setProperty(static::createProperty($property));
 		}
 
+		// traits
+		foreach ($ref->getTraits() as $trait) {
+			$class->addTrait(PhpTrait::fromReflection($trait));
+		}
+		
 		return $class;
 	}
 

src/model/PhpTrait.php

@@ -28,14 +28,21 @@ public static function fromReflection(\ReflectionClass $ref) {
 			$trait->setLongDescription($docblock->getLongDescription());
 		}
 
+		// methods
 		foreach ($ref->getMethods() as $method) {
 			$trait->setMethod(static::createMethod($method));
 		}
 
+		// properties
 		foreach ($ref->getProperties() as $property) {
 			$trait->setProperty(static::createProperty($property));
 		}
 
+		// traits
+		foreach ($ref->getTraits() as $trait) {
+			$trait->addTrait(PhpTrait::fromReflection($trait));
+		}
+		
 		return $trait;
 	}
 

src/model/parts/TraitsTrait.php

@@ -50,11 +50,11 @@ public function getTraits() {
 	 * @param PhpTrait|string $interface        	
 	 * @return boolean
 	 */
-	public function hasTrait($interface) {
-		if (!$interface instanceof PhpTrait) {
-			$interface = new PhpTrait($interface);
+	public function hasTrait($trait) {
+		if (!$trait instanceof PhpTrait) {
+			$trait = new PhpTrait($trait);
 		}
-		$name = $interface->getName();
+		$name = $trait->getName();
 		return in_array($name, $this->traits);
 	}
 

tests/fixture/ClassWithTraits.php

@@ -0,0 +1,8 @@
+<?php
+namespace gossi\codegen\tests\fixture;
+
+class ClassWithTraits {
+
+	use DummyTrait;
+	
+}

tests/fixture/DummyTrait.php

@@ -0,0 +1,5 @@
+<?php
+namespace gossi\codegen\tests\fixture;
+
+trait DummyTrait {
+}

tests/model/PhpClassTest.php

@@ -17,6 +17,7 @@ public function setUp() {
 		// they are not explicitely instantiated through new WhatEver(); and such not
 		// required through composer's autoload
 		require_once __DIR__ . '/../fixture/Entity.php';
+		require_once __DIR__ . '/../fixture/ClassWithTraits.php';
 	}
 
 	public function testFromReflection() {
@@ -257,4 +258,10 @@ public function testLongDescription() {
 		$this->assertSame($class, $class->setLongDescription('very long description'));
 		$this->assertEquals('very long description', $class->getLongDescription());
 	}
+	
+	public function testClassWithTraitsFromReflection() {
+		$class = PhpClass::fromReflection(new \ReflectionClass('gossi\codegen\tests\fixture\ClassWithTraits'));
+		
+		$this->assertTrue($class->hasTrait('DummyTrait'));
+	}
 }

tests/model/PhpTraitTest.php

@@ -6,6 +6,12 @@
 
 class PhpTraitTest extends \PHPUnit_Framework_TestCase {
 
+	public function setUp() {
+		// they are not explicitely instantiated through new WhatEver(); and such not
+		// required through composer's autoload
+		require_once __DIR__ . '/../fixture/DummyTrait.php';
+	}
+	
 	public function testSignature() {
 		$expected = 'trait MyTrait {
 }';
@@ -18,4 +24,10 @@ public function testSignature() {
 
 		$this->assertEquals($expected, $code);
 	}
+	
+	public function fromReflection() {
+		$trait = new PhpTrait('DummyTrait');
+		$trait->setNamespace('gossi\codegen\tests\fixture');
+		$this->assertEquals($trait, PhpTrait::fromReflection(new \ReflectionClass('gossi\codegen\tests\fixture\DummyTrait')));
+	}
 }