Merge pull request #6 from kbond/self-typehint

Support "self" typehint
zenstruck · Mar 26, 2022 · b65a8d6 · b65a8d6
2 parents dfb961b + 3eb5356
commit b65a8d6
Show file tree

Hide file tree

Showing 2 changed files with 63 additions and 2 deletions.
diff --git a/src/Callback/Argument.php b/src/Callback/Argument.php
@@ -65,7 +65,20 @@ public function type(): ?string
      */
     public function types(): array
     {
-        return \array_map(static function(\ReflectionNamedType $type) { return $type->getName(); }, $this->reflectionTypes());
+        return \array_map(
+            function(\ReflectionNamedType $type) {
+                if ('self' !== $name = $type->getName()) {
+                    return $name;
+                }
+
+                if (!$class = $this->parameter->getDeclaringClass()) {
+                    throw new \LogicException('Unable to parse context of "self" typehint.');
+                }
+
+                return $class->name;
+            },
+            $this->reflectionTypes()
+        );
     }
 
     public function hasType(): bool
@@ -139,7 +152,7 @@ public function supports(string $type, int $options = self::EXACT|self::COVARIAN
                 return true;
             }
 
-            if (\method_exists($type, '__toString')) {
+            if ('string' === $supportedType && \method_exists($type, '__toString')) {
                 return true;
             }
         }

diff --git a/tests/CallbackTest.php b/tests/CallbackTest.php
@@ -582,6 +582,26 @@ public function argument_allows(): void
         $this->assertFalse($callback2->argument(0)->allows(new Object3()));
     }
 
+    /**
+     * @test
+     */
+    public function self_parameter_type(): void
+    {
+        $callback = Callback::createFor(Object6::closureSelf());
+
+        $this->assertSame(Object6::class, $callback->argument(0)->type());
+
+        $this->assertTrue($callback->argument(0)->supports(Object6::class));
+        $this->assertTrue($callback->argument(0)->supports(Object7::class));
+        $this->assertFalse($callback->argument(0)->supports(Object5::class));
+        $this->assertFalse($callback->argument(0)->supports('int'));
+
+        $this->assertTrue($callback->argument(0)->allows(new Object6()));
+        $this->assertTrue($callback->argument(0)->allows(new Object7()));
+        $this->assertFalse($callback->argument(0)->allows(new Object5()));
+        $this->assertFalse($callback->argument(0)->allows(6));
+    }
+
     /**
      * @test
      */
@@ -624,6 +644,20 @@ public function invoke_all_union_parameter_with_defaults(): void
 
         $this->assertSame(['a', $b, null], $ret);
     }
+
+    /**
+     * @test
+     */
+    public function to_string_object(): void
+    {
+        $callback = Callback::createFor(function(Object1 $o, string $s) {});
+
+        $this->assertFalse($callback->argument(0)->supports(Object5::class));
+        $this->assertTrue($callback->argument(1)->supports(Object5::class));
+
+        $this->assertFalse($callback->argument(0)->allows(new Object5()));
+        $this->assertTrue($callback->argument(1)->allows(new Object5()));
+    }
 }
 
 class Object1
@@ -660,3 +694,17 @@ public function __toString(): string
 function test_function()
 {
 }
+
+class Object6
+{
+    public static function closureSelf(): \Closure
+    {
+        return function(self $object) {
+            return $object;
+        };
+    }
+}
+
+class Object7 extends Object6
+{
+}