fix bug with return type hint self

Callmap instance creation for interfaces and classes using return
type hint self lead to a fatal error because code creation simply
added ": \self" as return type hint which is invalid. It will now
replace this with the type hint for the class which declares the
method.

Author: Frank Kleine

CHANGELOG.md

@@ -1,3 +1,9 @@
+3.0.2 (2016-07-21)
+------------------
+
+  * fixed bug that return type hint `self` was not used correctly and lead to a fatal error when creating callmap instances of interfaces or classes using such a return type hint
+
+
 3.0.1 (2016-07-11)
 ------------------
 

src/main/php/NewInstance.php

@@ -271,6 +271,10 @@ private static function determineReturnType(\ReflectionMethod $method): string
             return ': ' . $returnType;
         }
 
+        if ('self' == $returnType) {
+            return ': \\' . $method->getDeclaringClass()->getName();
+        }
+
         return ': \\' . $returnType;
     }
 

src/test/php/ReturnSelfTest.php

@@ -10,6 +10,7 @@
  */
 namespace bovigo\callmap;
 use function bovigo\assert\assert;
+use function bovigo\assert\predicate\isInstanceOf;
 use function bovigo\assert\predicate\isSameAs;
 use function bovigo\assert\predicate\isNull;
 /**
@@ -133,6 +134,22 @@ interface Fump
      */
     public function noReturn();
 }
+/**
+ * @since  3.0.2
+ */
+interface WithSelfReturnTypeHint
+{
+    public function wow(): self;
+}
+/**
+ * @since  3.0.2
+ */
+class Really implements WithSelfReturnTypeHint
+{
+    public function wow(): WithSelfReturnTypeHint { return $this; }
+
+    public function hui(): self { return $this; }
+}
 /**
  * Tests for automated return self.
  *
@@ -258,4 +275,43 @@ public function doesNotReturnSelfWhenNoReturnTypeHintInDocComment()
     {
         assert(NewInstance::of(Fump::class)->noReturn(), isNull());
     }
+
+    /**
+     * @test
+     * @since  3.0.2
+     * @group  self_type_hint
+     */
+    public function canWorkWithSelfReturnTypeHintForInterfaceDirectly()
+    {
+        assert(
+                NewInstance::of(WithSelfReturnTypeHint::class)->wow(),
+                isInstanceOf(WithSelfReturnTypeHint::class)
+        );
+    }
+
+    /**
+     * @test
+     * @since  3.0.2
+     * @group  self_type_hint
+     */
+    public function canWorkWithSelfReturnTypeHintForImplementingClass()
+    {
+        assert(
+                NewInstance::stub(Really::class)->wow(),
+                isInstanceOf(WithSelfReturnTypeHint::class)
+        );
+    }
+
+    /**
+     * @test
+     * @since  3.0.2
+     * @group  self_type_hint
+     */
+    public function canWorkWithSelfReturnTypeHintForClassDirectly()
+    {
+        assert(
+                NewInstance::stub(Really::class)->hui(),
+                isInstanceOf(Really::class)
+        );
+    }
 }