Fix "Deprecated: Non-static method should not be called statically" (#16

) * fix callable notation. change to \Class:method
juliangut · Nov 9, 2018 · de57d5e · de57d5e
1 parent 0726a07
commit de57d5e
Show file tree

Hide file tree

Showing 4 changed files with 14 additions and 14 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))

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());

diff --git a/tests/Routing/Mapping/Driver/MappingTraitTest.php b/tests/Routing/Mapping/Driver/MappingTraitTest.php
@@ -166,7 +166,7 @@ public function testRoutes()
                                     'methods' => ['GET'],
                                     'pattern' => '/four',
                                     'middleware' => ['fourMiddleware'],
-                                    'invokable' => ['FourRoute', 'actionFour'],
+                                    'invokable' => 'FourRoute' . ':' . 'actionFour',
                                 ],
                             ],
                         ],
@@ -183,15 +183,15 @@ public function testRoutes()
                             'methods' => ['GET'],
                             'pattern' => '/two/{id}',
                             'middleware' => ['twoMiddleware'],
-                            'invokable' => ['TwoRoute', 'actionTwo'],
+                            'invokable' => 'TwoRoute' . ':' . 'actionTwo',
                         ],
                         [
                             'methods' => ['GET'],
                             'pattern' => '/three/{id}',
                             'placeholders' => [
                                 'id' => '\d+',
                             ],
-                            'invokable' => ['ThreeRoute', 'actionThree'],
+                            'invokable' => 'ThreeRoute' . ':' . 'actionThree',
                         ],
                     ],
                 ],
@@ -208,7 +208,7 @@ public function testRoutes()
                         'id' => 'int',
                     ],
                     'middleware' => ['oneMiddleware'],
-                    'invokable' => ['OneRoute', 'actionOne'],
+                    'invokable' => 'OneRoute' . ':' . 'actionOne',
                 ],
             ]));
         /* @var \Jgut\Mapping\Driver\AbstractMappingDriver $driver */
@@ -220,7 +220,7 @@ public function testRoutes()
         self::assertEquals('four', $route->getName());
         self::assertEquals(['GET'], $route->getMethods());
         self::assertEquals(0, $route->getPriority());
-        self::assertEquals(['FourRoute', 'actionFour'], $route->getInvokable());
+        self::assertEquals('FourRoute' . ':' . 'actionFour', $route->getInvokable());
         self::assertEquals('four', $route->getPattern());
         self::assertEquals([], $route->getPlaceholders());
         self::assertEquals(['fourMiddleware'], $route->getMiddleware());
@@ -230,7 +230,7 @@ public function testRoutes()
         self::assertNull($route->getName());
         self::assertEquals(['GET'], $route->getMethods());
         self::assertEquals(0, $route->getPriority());
-        self::assertEquals(['TwoRoute', 'actionTwo'], $route->getInvokable());
+        self::assertEquals('TwoRoute' . ':' . 'actionTwo', $route->getInvokable());
         self::assertEquals('two/{id}', $route->getPattern());
         self::assertEquals([], $route->getPlaceholders());
         self::assertEquals(['twoMiddleware'], $route->getMiddleware());
@@ -239,7 +239,7 @@ public function testRoutes()
         self::assertInstanceOf(RouteMetadata::class, $route);
         self::assertEquals('', $route->getName());
         self::assertEquals(['GET'], $route->getMethods());
-        self::assertEquals(['ThreeRoute', 'actionThree'], $route->getInvokable());
+        self::assertEquals('ThreeRoute' . ':' . 'actionThree', $route->getInvokable());
         self::assertEquals(0, $route->getPriority());
         self::assertEquals('three/{id}', $route->getPattern());
         self::assertEquals(['id' => '\d+'], $route->getPlaceholders());
@@ -250,7 +250,7 @@ public function testRoutes()
         self::assertEquals('one', $route->getName());
         self::assertEquals(['GET', 'POST'], $route->getMethods());
         self::assertEquals(-10, $route->getPriority());
-        self::assertEquals(['OneRoute', 'actionOne'], $route->getInvokable());
+        self::assertEquals('OneRoute' . ':' . 'actionOne', $route->getInvokable());
         self::assertEquals('one/{id}', $route->getPattern());
         self::assertEquals(['id' => 'numeric'], $route->getPlaceholders());
         self::assertEquals(['oneMiddleware'], $route->getMiddleware());