Skip to content

Commit 3bd1895

Browse files
authored
Merge pull request dingo#1152 from Kaukov/master
Add support for Laravel 5.3
2 parents 6fae521 + 9f3e2e6 commit 3bd1895

File tree

2 files changed

+14
-10
lines changed

2 files changed

+14
-10
lines changed

composer.json

Lines changed: 10 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -18,19 +18,19 @@
1818
"php": "^5.5.9 || ^7.0",
1919
"dingo/blueprint": "0.2.*",
2020
"doctrine/annotations": "1.2.*",
21-
"illuminate/routing": "5.1.* || 5.2.*",
22-
"illuminate/support": "5.1.* || 5.2.*",
21+
"illuminate/routing": "5.1.* || 5.2.* || 5.3.*",
22+
"illuminate/support": "5.1.* || 5.2.* || 5.3.*",
2323
"league/fractal": ">=0.12.0"
2424
},
2525
"require-dev": {
26-
"illuminate/auth": "5.1.* || 5.2.*",
27-
"illuminate/cache": "5.1.* || 5.2.*",
28-
"illuminate/console": "5.1.* || 5.2.*",
29-
"illuminate/database": "5.1.* || 5.2.*",
30-
"illuminate/events": "5.1.* || 5.2.*",
31-
"illuminate/filesystem": "5.1.* || 5.2.*",
32-
"illuminate/log": "5.1.* || 5.2.*",
33-
"illuminate/pagination": "5.1.* || 5.2.*",
26+
"illuminate/auth": "5.1.* || 5.2.* || 5.3.*",
27+
"illuminate/cache": "5.1.* || 5.2.* || 5.3.*",
28+
"illuminate/console": "5.1.* || 5.2.* || 5.3.*",
29+
"illuminate/database": "5.1.* || 5.2.* || 5.3.*",
30+
"illuminate/events": "5.1.* || 5.2.* || 5.3.*",
31+
"illuminate/filesystem": "5.1.* || 5.2.* || 5.3.*",
32+
"illuminate/log": "5.1.* || 5.2.* || 5.3.*",
33+
"illuminate/pagination": "5.1.* || 5.2.* || 5.3.*",
3434
"laravel/lumen-framework": "5.1.* || 5.2.*",
3535
"lucadegasperi/oauth2-server-laravel": "5.0.*",
3636
"mockery/mockery": "~0.9",

src/Routing/Adapter/Laravel.php

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -226,6 +226,10 @@ public function prepareRouteForSerialization($route)
226226
*/
227227
public function gatherRouteMiddlewares($route)
228228
{
229+
if (method_exists($this->router, 'gatherRouteMiddleware')) {
230+
return $this->router->gatherRouteMiddleware($route);
231+
}
232+
229233
return $this->router->gatherRouteMiddlewares($route);
230234
}
231235

0 commit comments

Comments
 (0)