[8.x] Improves Support\Reflector to support checking interfaces (#4…

…0822) * Update Reflector.php * Update SupportReflectorTest.php
laravel · Feb 5, 2022 · d47153d · d47153d
1 parent c7f4c23
commit d47153d
Show file tree

Hide file tree

Showing 2 changed files with 26 additions and 3 deletions.
diff --git a/src/Illuminate/Support/Reflector.php b/src/Illuminate/Support/Reflector.php
@@ -136,7 +136,8 @@ public static function isParameterSubclassOf($parameter, $className)
         $paramClassName = static::getParameterClassName($parameter);
 
         return $paramClassName
-            && class_exists($paramClassName)
+            && (class_exists($paramClassName) ||
+                interface_exists($paramClassName))
             && (new ReflectionClass($paramClassName))->isSubclassOf($className);
     }
 }
diff --git a/tests/Support/SupportReflectorTest.php b/tests/Support/SupportReflectorTest.php
@@ -48,6 +48,13 @@ public function testParentClassName()
         $this->assertSame(A::class, Reflector::getParameterClassName($method->getParameters()[0]));
     }
 
+    public function testParameterSubclassOfInterface()
+    {
+        $method = (new ReflectionClass(TestClassWithInterfaceSubclassParameter::class))->getMethod('f');
+
+        $this->assertTrue(Reflector::isParameterSubclassOf($method->getParameters()[0], IA::class));
+    }
+
     /**
      * @requires PHP >= 8
      */
@@ -95,8 +102,7 @@ public function f(A|Model $x)
     {
         //
     }
-}'
-    );
+}');
 }
 
 class TestClassWithCall
@@ -114,3 +120,19 @@ public static function __callStatic($method, $parameters)
         //
     }
 }
+
+interface IA
+{
+}
+
+interface IB extends IA
+{
+}
+
+class TestClassWithInterfaceSubclassParameter
+{
+    public function f(IB $x)
+    {
+        //
+    }
+}