Refactor array_map

`resolveParameter()` now accepts the container and requested name, and
returns a callback for resolving a parameter to a value, closing over
the two provided values. This simplifies the array_map call, making it
more readable.

Author: weierophinney

src/Controller/LazyControllerAbstractFactory.php

@@ -114,9 +114,10 @@ public function __invoke(ContainerInterface $container, $requestedName, array $o
             return new $requestedName();
         }
 
-        $parameters = array_map(function (ReflectionParameter $parameter) use ($container, $requestedName) {
-            return $this->resolveParameter($parameter, $container, $requestedName);
-        }, $reflectionParameters);
+        $parameters = array_map(
+            $this->resolveParameter($container, $requestedName),
+            $reflectionParameters
+        );
 
         return new $requestedName(...$parameters);
     }
@@ -136,42 +137,49 @@ public function canCreate(ContainerInterface $container, $requestedName)
     /**
      * Resolve a parameter to a value.
      *
-     * @param ReflectionClass $parameter
+     * Returns a callback for resolving a parameter to a value.
+     *
      * @param ContainerInterface $container
      * @param string $requestedName
-     * @return mixed
-     * @throws ServiceNotFoundException If type-hinted parameter cannot be
-     *     resolved to a service in the container.
+     * @return callable
      */
-    private function resolveParameter(ReflectionParameter $parameter, ContainerInterface $container, $requestedName)
+    private function resolveParameter(ContainerInterface $container, $requestedName)
     {
-        if ($parameter->isArray()
-            && $parameter->getName() === 'config'
-            && $container->has('config')
-        ) {
-            return $container->get('config');
-        }
-
-        if ($parameter->isArray()) {
-            return [];
-        }
-
-        if (! $parameter->getClass()) {
-            return;
-        }
-
-        $type = $parameter->getClass()->getName();
-        $type = isset($this->aliases[$type]) ? $this->aliases[$type] : $type;
-
-        if (! $container->has($type)) {
-            throw new ServiceNotFoundException(sprintf(
-                'Unable to create controller "%s"; unable to resolve parameter "%s" using type hint "%s"',
-                $requestedName,
-                $parameter->getName(),
-                $type
-            ));
-        }
-
-        return $container->get($type);
+        /**
+         * @param ReflectionClass $parameter
+         * @return mixed
+         * @throws ServiceNotFoundException If type-hinted parameter cannot be
+         *   resolved to a service in the container.
+         */
+        return function (ReflectionParameter $parameter) use ($container, $requestedName) {
+            if ($parameter->isArray()
+                && $parameter->getName() === 'config'
+                && $container->has('config')
+            ) {
+                return $container->get('config');
+            }
+
+            if ($parameter->isArray()) {
+                return [];
+            }
+
+            if (! $parameter->getClass()) {
+                return;
+            }
+
+            $type = $parameter->getClass()->getName();
+            $type = isset($this->aliases[$type]) ? $this->aliases[$type] : $type;
+
+            if (! $container->has($type)) {
+                throw new ServiceNotFoundException(sprintf(
+                    'Unable to create controller "%s"; unable to resolve parameter "%s" using type hint "%s"',
+                    $requestedName,
+                    $parameter->getName(),
+                    $type
+                ));
+            }
+
+            return $container->get($type);
+        };
     }
 }