Merge pull request #213 from toin0u/master

Set a custom result factory via a setter

Author: willdurand

src/Geocoder/Geocoder.php

@@ -44,7 +44,16 @@ class Geocoder implements GeocoderInterface
      */
     public function __construct(ProviderInterface $provider = null, ResultFactory $resultFactory = null)
     {
-        $this->provider      = $provider;
+        $this->provider = $provider;
+
+        $this->setResultFactory($resultFactory);
+    }
+
+    /**
+     * @param ResultFactory $resultFactory
+     */
+    public function setResultFactory(ResultFactory $resultFactory = null)
+    {
         $this->resultFactory = $resultFactory ?: new ResultFactory();
     }
 

tests/Geocoder/Tests/GeocoderTest.php

@@ -126,6 +126,19 @@ public function testUseCustomResultFactory()
         $this->assertInstanceOf('Geocoder\Tests\DummyResult', $geocoder->returnResult(array()));
     }
 
+    public function testSetAndUseCustomResultFactory()
+    {
+        $factoryMock = $this->getMock('Geocoder\Result\ResultFactory');
+        $factoryMock
+            ->expects($this->once())
+            ->method('newInstance')
+            ->will($this->returnValue(new DummyResult()));
+
+        $geocoder = new TestableGeocoder(null);
+        $geocoder->setResultFactory($factoryMock);
+        $this->assertInstanceOf('Geocoder\Tests\DummyResult', $geocoder->returnResult(array()));
+    }
+
     protected function assertEmptyResult($result)
     {
         $this->assertEquals(0, $result->getLatitude());