Never cache with build

Author: bakura10

src/ServiceLocatorInterface.php

@@ -22,7 +22,7 @@ interface ServiceLocatorInterface extends ContainerInterface
      *
      * @param  string $name
      * @param  array  $options
-     * @return object
+     * @return mixed
      * @throws Exception\ServiceNotFoundException If no factory/abstract factory could be found to create the instance
      * @throws Exception\ServiceNotCreatedException If factory/delegator fails to create the instance
      */

src/ServiceManager.php

@@ -118,44 +118,15 @@ public function withConfig(array $config)
      * {@inheritDoc}
      */
     public function get($name)
-    {
-        return $this->build($name);
-    }
-
-    /**
-     * {@inheritDoc}
-     *
-     * This is a highly performance sensitive method, do not modify if you have not benchmarked it carefully
-     */
-    public function build($name, array $options = [])
     {
         $name = $this->resolveAlias($name);
 
-        // We start by checking if the service is cached (this is the fastest method). If options is not empty, we
-        // never "share" because this could create unexpected behaviour
-        if (empty($options) && isset($this->services[$name])) {
+        // We start by checking if the service is cached (this is the fastest method).
+        if (isset($this->services[$name])) {
             return $this->services[$name];
         }
 
-        try {
-            if (!isset($this->delegators[$name])) {
-                // Let's create the service by fetching the factory
-                $factory = $this->getFactory($name);
-                $object  = $factory($this->creationContext, $name, $options);
-            } else {
-                $object = $this->createDelegatorFromName($name, $options);
-            }
-        } catch (Exception $exception) {
-            throw new ServiceNotCreatedException(sprintf(
-                'Service with name "%s" could not be created. Reason: %s',
-                $name,
-                $exception->getMessage()
-            ));
-        }
-
-        foreach ($this->initializers as $initializer) {
-            $initializer($this->creationContext, $object);
-        }
+        $object = $this->doCreate($name);
 
         if (($this->sharedByDefault && !isset($this->shared[$name]))
             || (isset($this->shared[$name]) && $this->shared[$name])) {
@@ -165,6 +136,17 @@ public function build($name, array $options = [])
         return $object;
     }
 
+    /**
+     * {@inheritDoc}
+     *
+     * This is a highly performance sensitive method, do not modify if you have not benchmarked it carefully
+     */
+    public function build($name, array $options = [])
+    {
+        // We never cache when using "build"
+        return $this->doCreate($this->resolveAlias($name), $options);
+    }
+
     /**
      * {@inheritDoc}
      */
@@ -331,4 +313,34 @@ private function resolveAlias($alias)
 
         return $name;
     }
+
+    /**
+     * @param  string $resolvedName
+     * @param  array  $options
+     * @return mixed
+     */
+    private function doCreate($resolvedName, $options = [])
+    {
+        try {
+            if (!isset($this->delegators[$resolvedName])) {
+                // Let's create the service by fetching the factory
+                $factory = $this->getFactory($resolvedName);
+                $object  = $factory($this->creationContext, $resolvedName, $options);
+            } else {
+                $object = $this->createDelegatorFromName($resolvedName, $options);
+            }
+        } catch (Exception $exception) {
+            throw new ServiceNotCreatedException(sprintf(
+                'Service with name "%s" could not be created. Reason: %s',
+                $resolvedName,
+                $exception->getMessage()
+            ));
+        }
+
+        foreach ($this->initializers as $initializer) {
+            $initializer($this->creationContext, $object);
+        }
+
+        return $object;
+    }
 }