resolve invokable class instead of callable

juliangut · Aug 21, 2019 · 104e3a8 · 104e3a8
1 parent 99ebbdf
commit 104e3a8
Show file tree

Hide file tree

Showing 2 changed files with 15 additions and 12 deletions.
diff --git a/src/CallableResolver.php b/src/CallableResolver.php
@@ -54,7 +54,7 @@ public function resolve($toResolve): callable
         $resolvable = $toResolve;
 
         if (\is_string($resolvable)) {
-            $resolvable = $this->callableFromStringNotation($resolvable, '__invoke');
+            $resolvable = $this->callableFromStringNotation($resolvable);
         }
 
         return $this->resolveCallable($resolvable, $toResolve);
@@ -128,15 +128,18 @@ protected function resolveCallable($resolvable, $toResolve): callable
     /**
      * Get callable from string callable notation.
      *
-     * @param string $toResolve
-     * @param string $defaultMethod
+     * @param string      $toResolve
+     * @param string|null $defaultMethod
      *
-     * @return string[]
+     * @return string|string[]
      */
-    private function callableFromStringNotation(string $toResolve, string $defaultMethod): array
+    private function callableFromStringNotation(string $toResolve, ?string $defaultMethod = null)
     {
         \preg_match(static::CALLABLE_PATTERN, $toResolve, $matches);
+        if ($matches) {
+            return [$matches[1], $matches[2]];
+        }
 
-        return $matches ? [$matches[1], $matches[2]] : [$toResolve, $defaultMethod];
+        return $defaultMethod !== null ? [$toResolve, $defaultMethod] : $toResolve;
     }
 }
diff --git a/tests/PHPDI/CallableResolverTest.php b/tests/PHPDI/CallableResolverTest.php
@@ -30,12 +30,12 @@ class CallableResolverTest extends TestCase
      *
      * @param string                $resolveMethod
      * @param string|mixed[]|object $toResolve
-     * @param mixed[]               $expectedResolvable
+     * @param string|mixed[]        $expectedResolvable
      */
     public function testResolveFromString(
         string $resolveMethod,
         $toResolve,
-        array $expectedResolvable
+        $expectedResolvable
     ): void {
         $invoker = $this->getMockBuilder(InvokerResolver::class)
             ->disableOriginalConstructor()
@@ -62,7 +62,7 @@ public function getResolvableList(): array
         $middleware = $this->getMockBuilder(MiddlewareInterface::class)->getMock();
 
         return [
-            ['resolve', 'Service', ['Service', '__invoke']],
+            ['resolve', 'Service', 'Service'],
             ['resolve', 'Service:method', ['Service', 'method']],
             ['resolve', 'Service::method', ['Service', 'method']],
             ['resolve', ['Service', 'method'], ['Service', 'method']],
@@ -82,12 +82,12 @@ public function getResolvableList(): array
      *
      * @param string                $resolveMethod
      * @param string|mixed[]|object $toResolve
-     * @param mixed[]               $expectedResolvable
+     * @param string|mixed[]        $expectedResolvable
      */
     public function testNotResolvable(
         string $resolveMethod,
         $toResolve,
-        array $expectedResolvable,
+        $expectedResolvable,
         string $expectedEsceptionType
     ): void {
         $this->expectException(\RuntimeException::class);
@@ -113,7 +113,7 @@ public function getNotResolvableList(): array
         $middleware = $this->getMockBuilder(MiddlewareInterface::class)->getMock();
 
         return [
-            ['resolve', 'Service', ['Service', '__invoke'], 'Service'],
+            ['resolve', 'Service', 'Service', 'Service'],
             ['resolve', 'Service:method', ['Service', 'method'], 'Service:method'],
             ['resolve', 'Service::method', ['Service', 'method'], 'Service::method'],
             ['resolve', ['Service', 'method'], ['Service', 'method'], \json_encode(['Service', 'method'])],