diff --git a/application/src/Entity/Source/Collection/Queue/QueueSourceInterface.php b/application/src/Entity/Source/Collection/Queue/QueueSourceInterface.php index 8dc11b7..fe9a1f5 100644 --- a/application/src/Entity/Source/Collection/Queue/QueueSourceInterface.php +++ b/application/src/Entity/Source/Collection/Queue/QueueSourceInterface.php @@ -2,7 +2,6 @@ namespace App\Entity\Source\Collection\Queue; -use App\Entity\Attribut\MembersAttributInterface; use App\Entity\Source\Collection\CollectionSourceInterface; use App\Entity\Source\SourceInterface; @@ -11,7 +10,7 @@ use App\Entity\Source\SourceInterface; * * @author kevinfrantz */ -interface QueueSourceInterface extends CollectionSourceInterface, MembersAttributInterface +interface QueueSourceInterface extends CollectionSourceInterface { public function getPointerPosition(): int; diff --git a/application/src/Entity/Source/Collection/TreeCollectionSource.php b/application/src/Entity/Source/Collection/TreeCollectionSource.php index 96d455f..4006ac0 100644 --- a/application/src/Entity/Source/Collection/TreeCollectionSource.php +++ b/application/src/Entity/Source/Collection/TreeCollectionSource.php @@ -5,6 +5,7 @@ namespace App\Entity\Source\Collection; use Doctrine\ORM\Mapping as ORM; use App\Entity\Attribut\MembersAttribut; use App\Entity\Method\CollectionDimensionHelperMethod; +use App\Entity\Attribut\CollectionAttribut; /** * @author kevinfrantz @@ -15,6 +16,6 @@ use App\Entity\Method\CollectionDimensionHelperMethod; */ class TreeCollectionSource extends AbstractCollectionSource implements TreeCollectionSourceInterface { - use MembersAttribut; + use CollectionAttribut; use CollectionDimensionHelperMethod; } diff --git a/application/src/Entity/Source/Collection/TreeCollectionSourceInterface.php b/application/src/Entity/Source/Collection/TreeCollectionSourceInterface.php index ddc737a..3a621ff 100644 --- a/application/src/Entity/Source/Collection/TreeCollectionSourceInterface.php +++ b/application/src/Entity/Source/Collection/TreeCollectionSourceInterface.php @@ -2,12 +2,11 @@ namespace App\Entity\Source\Collection; -use App\Entity\Attribut\MembersAttributInterface; use App\Helper\DimensionHelperInterface; /** * @author kevinfrantz */ -interface TreeCollectionSourceInterface extends MembersAttributInterface, CollectionSourceInterface, DimensionHelperInterface +interface TreeCollectionSourceInterface extends CollectionSourceInterface, DimensionHelperInterface { } diff --git a/application/tests/Unit/Entity/Source/Collection/TreeCollectionSourceTest.php b/application/tests/Unit/Entity/Source/Collection/TreeCollectionSourceTest.php index 44829c7..ecdc4d3 100644 --- a/application/tests/Unit/Entity/Source/Collection/TreeCollectionSourceTest.php +++ b/application/tests/Unit/Entity/Source/Collection/TreeCollectionSourceTest.php @@ -27,19 +27,19 @@ class TreeCollectionSourceTest extends TestCase public function testConstructor(): void { - $this->assertInstanceOf(Collection::class, $this->tree->getMembers()); + $this->assertInstanceOf(Collection::class, $this->tree->getCollection()); $this->assertInstanceOf(TreeCollectionSourceInterface::class, $this->tree); $this->assertInstanceOf(DimensionHelperInterface::class, $this->tree); } - public function testMembers() + public function testAccessors() { $member = new class() extends AbstractSource { }; - $this->tree->setMembers(new ArrayCollection([ + $this->tree->setCollection(new ArrayCollection([ $member, ])); - $this->assertEquals($member, $this->tree->getMembers() + $this->assertEquals($member, $this->tree->getCollection() ->get(0)); } }