Optimized performance for setInvokableClass and handling of invokables

in configure.

Removed obsolete $this->configured. Was set in configure() but only
checked in trivial cases, where it was not meaningful.

Author: fhein

src/ServiceManager.php

@@ -133,13 +133,6 @@ class ServiceManager implements ServiceLocatorInterface
      */
     protected $sharedByDefault = true;
 
-    /**
-     * Service manager was already configured?
-     *
-     * @var bool
-     */
-    protected $configured = false;
-
     /**
      * Cached abstract factories from string.
      *
@@ -350,18 +343,7 @@ public function configure(array $config)
         }
 
         if (isset($config['invokables']) && ! empty($config['invokables'])) {
-            $aliases   = $this->createAliasesForInvokables($config['invokables']);
-            $factories = $this->createFactoriesForInvokables($config['invokables']);
-
-            if (! empty($aliases)) {
-                $config['aliases'] = (isset($config['aliases']))
-                    ? array_merge($config['aliases'], $aliases)
-                    : $aliases;
-            }
-
-            $config['factories'] = (isset($config['factories']))
-                ? array_merge($config['factories'], $factories)
-                : $factories;
+            $this->createAliasesAndFactoriesForInvokables($config['invokables']);
         }
 
         if (isset($config['factories'])) {
@@ -378,8 +360,9 @@ public function configure(array $config)
 
         if (isset($config['aliases'])) {
             $this->aliases = $config['aliases'] + $this->aliases;
-            $this->mapAliasesToTargets();
-        } elseif (! $this->configured && ! empty($this->aliases)) {
+        }
+
+        if (! empty($this->aliases)) {
             $this->mapAliasesToTargets();
         }
 
@@ -408,8 +391,6 @@ public function configure(array $config)
             $this->resolveInitializers($config['initializers']);
         }
 
-        $this->configured = true;
-
         return $this;
     }
 
@@ -437,7 +418,11 @@ public function setAlias($alias, $target)
      */
     public function setInvokableClass($name, $class = null)
     {
-        $this->configure(['invokables' => [$name => $class ?: $name]]);
+        if (! isset($this->services[$name]) || $this->allowOverride) {
+            $this->createAliasesAndFactoriesForInvokables([$name => $class ?? $name]);
+            return;
+        }
+        throw new ContainerModificationsNotAllowedException($name);
     }
 
     /**
@@ -763,49 +748,22 @@ private function createLazyServiceDelegatorFactory()
     }
 
     /**
-     * Create aliases for invokable classes.
+     * Create aliases and factories for invokable classes.
      *
      * If an invokable service name does not match the class it maps to, this
      * creates an alias to the class (which will later be mapped as an
      * invokable factory).
      *
      * @param array $invokables
-     * @return array
      */
-    private function createAliasesForInvokables(array $invokables)
+    private function createAliasesAndFactoriesForInvokables(array $invokables)
     {
-        $aliases = [];
         foreach ($invokables as $name => $class) {
-            if ($name === $class) {
-                continue;
+            $this->factories[$class] = Factory\InvokableFactory::class;
+            if ($name !== $class) {
+                $this->aliases[$name] = $class;
             }
-            $aliases[$name] = $class;
-        }
-        return $aliases;
-    }
-
-    /**
-     * Create invokable factories for invokable classes.
-     *
-     * If an invokable service name does not match the class it maps to, this
-     * creates an invokable factory entry for the class name; otherwise, it
-     * creates an invokable factory for the entry name.
-     *
-     * @param array $invokables
-     * @return array
-     */
-    private function createFactoriesForInvokables(array $invokables)
-    {
-        $factories = [];
-        foreach ($invokables as $name => $class) {
-            if ($name === $class) {
-                $factories[$name] = Factory\InvokableFactory::class;
-                continue;
-            }
-
-            $factories[$class] = Factory\InvokableFactory::class;
         }
-        return $factories;
     }
 
     /**
@@ -824,7 +782,7 @@ private function createFactoriesForInvokables(array $invokables)
      */
     private function validateServiceNames(array $config)
     {
-        if ($this->allowOverride || ! $this->configured) {
+        if ($this->allowOverride) {
             return;
         }