Search for candidates in called class as well

typhoon-php · Nov 27, 2023 · 66c2201 · 66c2201
1 parent a680c9d
commit 66c2201
Show file tree

Hide file tree

Showing 3 changed files with 40 additions and 13 deletions.
diff --git a/src/CandidatesFinder.php b/src/CandidatesFinder.php
@@ -17,16 +17,17 @@ final class CandidatesFinder
     private function __construct() {}
 
     /**
+     * @param class-string $class
      * @return list<\ReflectionMethod>
      */
-    public static function findCandidates(\ReflectionMethod $method): array
+    public static function findCandidates(\ReflectionMethod $method, string $class): array
     {
         $static = $method->isStatic();
         $private = $method->isPrivate();
         $protected = $method->isProtected();
         $candidates = [];
 
-        foreach (self::findCandidatesByAttribute($method) as $candidate) {
+        foreach (self::findCandidatesByAttribute($method, $class) as $candidate) {
             if ($candidate->isStatic() !== $static) {
                 throw new \LogicException(sprintf(
                     '%s %s::%s() is not a valid overloading method for %s %s::%s().',
@@ -58,18 +59,21 @@ public static function findCandidates(\ReflectionMethod $method): array
     }
 
     /**
+     * @param class-string $class
      * @return \Generator<int, \ReflectionMethod>
      */
-    private static function findCandidatesByAttribute(\ReflectionMethod $method): \Generator
+    private static function findCandidatesByAttribute(\ReflectionMethod $method, string $class): \Generator
     {
-        foreach ($method->getDeclaringClass()->getMethods() as $candidate) {
+        foreach ((new \ReflectionClass($class))->getMethods() as $candidate) {
             if ($candidate->name === $method->name) {
                 continue;
             }
 
             foreach ($candidate->getAttributes(Overload::class) as $attribute) {
                 if ($attribute->newInstance()->name === $method->name) {
                     yield $candidate;
+
+                    continue 2;
                 }
             }
         }

diff --git a/src/Overload.php b/src/Overload.php
@@ -29,23 +29,24 @@ public static function call(): mixed
             throw new \BadMethodCallException(__METHOD__ . '() must be called from a class method.');
         }
 
-        $class = $trace['class'];
         /** @var non-empty-string */
         $method = $trace['function'];
+        $object = $trace['object'] ?? null;
+        $class = self::resolveClass($trace['class'], $method, $object);
 
         /** @psalm-suppress PossiblyNullFunctionCall, PossiblyNullReference */
         return self::$resolverCache
             ->get($class, $method, static function () use ($class, $method): string {
                 $reflectionMethod = new \ReflectionMethod($class, $method);
-                $candidates = CandidatesFinder::findCandidates($reflectionMethod);
+                $candidates = CandidatesFinder::findCandidates($reflectionMethod, $class);
 
                 if ($candidates === []) {
                     throw new \BadMethodCallException(sprintf('No overloading methods for %s::%s().', $class, $method));
                 }
 
                 return CodeGenerator::generateResolver($reflectionMethod, $candidates);
             })
-            ->bindTo($trace['object'] ?? null, $class)
+            ->bindTo($object, $class)
             ->__invoke($trace['args'] ?? []);
     }
 
@@ -63,4 +64,26 @@ public static function clearCache(): void
     {
         self::$resolverCache?->clear();
     }
+
+    /**
+     * @param class-string $class
+     * @param non-empty-string $method
+     * @return class-string
+     */
+    private static function resolveClass(string $class, string $method, ?object $object): string
+    {
+        if ($object === null) {
+            return $class;
+        }
+
+        if ($object::class === $class) {
+            return $class;
+        }
+
+        if ((new \ReflectionMethod($class, $method))->isPrivate()) {
+            return $class;
+        }
+
+        return $object::class;
+    }
 }
diff --git a/tests/CandidatesFinderTest.php b/tests/CandidatesFinderTest.php
@@ -20,7 +20,7 @@ public function b(): void {}
         };
         $method = new \ReflectionMethod($object, 'a');
 
-        $candidates = CandidatesFinder::findCandidates($method);
+        $candidates = CandidatesFinder::findCandidates($method, $object::class);
 
         self::assertSame([], $candidates);
     }
@@ -35,7 +35,7 @@ public function b(): void {}
         };
         $method = new \ReflectionMethod($object, 'a');
 
-        $candidates = CandidatesFinder::findCandidates($method);
+        $candidates = CandidatesFinder::findCandidates($method, $object::class);
 
         self::assertSame([], $candidates);
     }
@@ -53,7 +53,7 @@ public function c(): void {}
         };
         $method = new \ReflectionMethod($object, 'a');
 
-        $candidates = CandidatesFinder::findCandidates($method);
+        $candidates = CandidatesFinder::findCandidates($method, $object::class);
 
         self::assertEquals(
             [new \ReflectionMethod($object, 'b'), new \ReflectionMethod($object, 'c')],
@@ -76,7 +76,7 @@ public static function b(): void {}
             $object::class,
         )));
 
-        CandidatesFinder::findCandidates($method);
+        CandidatesFinder::findCandidates($method, $object::class);
     }
 
     public function testItThrowsIfNonStaticOverloadsStatic(): void
@@ -94,7 +94,7 @@ public function b(): void {}
             $object::class,
         )));
 
-        CandidatesFinder::findCandidates($method);
+        CandidatesFinder::findCandidates($method, $object::class);
     }
 
     /**
@@ -129,6 +129,6 @@ public function testItThrowsIfVisibilityIsDifferent(string $aVisibility, string
             $aVisibility,
         )));
 
-        CandidatesFinder::findCandidates($method);
+        CandidatesFinder::findCandidates($method, $object::class);
     }
 }