Loading core/modules/views/src/ViewExecutable.php +4 −4 Original line number Diff line number Diff line Loading @@ -687,7 +687,7 @@ public function setExposedInput($filters) { /** * Figures out what the exposed input for this view is. * * They will be taken from \Drupal::request()->query or from * They will be taken from $this->request->query or from * something previously set on the view. * * @return string[] Loading @@ -697,13 +697,13 @@ public function setExposedInput($filters) { * @see self::setExposedInput() */ public function getExposedInput() { // Fill our input either from \Drupal::request()->query or from something // Fill our input either from $this->request->query or from something // previously set on the view. if (empty($this->exposed_input)) { // Ensure that we can call the method at any point in time. $this->initDisplay(); $this->exposed_input = \Drupal::request()->query->all(); $this->exposed_input = $this->request->query->all(); // unset items that are definitely not our input: foreach (['page', 'q'] as $key) { if (isset($this->exposed_input[$key])) { Loading @@ -713,7 +713,7 @@ public function getExposedInput() { // If we have no input at all, check for remembered input via session. if (empty($this->exposed_input) && $this->request->hasSession()) { $session = \Drupal::request()->getSession(); $session = $this->request->getSession(); // If filters are not overridden, store the 'remember' settings on the // default display. If they are, store them on this display. This way, // multiple displays in the same view can share the same filters and Loading core/modules/views/tests/src/Kernel/Handler/AreaDisplayLinkTest.php +1 −4 Original line number Diff line number Diff line Loading @@ -14,7 +14,6 @@ use Prophecy\Argument; use Psr\Log\LoggerInterface; use Symfony\Component\HttpFoundation\Request; use Symfony\Component\HttpFoundation\RequestStack; use Symfony\Component\HttpFoundation\Session\Session; use Symfony\Component\HttpFoundation\Session\Storage\MockArraySessionStorage; Loading Loading @@ -169,9 +168,7 @@ public function testAreaDisplayLink() { MainContentViewSubscriber::WRAPPER_FORMAT => 1, ]); $request->setSession(new Session(new MockArraySessionStorage())); $request_stack = new RequestStack(); $request_stack->push($request); $this->container->set('request_stack', $request_stack); $view->setRequest($request); $view->destroy(); $view->setDisplay('page_1'); $view->setCurrentPage(2); Loading Loading
core/modules/views/src/ViewExecutable.php +4 −4 Original line number Diff line number Diff line Loading @@ -687,7 +687,7 @@ public function setExposedInput($filters) { /** * Figures out what the exposed input for this view is. * * They will be taken from \Drupal::request()->query or from * They will be taken from $this->request->query or from * something previously set on the view. * * @return string[] Loading @@ -697,13 +697,13 @@ public function setExposedInput($filters) { * @see self::setExposedInput() */ public function getExposedInput() { // Fill our input either from \Drupal::request()->query or from something // Fill our input either from $this->request->query or from something // previously set on the view. if (empty($this->exposed_input)) { // Ensure that we can call the method at any point in time. $this->initDisplay(); $this->exposed_input = \Drupal::request()->query->all(); $this->exposed_input = $this->request->query->all(); // unset items that are definitely not our input: foreach (['page', 'q'] as $key) { if (isset($this->exposed_input[$key])) { Loading @@ -713,7 +713,7 @@ public function getExposedInput() { // If we have no input at all, check for remembered input via session. if (empty($this->exposed_input) && $this->request->hasSession()) { $session = \Drupal::request()->getSession(); $session = $this->request->getSession(); // If filters are not overridden, store the 'remember' settings on the // default display. If they are, store them on this display. This way, // multiple displays in the same view can share the same filters and Loading
core/modules/views/tests/src/Kernel/Handler/AreaDisplayLinkTest.php +1 −4 Original line number Diff line number Diff line Loading @@ -14,7 +14,6 @@ use Prophecy\Argument; use Psr\Log\LoggerInterface; use Symfony\Component\HttpFoundation\Request; use Symfony\Component\HttpFoundation\RequestStack; use Symfony\Component\HttpFoundation\Session\Session; use Symfony\Component\HttpFoundation\Session\Storage\MockArraySessionStorage; Loading Loading @@ -169,9 +168,7 @@ public function testAreaDisplayLink() { MainContentViewSubscriber::WRAPPER_FORMAT => 1, ]); $request->setSession(new Session(new MockArraySessionStorage())); $request_stack = new RequestStack(); $request_stack->push($request); $this->container->set('request_stack', $request_stack); $view->setRequest($request); $view->destroy(); $view->setDisplay('page_1'); $view->setCurrentPage(2); Loading