allow passing object instance to class_uses_recursive (#15223)

laravel · Sep 2, 2016 · 4199fb0 · 4199fb0
1 parent ccf1724
commit 4199fb0
Show file tree

Hide file tree

Showing 2 changed files with 14 additions and 1 deletion.
diff --git a/src/Illuminate/Support/helpers.php b/src/Illuminate/Support/helpers.php
@@ -334,11 +334,15 @@ function class_basename($class)
     /**
      * Returns all traits used by a class, its subclasses and trait of their traits.
      *
-     * @param  string  $class
+     * @param  object|string  $class
      * @return array
      */
     function class_uses_recursive($class)
     {
+        if (is_object($class)) {
+            $class = get_class($class);
+        }
+
         $results = [];
 
         foreach (array_merge([$class => $class], class_parents($class)) as $class) {

diff --git a/tests/Support/SupportHelpersTest.php b/tests/Support/SupportHelpersTest.php
@@ -661,6 +661,15 @@ public function testClassUsesRecursiveShouldReturnTraitsOnParentClasses()
         class_uses_recursive('SupportTestClassTwo'));
     }
 
+    public function testClassUsesRecursiveAcceptsObject()
+    {
+        $this->assertEquals([
+            'SupportTestTraitOne' => 'SupportTestTraitOne',
+            'SupportTestTraitTwo' => 'SupportTestTraitTwo',
+        ],
+        class_uses_recursive(new SupportTestClassTwo));
+    }
+
     public function testArrayAdd()
     {
         $this->assertEquals(['surname' => 'Mövsümov'], array_add([], 'surname', 'Mövsümov'));