From b3146b0229c6e2f7d4f416ff8dc1ce641e2bd7cc Mon Sep 17 00:00:00 2001 From: Jan Skrasek Date: Sat, 10 Oct 2015 21:07:30 +0200 Subject: [PATCH] mapper/dbal: removed redundant createCollection() [closes #110] (BC break!) --- src/Mapper/Dbal/DbalMapper.php | 18 +++++------------- 1 file changed, 5 insertions(+), 13 deletions(-) diff --git a/src/Mapper/Dbal/DbalMapper.php b/src/Mapper/Dbal/DbalMapper.php index 45b97adb..4475f826 100644 --- a/src/Mapper/Dbal/DbalMapper.php +++ b/src/Mapper/Dbal/DbalMapper.php @@ -16,8 +16,6 @@ use Nextras\Orm\Entity\IEntity; use Nextras\Orm\Entity\IProperty; use Nextras\Orm\Entity\Reflection\PropertyRelationshipMetadata; -use Nextras\Orm\Relationships\IRelationshipCollection; -use Nextras\Orm\Relationships\IRelationshipContainer; use Nextras\Orm\Entity\Reflection\PropertyMetadata; use Nextras\Orm\Mapper\BaseMapper; use Nextras\Orm\Mapper\IMapper; @@ -52,7 +50,7 @@ public function __construct(Connection $connection, IStorage $cacheStorage) /** @inheritdoc */ public function findAll() { - return $this->createCollection(); + return new DbalCollection($this->getRepository(), $this->connection, $this->builder()); } @@ -65,12 +63,6 @@ public function builder() } - public function createCollection() - { - return new DbalCollection($this->getRepository(), $this->connection, $this->builder()); - } - - /** @inheritdoc */ public function toCollection($data) { @@ -109,7 +101,7 @@ public function getManyHasManyParameters(PropertyMetadata $sourceProperty, IMapp public function createCollectionHasOne(PropertyMetadata $metadata, IEntity $parent) { return $this - ->createCollection() + ->findAll() ->setRelationshipMapping( $this->getRelationshipMapperHasOne($metadata), $parent @@ -120,7 +112,7 @@ public function createCollectionHasOne(PropertyMetadata $metadata, IEntity $pare public function createCollectionOneHasOneDirected(PropertyMetadata $metadata, IEntity $parent) { return $this - ->createCollection() + ->findAll() ->setRelationshipMapping( $metadata->relationship->isMain ? $this->getRelationshipMapperHasOne($metadata) @@ -134,7 +126,7 @@ public function createCollectionManyHasMany(IMapper $mapperTwo, PropertyMetadata { $targetMapper = $metadata->relationship->isMain ? $mapperTwo : $this; return $targetMapper - ->createCollection() + ->findAll() ->setRelationshipMapping( $this->getRelationshipMapperManyHasMany($mapperTwo, $metadata), $parent @@ -145,7 +137,7 @@ public function createCollectionManyHasMany(IMapper $mapperTwo, PropertyMetadata public function createCollectionOneHasMany(PropertyMetadata $metadata, IEntity $parent) { return $this - ->createCollection() + ->findAll() ->setRelationshipMapping( $this->getRelationshipMapperOneHasMany($metadata), $parent