Add support for interfaces in the expectsParameters check on MethodFi…

…nder.
hirethunk · Nov 22, 2023 · 7fd4392 · 7fd4392
1 parent ae842d2
commit 7fd4392
Show file tree

Hide file tree

Showing 2 changed files with 21 additions and 5 deletions.
diff --git a/src/Facades/Verbs.php b/src/Facades/Verbs.php
@@ -11,7 +11,7 @@
  * @method static bool isReplaying()
  * @method static void unlessReplaying(callable $callback)
  * @method static bool isReplaying()
- * @method static int|string toId($id)
+ * @method static int|string|null toId($id)
  * @method static Event fire(Event $event)
  */
 class Verbs extends Facade

diff --git a/src/Support/MethodFinder.php b/src/Support/MethodFinder.php
@@ -71,12 +71,28 @@ protected function expectsParameters(ReflectionMethod $method): bool
         }
 
         foreach ($method->getParameters() as $parameter) {
-            $expected = collect(Reflector::getParameterClassNames($parameter));
-            $matches = $expected->intersect($this->types)->count();
+            $typeHint = Reflector::getParameterClassNames($parameter);
+            $expected = collect($typeHint);
 
-            if ($matches < $expected->count() || $matches < $this->types->count()) {
-                return false;
+            $direct_matches = $expected->intersect($this->types);
+
+
+            if ($direct_matches->isNotEmpty()) {
+                return true;
+            }
+
+            $interface_matches = $this
+                ->types
+                ->map(fn ($type) => class_implements($type))
+                ->flatten()
+                ->unique()
+                ->intersect($expected);
+
+            if ($interface_matches->isNotEmpty()) {
+                return true;
             }
+
+            return false;
         }
 
         return true;