Adjusted logic for less redundant code and calls.

Author: Rarst

src/CallableResolver.php

@@ -27,18 +27,14 @@ public function __construct(\Invoker\CallableResolver $callableResolver)
      */
     public function resolve($toResolve): callable
     {
-        $toResolve = $this->translateNotation($toResolve);
-
-        return $this->callableResolver->resolve($toResolve);
+        return $this->callableResolver->resolve($this->translateNotation($toResolve));
     }
 
     /**
      * {@inheritdoc}
      */
     public function resolveRoute($toResolve): callable
     {
-        $toResolve = $this->translateNotation($toResolve);
-
         return $this->resolvePossibleSignature($toResolve, 'handle', RequestHandlerInterface::class);
     }
 
@@ -47,8 +43,6 @@ public function resolveRoute($toResolve): callable
      */
     public function resolveMiddleware($toResolve): callable
     {
-        $toResolve = $this->translateNotation($toResolve);
-
         return $this->resolvePossibleSignature($toResolve, 'process', MiddlewareInterface::class);
     }
 
@@ -66,9 +60,11 @@ private function translateNotation($toResolve)
 
     private function resolvePossibleSignature($toResolve, string $method, string $typeName): callable
     {
+        $toResolve = $this->translateNotation($toResolve);
+
         if (is_string($toResolve)) {
             try {
-                $callable = $this->resolve([$toResolve, $method]);
+                $callable = $this->callableResolver->resolve([$toResolve, $method]);
 
                 if (is_array($callable) && $callable[0] instanceof $typeName) {
                     return $callable;
@@ -78,6 +74,6 @@ private function resolvePossibleSignature($toResolve, string $method, string $ty
             }
         }
 
-        return $this->resolve($toResolve);
+        return $this->callableResolver->resolve($toResolve);
     }
 }