Fix ServiceFactory calls

lelivrescolaire · Oct 13, 2015 · 5def4ba · 5def4ba
1 parent 23221d9
commit 5def4ba
Show file tree

Hide file tree

Showing 3 changed files with 35 additions and 5 deletions.
diff --git a/Factory/GenericServiceFactory.php b/Factory/GenericServiceFactory.php
@@ -22,7 +22,7 @@ class GenericServiceFactory implements ServiceFactoryInterface
     /**
      * @var array
      */
-    protected $arguments;
+    protected $calls;
 
     /**
      * Constructor
@@ -32,7 +32,7 @@ class GenericServiceFactory implements ServiceFactoryInterface
     public function __construct($classFQN)
     {
         $this->classFQN  = $classFQN;
-        $this->arguments = array_slice(func_get_args(), 1);
+        $this->calls     = array_slice(func_get_args(), 1);
     }
 
     /**
@@ -47,7 +47,22 @@ protected function doCreate(IdentityInterface $identity, ClientFactoryInterface
     {
         $reflection = new \ReflectionClass($this->classFQN);
 
-        return $reflection->newInstanceArgs(array($identity, $clientFactory));
+        $service = $reflection->newInstanceArgs(array($identity, $clientFactory));
+
+        $this->execCalls($service);
+
+        return $service;
+    }
+
+    protected function execCalls(ServiceInterface $service)
+    {
+        if ($this->calls) {
+            foreach ($this->calls as $definition) {
+                call_user_func_array(array($service, $definition[0]), array_slice($definition, 1));
+            }
+        }
+
+        return $this;
     }
 
     /**

diff --git a/Tests/Fixtures/FakeService.php b/Tests/Fixtures/FakeService.php
@@ -9,11 +9,12 @@ class FakeService implements ServiceInterface
 {
     protected $identity;
     protected $clientFactory;
+    protected $something;
 
     /**
      * {@inheritDoc}
      */
-    public function __construct(IdentityInterface $identity, ClientFactoryInterface $clientFactory, \Countable $test = null)
+    public function __construct(IdentityInterface $identity, ClientFactoryInterface $clientFactory)
     {
         $this->identity      = $identity;
         $this->clientFactory = $clientFactory;
@@ -28,4 +29,16 @@ public function getClientFactory()
     {
         return $this->clientFactory;
     }
+
+    public function setSomething($something)
+    {
+        $this->something = $something;
+
+        return $this;
+    }
+
+    public function getSomething()
+    {
+        return $this->something;
+    }
 }
diff --git a/Tests/Units/Factory/GenericServiceFactory.php b/Tests/Units/Factory/GenericServiceFactory.php
@@ -25,7 +25,7 @@ public function beforeTestMethod($method)
         parent::beforeTestMethod($method);
 
         $this->fqn      = "LLS\\Bundle\\AWSBundle\\Tests\\Fixtures\\FakeService";
-        $this->instance = new Factory\GenericServiceFactory($this->fqn);
+        $this->instance = new Factory\GenericServiceFactory($this->fqn, array('setSomething', 'test'));
     }
 
     public function testClass()
@@ -55,6 +55,8 @@ public function testCreateService()
                         ->isIdenticalTo($data[0])
                     ->object($service->getClientFactory())
                         ->isIdenticalTo($data[1])
+                    ->string($service->getSomething())
+                        ->isEqualTo('test')
         ;
     }