Add support for abstract traits and mocking of trait-methods

composer.json

@@ -2,7 +2,7 @@
   "name": "tomaszdurka/mocka",
   "license": "MIT",
   "require": {
-    "tomaszdurka/codegenerator": "~0.4.2"
+    "tomaszdurka/codegenerator": "~0.5.0"
   },
   "require-dev": {
     "phpunit/phpunit": "~3.7.10",

source/Mocka/AbstractClassTrait.php

@@ -18,7 +18,7 @@ public function __clone() {
 
     /**
      * @param string $name
-     * @param array $arguments
+     * @param array  $arguments
      * @return mixed
      */
     public function __call($name, $arguments) {
@@ -47,7 +47,7 @@ public function unmockMethod($name) {
 
     /**
      * @param string $name
-     * @param array $arguments
+     * @param array  $arguments
      * @throws Exception
      * @return mixed
      */
@@ -84,7 +84,7 @@ private static function _getClassMethodMockCollectionStatic() {
 
     /**
      * @param string $name
-     * @param array $arguments
+     * @param array  $arguments
      * @return mixed
      */
     private function _callMethod($name, array $arguments) {
@@ -94,6 +94,9 @@ private function _callMethod($name, array $arguments) {
         if ($this->_getClassMethodMockCollection()->hasMockedMethod($name)) {
             return $this->_getClassMethodMockCollection()->callMockedMethod($name, $arguments);
         }
+        if (static::_hasTraitMethod($name)) {
+            return call_user_func_array([$this, "_mockaTraitAlias_{$name}"], $arguments);
+        }
         if (static::_hasParentMethod($name)) {
             return call_user_func_array(array('parent', $name), $arguments);
         }
@@ -120,9 +123,23 @@ private static function _hasParentMethod($name) {
         return true;
     }
 
+    /**
+     * @param $name
+     * @return bool
+     */
+    private static function _hasTraitMethod($name) {
+        $mockClass = static::_getMockClass();
+        $reflectionsClass = new \ReflectionClass($mockClass->getParentClassName());
+        foreach ($reflectionsClass->getTraits() as $reflectionTrait) {
+            if ($reflectionTrait->hasMethod($name)) {
+                return true;
+            }
+        }
+    }
+
     /**
      * @param string $name
-     * @param array $arguments
+     * @param array  $arguments
      * @return mixed
      */
     public static function __callStatic($name, $arguments) {
@@ -139,7 +156,7 @@ protected static function _getMockClass() {
 
     /**
      * @param string $name
-     * @param array $arguments
+     * @param array  $arguments
      * @return mixed
      */
     private static function _callStaticMethod($name, array $arguments) {

source/Mocka/ClassAbstractMock.php

@@ -4,6 +4,7 @@
 
 use CodeGenerator\ClassBlock;
 use CodeGenerator\MethodBlock;
+use CodeGenerator\TraitBlock;
 
 class ClassAbstractMock {
 
@@ -49,9 +50,16 @@ public function generateCode() {
             $class->addInterface($interface);
         }
         foreach ($this->_traits as $trait) {
+            $reflectionTrait = new \ReflectionClass($trait);
+            $trait = new TraitBlock($trait);
+            foreach ($reflectionTrait->getMethods() as $reflectionMethod) {
+                if (!$reflectionMethod->isAbstract()) {
+                    $trait->addAlias($reflectionMethod->getName(), "_mockaTraitAlias_{$reflectionMethod->getName()}");
+                }
+            }
             $class->addUse($trait);
         }
-        $class->addUse('\Mocka\AbstractClassTrait');
+        $class->addUse(new TraitBlock('\Mocka\AbstractClassTrait'));
 
         $mockableMethods = $this->_getMockableMethods();
         foreach ($mockableMethods as $reflectionMethod) {
@@ -109,7 +117,7 @@ protected function _getReservedKeywords() {
     protected function _getMockableMethods() {
         /** @var \ReflectionMethod[] $methods */
         $methods = array();
-        $interfaces = $this->_interfaces;
+        $interfaces = array_merge($this->_interfaces, $this->_traits);
         if ($this->_parentClassName) {
             $interfaces[] = $this->_parentClassName;
         }

source/Mocka/ClassMock.php

@@ -4,6 +4,7 @@
 
 use CodeGenerator\ClassBlock;
 use CodeGenerator\PropertyBlock;
+use CodeGenerator\TraitBlock;
 
 class ClassMock {
 
@@ -98,7 +99,7 @@ public function generateCode() {
         if ($this->_parentClassName) {
             $class->setParentClassName($this->_parentClassName);
         }
-        $class->addUse('\Mocka\ClassTrait');
+        $class->addUse(new TraitBlock('\Mocka\ClassTrait'));
         return $class->dump();
     }
 

tests/mocks/TraitMock.php

@@ -4,7 +4,13 @@
 
 trait TraitMock {
 
+    abstract function abstractTraitMethod();
+
     public function traitMethod() {
 
     }
+
+    public function bar () {
+        return 'traitbar';
+    }
 }

tests/source/Mocka/ClassAbstractMockTest.php

@@ -82,10 +82,25 @@ public function testGenerateCodeTrait() {
         $expectedMockCode = <<<EOD
 class $className {
 
-    use $traitName;
+    use $traitName {
+        traitMethod as _mockaTraitAlias_traitMethod;
+        bar as _mockaTraitAlias_bar;
+    }
 
     use \Mocka\AbstractClassTrait;
 
+    public function abstractTraitMethod() {
+        return \$this->_callMethod(__FUNCTION__, func_get_args());
+    }
+
+    public function traitMethod() {
+        return \$this->_callMethod(__FUNCTION__, func_get_args());
+    }
+
+    public function bar() {
+        return \$this->_callMethod(__FUNCTION__, func_get_args());
+    }
+
     public function __construct() {
         return \$this->_callMethod(__FUNCTION__, func_get_args());
     }

tests/source/Mocka/ClassMockTest.php

@@ -61,6 +61,17 @@ public function testMockMethodFinal() {
         $classMock->mockMethod('zoo');
     }
 
+    public function testMockMethodFromTrait() {
+        $classMock = new ClassMock(null, '\\MockaMocks\\AbstractClass', null, ['\\MockaMocks\\TraitMock']);
+
+        /** @var AbstractClassTrait|AbstractClass $object */
+        $object = $classMock->newInstanceWithoutConstructor();
+        $this->assertSame('traitbar', $object->bar());
+
+        $classMock->mockMethod('bar');
+        $this->assertSame(null, $object->bar());
+    }
+
     public function testMockStaticMethod() {
         $classMock = new ClassMock(null, '\\MockaMocks\\AbstractClass');
         /** @var AbstractClass $className */