Added a custom name support for adding DataMapper to DataMappers

ThrusterIO · Apr 21, 2016 · aeec316 · aeec316
1 parent 9d48825
commit aeec316
Show file tree

Hide file tree

Showing 2 changed files with 25 additions and 2 deletions.
diff --git a/src/DataMappers.php b/src/DataMappers.php
@@ -59,9 +59,13 @@ public function setValidator($validator)
      *
      * @return $this
      */
-    public function addMapper(DataMapperInterface $dataMapper) : self
+    public function addMapper(DataMapperInterface $dataMapper, string $name = null) : self
     {
-        $this->dataMappers[get_class($dataMapper)] = $dataMapper;
+        if (null === $name) {
+            $name = get_class($dataMapper);
+        }
+
+        $this->dataMappers[$name] = $dataMapper;
 
         $dataMapper->setDataMappers($this);
 

diff --git a/src/Tests/DataMappersTest.php b/src/Tests/DataMappersTest.php
@@ -46,4 +46,23 @@ public function testNotExistingMapper()
 
         $dataMappers->getMapper('demo');
     }
+
+    public function testCustomName()
+    {
+        $dataMappers = new DataMappers();
+
+        $mapperMock = $this->getMockForAbstractClass('\Thruster\Component\DataMapper\DataMapperInterface');
+        $mapperName = 'demo';
+
+        $this->assertFalse($dataMappers->hasMapper($mapperName));
+
+        $dataMappers->addMapper($mapperMock, $mapperName);
+
+        $this->assertTrue($dataMappers->hasMapper($mapperName));
+
+        $wrappedMapper = $dataMappers->getMapper($mapperName);
+
+        $this->assertInstanceOf('\Thruster\Component\DataMapper\DataMapper', $wrappedMapper);
+        $this->assertEquals($mapperMock, $wrappedMapper->getDataMapper());
+    }
 }