optimize lazy load command handler

gpslab · Jun 22, 2017 · 2c753bc · 2c753bc
1 parent 6dd1f3c
commit 2c753bc
Show file tree

Hide file tree

Showing 2 changed files with 34 additions and 16 deletions.
diff --git a/src/Command/Handler/Locator/ContainerCommandHandlerLocator.php b/src/Command/Handler/Locator/ContainerCommandHandlerLocator.php
@@ -40,14 +40,7 @@ public function __construct(ContainerInterface $container)
      */
     public function findHandler(Command $command)
     {
-        $command_name = get_class($command);
-
-        if (!isset($this->command_handler_ids[$command_name])) {
-            return null;
-        }
-        list($service, $method) = $this->command_handler_ids[$command_name];
-
-        return $this->resolve($this->container->get($service), $method);
+        return $this->lazyLoad(get_class($command));
     }
 
     /**
@@ -60,6 +53,22 @@ public function registerService($command_name, $service, $method = '__invoke')
         $this->command_handler_ids[$command_name] = [$service, $method];
     }
 
+    /**
+     * @param string $command_name
+     *
+     * @return callable|null
+     */
+    private function lazyLoad($command_name)
+    {
+        if (isset($this->command_handler_ids[$command_name])) {
+            list($service, $method) = $this->command_handler_ids[$command_name];
+
+            return $this->resolve($this->container->get($service), $method);
+        }
+
+        return null;
+    }
+
     /**
      * @param mixed  $service
      * @param string $method

diff --git a/src/Command/Handler/Locator/SymfonyContainerCommandHandlerLocator.php b/src/Command/Handler/Locator/SymfonyContainerCommandHandlerLocator.php
@@ -31,14 +31,7 @@ class SymfonyContainerCommandHandlerLocator implements CommandHandlerLocator, Co
      */
     public function findHandler(Command $command)
     {
-        $command_name = get_class($command);
-
-        if (!($this->container instanceof ContainerInterface) || !isset($this->command_handler_ids[$command_name])) {
-            return null;
-        }
-        list($service, $method) = $this->command_handler_ids[$command_name];
-
-        return $this->resolve($this->container->get($service), $method);
+        return $this->lazyLoad(get_class($command));
     }
 
     /**
@@ -51,6 +44,22 @@ public function registerService($command_name, $service, $method = '__invoke')
         $this->command_handler_ids[$command_name] = [$service, $method];
     }
 
+    /**
+     * @param string $command_name
+     *
+     * @return callable|null
+     */
+    private function lazyLoad($command_name)
+    {
+        if ($this->container instanceof ContainerInterface && isset($this->command_handler_ids[$command_name])) {
+            list($service, $method) = $this->command_handler_ids[$command_name];
+
+            return $this->resolve($this->container->get($service), $method);
+        }
+
+        return null;
+    }
+
     /**
      * @param mixed  $service
      * @param string $method