Use new request stack. Addresses #9.

This commit is contained in:
Rosie Le Faive 2023-01-26 10:14:40 -04:00
parent 4d3a4df647
commit f2e21f3a1a
4 changed files with 4 additions and 5 deletions

View file

@ -11,7 +11,6 @@ use Drupal\Core\Render\RendererInterface;
use Drupal\Core\Routing\CurrentRouteMatch; use Drupal\Core\Routing\CurrentRouteMatch;
use Symfony\Component\DependencyInjection\ContainerInterface; use Symfony\Component\DependencyInjection\ContainerInterface;
use Symfony\Component\HttpFoundation\Request; use Symfony\Component\HttpFoundation\Request;
use Symfony\Component\HttpFoundation\RequestStack;
use Symfony\Component\HttpKernel\Exception\NotFoundHttpException; use Symfony\Component\HttpKernel\Exception\NotFoundHttpException;
use Symfony\Component\Routing\RouterInterface; use Symfony\Component\Routing\RouterInterface;
@ -136,7 +135,7 @@ class AjaxBlocksController extends ControllerBase {
} }
$new_request = Request::create($path); $new_request = Request::create($path);
$request_stack = new RequestStack(); $request_stack = \Drupal::requestStack();
$processed = $this->pathProcessor->processInbound($new_request->getPathInfo(), $new_request); $processed = $this->pathProcessor->processInbound($new_request->getPathInfo(), $new_request);
$this->currentPath->setPath($processed); $this->currentPath->setPath($processed);

View file

@ -71,7 +71,7 @@ class AdvancedSearchForm extends FormBase {
*/ */
public static function create(ContainerInterface $container) { public static function create(ContainerInterface $container) {
return new static( return new static(
$container->get('request_stack')->getMasterRequest(), $container->get('request_stack')->getMainRequest(),
$container->get('current_route_match') $container->get('current_route_match')
); );
} }

View file

@ -108,7 +108,7 @@ class AdvancedSearchBlock extends BlockBase implements ContainerFactoryPluginInt
$plugin_definition, $plugin_definition,
$container->get('plugin.manager.search_api.display'), $container->get('plugin.manager.search_api.display'),
$container->get('form_builder'), $container->get('form_builder'),
$container->get('request_stack')->getMasterRequest() $container->get('request_stack')->getMainRequest()
); );
} }

View file

@ -58,7 +58,7 @@ class SearchResultsPagerBlock extends BlockBase implements ContainerFactoryPlugi
$configuration, $configuration,
$plugin_id, $plugin_id,
$plugin_definition, $plugin_definition,
$container->get('request_stack')->getMasterRequest() $container->get('request_stack')->getMainRequest()
); );
} }