Updated: Checking if is a callable

pedromdev · Mar 5, 2017 · 8d9f3c0 · 8d9f3c0
1 parent 53edcef
commit 8d9f3c0
Show file tree

Hide file tree

Showing 2 changed files with 22 additions and 0 deletions.
diff --git a/src/Service/ClientFactory.php b/src/Service/ClientFactory.php
@@ -25,6 +25,10 @@ protected function create(ContainerInterface $container, $config)
             throw $this->getException('transport', Transport::class, ServiceNotCreatedException::class, $transport);
         }
         $endpoint = $container->get($config['endpoint']);
+
+        if (!is_callable($endpoint)) {
+            throw $this->getException('endpoint', 'callable', ServiceNotCreatedException::class, $endpoint);
+        }
         return new Client($transport, $endpoint);
     }
 

diff --git a/tests/Service/ClientFactoryTest.php b/tests/Service/ClientFactoryTest.php
@@ -41,4 +41,22 @@ public function testThrowExceptionWhenTransportVariableIsNotAnInstanceOfElastics
 
         $factory->createService($clientContainer);
     }
+
+    /**
+     * @expectedException \Zend\ServiceManager\Exception\ServiceNotCreatedException
+     */
+    public function testThrowExceptionWhenEndpointVariableIsNotACallable()
+    {
+        $config = $this->getConfig();
+        $transportContainer = $this->getContainerWithTransportDependencies($config);
+        $clientContainer = $this->createServiceLocatorMock(['get']);
+        $this->mockMappedReturn($clientContainer, 'get', [
+            'Config' => $config,
+            'elasticsearch.transport.default' => $this->getTransport($transportContainer, 'default'),
+            'elasticsearch.endpoint.default' => new stdClass(),
+        ]);
+        $factory = new ClientFactory('default');
+
+        $factory->createService($clientContainer);
+    }
 }