Commit 7f93a368 authored by catch's avatar catch
Browse files

Issue #3209723 by murilohp, daffie, longwave, andypost: [Symfony 6]...

Issue #3209723 by murilohp, daffie, longwave, andypost: [Symfony 6] Symfony\Component\HttpKernel\HttpKernelInterface::MASTER_REQUEST is deprecated, use ::MAIN_REQUEST instead
parent 6be0f7b4
Loading
Loading
Loading
Loading
+2 −2
Changes for core/lib/Drupal/Core/DrupalKernel.php: 2 added lines, 2 removed lines.
Original line number Diff line number Diff line
@@ -686,7 +686,7 @@ public function terminate(Request $request, Response $response) {
  /**
   * {@inheritdoc}
   */
  public function handle(Request $request, $type = self::MASTER_REQUEST, $catch = TRUE): Response {
  public function handle(Request $request, $type = self::MAIN_REQUEST, $catch = TRUE): Response {
    // Ensure sane PHP environment variables.
    static::bootEnvironment();

@@ -726,7 +726,7 @@ public function handle(Request $request, $type = self::MASTER_REQUEST, $catch =
   * @param \Symfony\Component\HttpFoundation\Request $request
   *   A Request instance
   * @param int $type
   *   The type of the request (one of HttpKernelInterface::MASTER_REQUEST or
   *   The type of the request (one of HttpKernelInterface::MAIN_REQUEST or
   *   HttpKernelInterface::SUB_REQUEST)
   *
   * @return \Symfony\Component\HttpFoundation\Response
+1 −1
Changes for core/lib/Drupal/Core/StackMiddleware/KernelPreHandle.php: 1 added line, 1 removed line.
Original line number Diff line number Diff line
@@ -42,7 +42,7 @@ public function __construct(HttpKernelInterface $http_kernel, DrupalKernelInterf
  /**
   * {@inheritdoc}
   */
  public function handle(Request $request, $type = self::MASTER_REQUEST, $catch = TRUE): Response {
  public function handle(Request $request, $type = self::MAIN_REQUEST, $catch = TRUE): Response {
    $this->drupalKernel->preHandle($request);

    return $this->httpKernel->handle($request, $type, $catch);
+1 −1
Changes for core/lib/Drupal/Core/StackMiddleware/NegotiationMiddleware.php: 1 added line, 1 removed line.
Original line number Diff line number Diff line
@@ -38,7 +38,7 @@ public function __construct(HttpKernelInterface $app) {
  /**
   * {@inheritdoc}
   */
  public function handle(Request $request, $type = self::MASTER_REQUEST, $catch = TRUE): Response {
  public function handle(Request $request, $type = self::MAIN_REQUEST, $catch = TRUE): Response {
    // Register available mime types.
    foreach ($this->formats as $format => $mime_type) {
      $request->setFormat($format, $mime_type);
+1 −1
Changes for core/lib/Drupal/Core/StackMiddleware/ReverseProxyMiddleware.php: 1 added line, 1 removed line.
Original line number Diff line number Diff line
@@ -42,7 +42,7 @@ public function __construct(HttpKernelInterface $http_kernel, Settings $settings
  /**
   * {@inheritdoc}
   */
  public function handle(Request $request, $type = self::MASTER_REQUEST, $catch = TRUE): Response {
  public function handle(Request $request, $type = self::MAIN_REQUEST, $catch = TRUE): Response {
    // Initialize proxy settings.
    static::setSettingsOnRequest($request, $this->settings);
    return $this->httpKernel->handle($request, $type, $catch);
+3 −3
Changes for core/lib/Drupal/Core/StackMiddleware/Session.php: 3 added lines, 3 removed lines.
Original line number Diff line number Diff line
@@ -48,8 +48,8 @@ public function __construct(HttpKernelInterface $http_kernel, $service_name = 's
  /**
   * {@inheritdoc}
   */
  public function handle(Request $request, $type = self::MASTER_REQUEST, $catch = TRUE): Response {
    if ($type === self::MASTER_REQUEST && PHP_SAPI !== 'cli') {
  public function handle(Request $request, $type = self::MAIN_REQUEST, $catch = TRUE): Response {
    if ($type === self::MAIN_REQUEST && PHP_SAPI !== 'cli') {
      $session = $this->container->get($this->sessionServiceName);
      $session->start();
      $request->setSession($session);
@@ -57,7 +57,7 @@ public function handle(Request $request, $type = self::MASTER_REQUEST, $catch =

    $result = $this->httpKernel->handle($request, $type, $catch);

    if ($type === self::MASTER_REQUEST && $request->hasSession()) {
    if ($type === self::MAIN_REQUEST && $request->hasSession()) {
      $request->getSession()->save();
    }

Loading