Commit 3150da79 authored by Alex Pott's avatar Alex Pott Committed by Sascha Grossenbacher
Browse files

Issue #3253718 by alexpott: Fix PHP 8.1 test fails

parent 065e74c5

src/Form/RedirectForm.php

+2 −2
Original line number Diff line number Diff line
@@ -39,12 +39,12 @@ class RedirectForm extends ContentEntityForm { 
        }

      }



      $source_url = urldecode($this->getRequest()->get('source'));

      $source_url = urldecode($this->getRequest()->get('source') ?? '');

      if (!empty($source_url)) {

        $redirect->setSource($source_url, $source_query);

      }



      $redirect_url = urldecode($this->getRequest()->get('redirect'));

      $redirect_url = urldecode($this->getRequest()->get('redirect') ?? '');

      if (!empty($redirect_url)) {

        try {

          $redirect->setRedirect($redirect_url, $redirect_query, $redirect_options);

tests/src/Functional/GlobalRedirectTest.php

+2 −8
Original line number Diff line number Diff line
@@ -2,7 +2,6 @@ 


namespace Drupal\Tests\redirect\Functional;



use Behat\Mink\Driver\GoutteDriver;

use Drupal\Core\Cache\Cache;

use Drupal\Core\Language\Language;

use Drupal\language\Entity\ConfigurableLanguage;
@@ -71,18 +70,13 @@ class GlobalRedirectTest extends BrowserTestBase { 
   */

  protected $defaultTheme = 'stark';



  /**

   * {@inheritdoc}

   */

  protected $minkDefaultDriverClass = GoutteDriver::class;



  /**

   * {@inheritdoc}

   */

  protected function initMink() {

    $session = parent::initMink();



    /** @var \Behat\Mink\Driver\GoutteDriver $driver */

    /** @var \Behat\Mink\Driver\BrowserKitDriver $driver */

    $driver = $session->getDriver();

    // Since we are testing low-level redirect stuff, the HTTP client should

    // NOT automatically follow redirects sent by the server.
@@ -193,7 +187,7 @@ class GlobalRedirectTest extends BrowserTestBase { 
    // Test a POST request. It should stay on the same path and not try to

    // redirect. Because Mink does not provide methods to do plain POSTs, we

    // need to use the underlying Guzzle HTTP client directly.

    /** @var \Behat\Mink\Driver\GoutteDriver $driver */

    /** @var \Behat\Mink\Driver\BrowserKitDriver $driver */

    $driver = $this->getSession()->getDriver();

    $response = $driver->getClient()

      ->getClient()