Skip to content

Commit

Permalink
Merge branch '4.4'
Browse files Browse the repository at this point in the history
* 4.4:
  cs fix
  Fix return statements
  [TwigBridge] add missing dep
  Add type declarations to private DefaultChoiceListFactory methods
  Add false type to ChoiceListFactoryInterface::createView $label argument
  Update UPGRADE guide of 4.3 for EventDispatcher
  [SecurityBundle] display the correct class name on the deprecated notice
  • Loading branch information
nicolas-grekas committed Aug 13, 2019
2 parents 79b7a10 + bbab3f3 commit cd466ce
Showing 1 changed file with 3 additions and 3 deletions.
6 changes: 3 additions & 3 deletions RequestStack.php
Original file line number Diff line number Diff line change
Expand Up @@ -47,7 +47,7 @@ public function push(Request $request)
public function pop()
{
if (!$this->requests) {
return;
return null;
}

return array_pop($this->requests);
Expand All @@ -73,7 +73,7 @@ public function getCurrentRequest()
public function getMasterRequest()
{
if (!$this->requests) {
return;
return null;
}

return $this->requests[0];
Expand All @@ -95,7 +95,7 @@ public function getParentRequest()
$pos = \count($this->requests) - 2;

if (!isset($this->requests[$pos])) {
return;
return null;
}

return $this->requests[$pos];
Expand Down

0 comments on commit cd466ce

Please sign in to comment.