Merge pull request #79 from sunrise-php/release/v2.10.2

v2.10.2

Author: fenric

src/Annotation/Route.php

@@ -15,8 +15,6 @@
  * Import classes
  */
 use Attribute;
-use ReflectionClass;
-use ReflectionMethod;
 
 /**
  * @Annotation
@@ -48,11 +46,11 @@ final class Route
      *
      * Don't use the property outside of the package.
      *
-     * @var ReflectionClass|ReflectionMethod|null
+     * @var mixed
      *
      * @internal
      */
-    public $holder = null;
+    public $holder;
 
     /**
      * A route name

src/Loader/DescriptorLoader.php

@@ -251,8 +251,7 @@ public function load() : RouteCollectionInterface
             ->setHost($descriptor->host)
             ->setSummary($descriptor->summary)
             ->setDescription($descriptor->description)
-            ->setTags(...$descriptor->tags)
-            ->setHolder($descriptor->holder);
+            ->setTags(...$descriptor->tags);
         }
 
         return $this->collectionFactory->createCollection(...$routes);
@@ -317,7 +316,7 @@ private function getDescriptorsFromClass(ReflectionClass $class) : array
         if ($class->isSubclassOf(RequestHandlerInterface::class)) {
             $descriptor = $this->getDescriptorFromClassOrMethod($class);
             if (isset($descriptor)) {
-                $descriptor->holder = $class;
+                $descriptor->holder = $class->getName();
                 $result[] = $descriptor;
             }
         }
@@ -332,7 +331,7 @@ private function getDescriptorsFromClass(ReflectionClass $class) : array
 
             $descriptor = $this->getDescriptorFromClassOrMethod($method);
             if (isset($descriptor)) {
-                $descriptor->holder = $method;
+                $descriptor->holder = [$method->getDeclaringClass()->getName(), $method->getName()];
                 $result[] = $descriptor;
             }
         }

src/Route.php

@@ -19,9 +19,6 @@
 use Psr\Http\Server\MiddlewareInterface;
 use Psr\Http\Server\RequestHandlerInterface;
 use Sunrise\Http\Router\RequestHandler\QueueableRequestHandler;
-use ReflectionClass;
-use ReflectionMethod;
-use Reflector;
 
 /**
  * Import functions
@@ -123,13 +120,6 @@ class Route implements RouteInterface
      */
     private $tags = [];
 
-    /**
-     * The route holder
-     *
-     * @var ReflectionClass|ReflectionMethod|null
-     */
-    private $holder = null;
-
     /**
      * Constructor of the class
      *
@@ -236,14 +226,6 @@ public function getTags() : array
         return $this->tags;
     }
 
-    /**
-     * {@inheritdoc}
-     */
-    public function getHolder() : ?Reflector
-    {
-        return $this->holder;
-    }
-
     /**
      * {@inheritdoc}
      */
@@ -348,16 +330,6 @@ public function setTags(string ...$tags) : RouteInterface
         return $this;
     }
 
-    /**
-     * {@inheritdoc}
-     */
-    public function setHolder(?Reflector $holder) : RouteInterface
-    {
-        $this->holder = $holder;
-
-        return $this;
-    }
-
     /**
      * {@inheritdoc}
      */

src/RouteInterface.php

@@ -16,9 +16,6 @@
  */
 use Psr\Http\Server\MiddlewareInterface;
 use Psr\Http\Server\RequestHandlerInterface;
-use ReflectionClass;
-use ReflectionMethod;
-use Reflector;
 
 /**
  * RouteInterface
@@ -104,15 +101,6 @@ public function getDescription() : string;
      */
     public function getTags() : array;
 
-    /**
-     * Gets the route holder
-     *
-     * @return ReflectionClass|ReflectionMethod|null
-     *
-     * @since 2.10.0
-     */
-    public function getHolder() : ?Reflector;
-
     /**
      * Sets the given name to the route
      *
@@ -211,17 +199,6 @@ public function setDescription(string $description) : RouteInterface;
      */
     public function setTags(string ...$tags) : RouteInterface;
 
-    /**
-     * Sets the given holder to the route
-     *
-     * @param ReflectionClass|ReflectionMethod|null $holder
-     *
-     * @return RouteInterface
-     *
-     * @since 2.10.0
-     */
-    public function setHolder(?Reflector $holder) : RouteInterface;
-
     /**
      * Adds the given prefix to the route path
      *

tests/Loader/DescriptorLoaderTest.php

@@ -91,7 +91,7 @@ public function testCache() : void
         $this->assertSame('foo', $loader->getCacheKey());
 
         $descriptor = new Route('controller-from-cached-descriptor', null, '/');
-        $descriptor->holder = new ReflectionClass(Fixtures\Controllers\BlankController::class);
+        $descriptor->holder = Fixtures\Controllers\BlankController::class;
 
         $cache->storage[$loader->getCacheKey()][0] = $descriptor;
 
@@ -148,8 +148,6 @@ public function testLoadMinimallyAnnotatedClass() : void
         $this->assertSame('minimally-annotated-controller', $route->getName());
         $this->assertSame('/', $route->getPath());
         $this->assertSame(['GET'], $route->getMethods());
-        $this->assertNotNull($route->getHolder());
-        $this->assertSame($class, $route->getHolder()->getName());
     }
 
     /**
@@ -174,8 +172,6 @@ public function testLoadMinimallyAttributedClass() : void
         $this->assertSame('minimally-attributed-controller', $route->getName());
         $this->assertSame('/', $route->getPath());
         $this->assertSame(['GET'], $route->getMethods());
-        $this->assertNotNull($route->getHolder());
-        $this->assertSame($class, $route->getHolder()->getName());
     }
 
     /**

tests/RouteTest.php

@@ -177,18 +177,6 @@ public function testSetTags() : void
         $this->assertSame($tags, $route->getTags());
     }
 
-    /**
-     * @return void
-     */
-    public function testSetHolder() : void
-    {
-        $route = new Fixtures\Route();
-        $holder = new \ReflectionClass(__CLASS__);
-        $this->assertNull($route->getHolder());
-        $this->assertSame($route, $route->setHolder($holder));
-        $this->assertSame($holder, $route->getHolder());
-    }
-
     /**
      * @return void
      */