Skip to content
Open
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
17 changes: 16 additions & 1 deletion src/Expectation.php
Original file line number Diff line number Diff line change
Expand Up @@ -781,7 +781,22 @@ function (ObjectDescription $object) use ($traits): bool {
return false;
}

if (! in_array($trait, $object->reflectionClass->getTraitNames(), true)) {
$currentClass = $object->reflectionClass;
$usedTraits = [];

do {
$classTraits = $currentClass->getTraits();
foreach ($classTraits as $traitReflection) {
$usedTraits[$traitReflection->getName()] = $traitReflection->getName();

$nestedTraits = $traitReflection->getTraits();
foreach ($nestedTraits as $nestedTrait) {
$usedTraits[$nestedTrait->getName()] = $nestedTrait->getName();
}
}
} while ($currentClass = $currentClass->getParentClass());

if (! array_key_exists($trait, $usedTraits)) {
return false;
}
}
Expand Down
16 changes: 16 additions & 0 deletions tests/Features/Expect/toUseTrait.php
Original file line number Diff line number Diff line change
Expand Up @@ -14,3 +14,19 @@
test('not failures', function () {
expect('Pest\Expectations\HigherOrderExpectation')->not->toUseTrait('Pest\Concerns\Retrievable');
})->throws(ArchExpectationFailedException::class);

test('trait inheritance - direct usage', function () {
expect('Tests\Fixtures\Arch\ToUseTrait\HasTrait\ParentClassWithTrait')->toUseTrait('Tests\Fixtures\Arch\ToUseTrait\HasTrait\TestTraitForInheritance');
});

test('trait inheritance - inherited usage', function () {
expect('Tests\Fixtures\Arch\ToUseTrait\HasInheritedTrait\ChildClassExtendingParent')->toUseTrait('Tests\Fixtures\Arch\ToUseTrait\HasTrait\TestTraitForInheritance');
});

test('trait inheritance - negative case', function () {
expect('Tests\Fixtures\Arch\ToUseTrait\HasInheritedTrait\ChildClassExtendingParent')->not->toUseTrait('NonExistentTrait');
});

test('nested trait inheritance', function () {
expect('Tests\Fixtures\Arch\ToUseTrait\HasInheritedTrait\ChildClassExtendingParent')->toUseTrait('Tests\Fixtures\Arch\ToUseTrait\HasNestedTrait\NestedTrait');
});
Original file line number Diff line number Diff line change
@@ -0,0 +1,11 @@
<?php

declare(strict_types=1);

namespace Tests\Fixtures\Arch\ToUseTrait\HasInheritedTrait;

use Tests\Fixtures\Arch\ToUseTrait\HasTrait\ParentClassWithTrait;

class ChildClassExtendingParent extends ParentClassWithTrait
{
}
13 changes: 13 additions & 0 deletions tests/Fixtures/Arch/ToUseTrait/HasNestedTrait/NestedTrait.php
Original file line number Diff line number Diff line change
@@ -0,0 +1,13 @@
<?php

declare(strict_types=1);

namespace Tests\Fixtures\Arch\ToUseTrait\HasNestedTrait;

trait NestedTrait
{
public function nestedMethod()
{
return 'nested';
}
}
10 changes: 10 additions & 0 deletions tests/Fixtures/Arch/ToUseTrait/HasTrait/ParentClassWithTrait.php
Original file line number Diff line number Diff line change
@@ -0,0 +1,10 @@
<?php

declare(strict_types=1);

namespace Tests\Fixtures\Arch\ToUseTrait\HasTrait;

class ParentClassWithTrait
{
use TestTraitForInheritance;
}
Original file line number Diff line number Diff line change
@@ -0,0 +1,17 @@
<?php

declare(strict_types=1);

namespace Tests\Fixtures\Arch\ToUseTrait\HasTrait;

use Tests\Fixtures\Arch\ToUseTrait\HasNestedTrait\NestedTrait;

trait TestTraitForInheritance
{
use NestedTrait;

public function testMethod()
{
return 'test';
}
}