Skip to content

Commit e26d30b

Browse files
authored
Merge pull request #95 from dallincoons/laravel5.8
Laravel 5.8
2 parents 7242310 + fc41ca0 commit e26d30b

File tree

2 files changed

+7
-6
lines changed

2 files changed

+7
-6
lines changed

composer.json

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -11,11 +11,11 @@
1111
"license" : "MIT",
1212
"require": {
1313
"php" : ">=5.4.0",
14-
"illuminate/support" : "5.0.*|5.1.*|5.2.*|5.3.*|5.4.*|5.5.*|5.6.*|5.7.*",
15-
"illuminate/routing": "5.0.*|5.1.*|5.2.*|5.3.*|5.4.*|5.5.*|5.6.*|5.7.*",
16-
"illuminate/console": "5.0.*|5.1.*|5.2.*|5.3.*|5.4.*|5.5.*|5.6.*|5.7.*",
17-
"illuminate/config": "5.0.*|5.1.*|5.2.*|5.3.*|5.4.*|5.5.*|5.6.*|5.7.*",
18-
"illuminate/filesystem": "5.0.*|5.1.*|5.2.*|5.3.*|5.4.*|5.5.*|5.6.*|5.7.*"
14+
"illuminate/support" : "5.0.*|5.1.*|5.2.*|5.3.*|5.4.*|5.5.*|5.6.*|5.7.*|5.8.*",
15+
"illuminate/routing": "5.0.*|5.1.*|5.2.*|5.3.*|5.4.*|5.5.*|5.6.*|5.7.*|5.8.*",
16+
"illuminate/console": "5.0.*|5.1.*|5.2.*|5.3.*|5.4.*|5.5.*|5.6.*|5.7.*|5.8.*",
17+
"illuminate/config": "5.0.*|5.1.*|5.2.*|5.3.*|5.4.*|5.5.*|5.6.*|5.7.*|5.8.*",
18+
"illuminate/filesystem": "5.0.*|5.1.*|5.2.*|5.3.*|5.4.*|5.5.*|5.6.*|5.7.*|5.8.*"
1919
},
2020
"require-dev" : {
2121
"phpunit/phpunit" : "~4.0",

src/Routes/Collection.php

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,6 +4,7 @@
44

55
use Illuminate\Routing\Route;
66
use Illuminate\Routing\RouteCollection;
7+
use Illuminate\Support\Arr;
78
use Lord\Laroute\Routes\Exceptions\ZeroRoutesException;
89

910
class Collection extends \Illuminate\Support\Collection
@@ -66,7 +67,7 @@ protected function getRouteInformation(Route $route, $filter, $namespace)
6667
$uri = $route->uri();
6768
$name = $route->getName();
6869
$action = $route->getActionName();
69-
$laroute = array_get($route->getAction(), 'laroute', null);
70+
$laroute = Arr::get($route->getAction(), 'laroute', null);
7071

7172
if(!empty($namespace)) {
7273
$a = $route->getAction();

0 commit comments

Comments
 (0)