mapper/dbal: removed redundant createCollection() [closes #110] (BC b…

…reak!)
nextras · Oct 10, 2015 · b3146b0 · b3146b0
1 parent 729fb49
commit b3146b0
Showing 1 changed file with 5 additions and 13 deletions.
diff --git 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