Skip to content

Commit

Permalink
Merge pull request #1152 from Kaukov/master
Browse files Browse the repository at this point in the history
Add support for Laravel 5.3
  • Loading branch information
hskrasek authored Aug 30, 2016
2 parents 6fae521 + 9f3e2e6 commit 3bd1895
Show file tree
Hide file tree
Showing 2 changed files with 14 additions and 10 deletions.
20 changes: 10 additions & 10 deletions composer.json
Original file line number Diff line number Diff line change
Expand Up @@ -18,19 +18,19 @@
"php": "^5.5.9 || ^7.0",
"dingo/blueprint": "0.2.*",
"doctrine/annotations": "1.2.*",
"illuminate/routing": "5.1.* || 5.2.*",
"illuminate/support": "5.1.* || 5.2.*",
"illuminate/routing": "5.1.* || 5.2.* || 5.3.*",
"illuminate/support": "5.1.* || 5.2.* || 5.3.*",
"league/fractal": ">=0.12.0"
},
"require-dev": {
"illuminate/auth": "5.1.* || 5.2.*",
"illuminate/cache": "5.1.* || 5.2.*",
"illuminate/console": "5.1.* || 5.2.*",
"illuminate/database": "5.1.* || 5.2.*",
"illuminate/events": "5.1.* || 5.2.*",
"illuminate/filesystem": "5.1.* || 5.2.*",
"illuminate/log": "5.1.* || 5.2.*",
"illuminate/pagination": "5.1.* || 5.2.*",
"illuminate/auth": "5.1.* || 5.2.* || 5.3.*",
"illuminate/cache": "5.1.* || 5.2.* || 5.3.*",
"illuminate/console": "5.1.* || 5.2.* || 5.3.*",
"illuminate/database": "5.1.* || 5.2.* || 5.3.*",
"illuminate/events": "5.1.* || 5.2.* || 5.3.*",
"illuminate/filesystem": "5.1.* || 5.2.* || 5.3.*",
"illuminate/log": "5.1.* || 5.2.* || 5.3.*",
"illuminate/pagination": "5.1.* || 5.2.* || 5.3.*",
"laravel/lumen-framework": "5.1.* || 5.2.*",
"lucadegasperi/oauth2-server-laravel": "5.0.*",
"mockery/mockery": "~0.9",
Expand Down
4 changes: 4 additions & 0 deletions src/Routing/Adapter/Laravel.php
Original file line number Diff line number Diff line change
Expand Up @@ -226,6 +226,10 @@ public function prepareRouteForSerialization($route)
*/
public function gatherRouteMiddlewares($route)
{
if (method_exists($this->router, 'gatherRouteMiddleware')) {
return $this->router->gatherRouteMiddleware($route);
}

return $this->router->gatherRouteMiddlewares($route);
}

Expand Down

0 comments on commit 3bd1895

Please sign in to comment.