return callable

juliangut · Aug 5, 2017 · 6c29693 · 6c29693
1 parent a2cf2dc
commit 6c29693
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 5 deletions.
diff --git a/src/Loader/AnnotationLoader.php b/src/Loader/AnnotationLoader.php
@@ -289,7 +289,7 @@ protected function getCompiledRoute(
             'pattern' => $pattern,
             'placeholders' => $placeholders,
             'middleware' => $middleware,
-            'invokable' => $class->name . '::' . $method->name,
+            'invokable' => [$class->name,  $method->name],
         ];
     }
 

diff --git a/tests/Routing/Loader/AnnotationLoaderTest.php b/tests/Routing/Loader/AnnotationLoaderTest.php
@@ -93,7 +93,7 @@ public function testEmptyMethods()
                     'section' => '[A-Za-z]+',
                 ],
                 'middleware' => ['fourMiddleware', 'dependentMiddleware', 'groupedMiddleware'],
-                'invokable' => 'Jgut\\Slim\\Routing\\Tests\\Files\\Annotation\\Valid\\DependentRoute::actionFour',
+                'invokable' => ['Jgut\\Slim\\Routing\\Tests\\Files\\Annotation\\Valid\\DependentRoute', 'actionFour'],
             ],
             [
                 'name' => '',
@@ -104,7 +104,7 @@ public function testEmptyMethods()
                     'section' => '[A-Za-z]+',
                 ],
                 'middleware' => ['twoMiddleware', 'groupedMiddleware'],
-                'invokable' => 'Jgut\\Slim\\Routing\\Tests\\Files\\Annotation\\Valid\\GroupedRoute::actionTwo',
+                'invokable' => ['Jgut\\Slim\\Routing\\Tests\\Files\\Annotation\\Valid\\GroupedRoute', 'actionTwo'],
             ],
             [
                 'name' => '',
@@ -116,7 +116,7 @@ public function testEmptyMethods()
                     'id' => '\\d+',
                 ],
                 'middleware' => ['threeMiddleware', 'groupedMiddleware'],
-                'invokable' => 'Jgut\\Slim\\Routing\\Tests\\Files\\Annotation\\Valid\\GroupedRoute::actionThree',
+                'invokable' => ['Jgut\\Slim\\Routing\\Tests\\Files\\Annotation\\Valid\\GroupedRoute', 'actionThree'],
             ],
             [
                 'name' => 'one',
@@ -127,7 +127,7 @@ public function testEmptyMethods()
                     'id' => '[0-9]+',
                 ],
                 'middleware' => ['oneMiddleware'],
-                'invokable' => 'Jgut\\Slim\\Routing\\Tests\\Files\\Annotation\\Valid\\SingleRoute::actionOne',
+                'invokable' => ['Jgut\\Slim\\Routing\\Tests\\Files\\Annotation\\Valid\\SingleRoute', 'actionOne'],
             ],
         ];