Skip to content

Commit

Permalink
Merge pull request #95 from dallincoons/laravel5.8
Browse files Browse the repository at this point in the history
Laravel 5.8
  • Loading branch information
aaronlord committed May 11, 2019
2 parents 7242310 + fc41ca0 commit e26d30b
Show file tree
Hide file tree
Showing 2 changed files with 7 additions and 6 deletions.
10 changes: 5 additions & 5 deletions composer.json
Original file line number Diff line number Diff line change
Expand Up @@ -11,11 +11,11 @@
"license" : "MIT",
"require": {
"php" : ">=5.4.0",
"illuminate/support" : "5.0.*|5.1.*|5.2.*|5.3.*|5.4.*|5.5.*|5.6.*|5.7.*",
"illuminate/routing": "5.0.*|5.1.*|5.2.*|5.3.*|5.4.*|5.5.*|5.6.*|5.7.*",
"illuminate/console": "5.0.*|5.1.*|5.2.*|5.3.*|5.4.*|5.5.*|5.6.*|5.7.*",
"illuminate/config": "5.0.*|5.1.*|5.2.*|5.3.*|5.4.*|5.5.*|5.6.*|5.7.*",
"illuminate/filesystem": "5.0.*|5.1.*|5.2.*|5.3.*|5.4.*|5.5.*|5.6.*|5.7.*"
"illuminate/support" : "5.0.*|5.1.*|5.2.*|5.3.*|5.4.*|5.5.*|5.6.*|5.7.*|5.8.*",
"illuminate/routing": "5.0.*|5.1.*|5.2.*|5.3.*|5.4.*|5.5.*|5.6.*|5.7.*|5.8.*",
"illuminate/console": "5.0.*|5.1.*|5.2.*|5.3.*|5.4.*|5.5.*|5.6.*|5.7.*|5.8.*",
"illuminate/config": "5.0.*|5.1.*|5.2.*|5.3.*|5.4.*|5.5.*|5.6.*|5.7.*|5.8.*",
"illuminate/filesystem": "5.0.*|5.1.*|5.2.*|5.3.*|5.4.*|5.5.*|5.6.*|5.7.*|5.8.*"
},
"require-dev" : {
"phpunit/phpunit" : "~4.0",
Expand Down
3 changes: 2 additions & 1 deletion src/Routes/Collection.php
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,7 @@

use Illuminate\Routing\Route;
use Illuminate\Routing\RouteCollection;
use Illuminate\Support\Arr;
use Lord\Laroute\Routes\Exceptions\ZeroRoutesException;

class Collection extends \Illuminate\Support\Collection
Expand Down Expand Up @@ -66,7 +67,7 @@ protected function getRouteInformation(Route $route, $filter, $namespace)
$uri = $route->uri();
$name = $route->getName();
$action = $route->getActionName();
$laroute = array_get($route->getAction(), 'laroute', null);
$laroute = Arr::get($route->getAction(), 'laroute', null);

if(!empty($namespace)) {
$a = $route->getAction();
Expand Down

0 comments on commit e26d30b

Please sign in to comment.