Skip to content

Commit 4675eaa

Browse files
authored
Revert "fix: Call to a member function requestIsConditional() on null (dingo#1377)" (dingo#1490)
This reverts commit 815afb7.
1 parent 815afb7 commit 4675eaa

File tree

2 files changed

+1
-6
lines changed

2 files changed

+1
-6
lines changed

src/Routing/Adapter/Lumen.php

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -107,7 +107,6 @@ public function dispatch(Request $request, $version)
107107
$this->removeMiddlewareFromApp();
108108

109109
$routeCollector = $this->mergeOldRoutes($version);
110-
111110
$dispatcher = call_user_func($this->dispatcherResolver, $routeCollector);
112111

113112
$this->app->setDispatcher($dispatcher);

src/Routing/Router.php

Lines changed: 1 addition & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -402,10 +402,6 @@ protected function mergeGroup(array $new, array $old)
402402
$new[$option] = $this->formatArrayBasedOption($option, $new);
403403
}
404404

405-
if (isset($new['version'])) {
406-
unset($old['version']);
407-
}
408-
409405
if (isset($new['domain'])) {
410406
unset($old['domain']);
411407
}
@@ -592,7 +588,7 @@ public function gatherRouteMiddlewares($route)
592588
*/
593589
protected function requestIsConditional()
594590
{
595-
return ($r = $this->getCurrentRoute()) ? $r->requestIsConditional() : false;
591+
return $this->getCurrentRoute()->requestIsConditional();
596592
}
597593

598594
/**

0 commit comments

Comments
 (0)