Merge 0608145 into 0726a07

juliangut · Nov 8, 2018 · f4edb17 · f4edb17
2 parents 0726a07 + 0608145
commit f4edb17
Show file tree

Hide file tree

Showing 3 changed files with 7 additions and 7 deletions.
diff --git a/src/Mapping/Driver/AnnotationDriver.php b/src/Mapping/Driver/AnnotationDriver.php
@@ -207,7 +207,7 @@ protected function getRouteMetadata(
             ->setMiddleware($annotation->getMiddleware())
             ->setMethods($annotation->getMethods())
             ->setXmlHttpRequest($annotation->isXmlHttpRequest())
-            ->setInvokable([$class->name,  $method->name])
+            ->setInvokable($class->name . ':' . $method->name)
             ->setPriority($annotation->getPriority());
 
         if ($annotation->getPattern() !== null) {

diff --git a/src/Mapping/Driver/MappingTrait.php b/src/Mapping/Driver/MappingTrait.php
@@ -97,7 +97,7 @@ protected function getGroupMetadata(array $mapping, GroupMetadata $parentGroup =
      *
      * @return RouteMetadata
      */
-    protected function getRouteMetadata(array $mapping, GroupMetadata $group = null): RouteMetadata
+    protected function getRouteMetadata($mapping, GroupMetadata $group = null): RouteMetadata
     {
         $route = (new RouteMetadata())
             ->setMethods($this->getMethods($mapping))
@@ -347,7 +347,7 @@ protected function getMiddleware(array $mapping): array
      *
      * @return string|array|callable
      */
-    protected function getInvokable(array $mapping)
+    protected function getInvokable($mapping)
     {
         if (!\array_key_exists('invokable', $mapping)) {
             throw new DriverException('Route invokable definition missing');

diff --git a/tests/Routing/Mapping/Driver/AnnotationDriverTest.php b/tests/Routing/Mapping/Driver/AnnotationDriverTest.php
@@ -134,7 +134,7 @@ public function testRoutes()
         self::assertEquals('four', $route->getName());
         self::assertEquals(['GET'], $route->getMethods());
         self::assertEquals(
-            ['Jgut\Slim\Routing\Tests\Files\Annotation\Valid\DependentRoute', 'actionFour'],
+            'Jgut\Slim\Routing\Tests\Files\Annotation\Valid\DependentRoute:actionFour',
             $route->getInvokable()
         );
         self::assertEquals(0, $route->getPriority());
@@ -147,7 +147,7 @@ public function testRoutes()
         self::assertNull($route->getName());
         self::assertEquals(['GET'], $route->getMethods());
         self::assertEquals(
-            ['Jgut\Slim\Routing\Tests\Files\Annotation\Valid\GroupedRoute', 'actionTwo'],
+            'Jgut\Slim\Routing\Tests\Files\Annotation\Valid\GroupedRoute:actionTwo',
             $route->getInvokable()
         );
         self::assertEquals(0, $route->getPriority());
@@ -160,7 +160,7 @@ public function testRoutes()
         self::assertNull($route->getName());
         self::assertEquals(['GET'], $route->getMethods());
         self::assertEquals(
-            ['Jgut\Slim\Routing\Tests\Files\Annotation\Valid\GroupedRoute', 'actionThree'],
+            'Jgut\Slim\Routing\Tests\Files\Annotation\Valid\GroupedRoute:actionThree',
             $route->getInvokable()
         );
         self::assertEquals(0, $route->getPriority());
@@ -173,7 +173,7 @@ public function testRoutes()
         self::assertEquals('one', $route->getName());
         self::assertEquals(['GET', 'POST'], $route->getMethods());
         self::assertEquals(
-            ['Jgut\Slim\Routing\Tests\Files\Annotation\Valid\SingleRoute', 'actionOne'],
+            'Jgut\Slim\Routing\Tests\Files\Annotation\Valid\SingleRoute:actionOne',
             $route->getInvokable()
         );
         self::assertEquals(-10, $route->getPriority());