From 4aa59c6830255b826ea96d57e10ace6be5f7018c Mon Sep 17 00:00:00 2001 From: Stephen Donchez Date: Fri, 15 Jan 2021 14:06:02 -0500 Subject: [PATCH] Change collection type to allow for compiledRouteCollections and fetch routes regardless of abstractRouteCollection implementation (compiled or not) --- src/Routes/Collection.php | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/src/Routes/Collection.php b/src/Routes/Collection.php index ab8b66e..22de0e6 100644 --- a/src/Routes/Collection.php +++ b/src/Routes/Collection.php @@ -3,13 +3,13 @@ namespace Lord\Laroute\Routes; use Illuminate\Routing\Route; -use Illuminate\Routing\RouteCollection; +use Illuminate\Routing\AbstractRouteCollection; use Illuminate\Support\Arr; use Lord\Laroute\Routes\Exceptions\ZeroRoutesException; class Collection extends \Illuminate\Support\Collection { - public function __construct(RouteCollection $routes, $filter, $namespace) + public function __construct(AbstractRouteCollection $routes, $filter, $namespace) { $this->items = $this->parseRoutes($routes, $filter, $namespace); } @@ -17,20 +17,20 @@ public function __construct(RouteCollection $routes, $filter, $namespace) /** * Parse the routes into a jsonable output. * - * @param RouteCollection $routes + * @param AbstractRouteCollection $routes * @param string $filter * @param string $namespace * * @return array * @throws ZeroRoutesException */ - protected function parseRoutes(RouteCollection $routes, $filter, $namespace) + protected function parseRoutes(AbstractRouteCollection $routes, $filter, $namespace) { $this->guardAgainstZeroRoutes($routes); $results = []; - foreach ($routes as $route) { + foreach ($routes->getRoutes() as $route) { $results[] = $this->getRouteInformation($route, $filter, $namespace); } @@ -40,11 +40,11 @@ protected function parseRoutes(RouteCollection $routes, $filter, $namespace) /** * Throw an exception if there aren't any routes to process * - * @param RouteCollection $routes + * @param AbstractRouteCollection $routes * * @throws ZeroRoutesException */ - protected function guardAgainstZeroRoutes(RouteCollection $routes) + protected function guardAgainstZeroRoutes(AbstractRouteCollection $routes) { if (count($routes) < 1) { throw new ZeroRoutesException("You don't have any routes!");