Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

[5.3] allow passing object instance to class_uses_recursive #15223

Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 5 additions & 1 deletion src/Illuminate/Support/helpers.php
Original file line number Diff line number Diff line change
Expand Up @@ -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) {
Expand Down
9 changes: 9 additions & 0 deletions tests/Support/SupportHelpersTest.php
Original file line number Diff line number Diff line change
Expand Up @@ -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'));
Expand Down