diff --git a/core/lib/Drupal/Core/Http/RequestStack.php b/core/lib/Drupal/Core/Http/RequestStack.php index 23ad26d10b..ab7d1d21f1 100644 --- a/core/lib/Drupal/Core/Http/RequestStack.php +++ b/core/lib/Drupal/Core/Http/RequestStack.php @@ -2,7 +2,7 @@ namespace Drupal\Core\Http; -@trigger_error('The ' . __NAMESPACE__ . '\RequestStack is deprecated in drupal:9.4.0 and is removed from drupal:10.0.0. There is no replacement. See https://www.drupal.org/node/3265357', E_USER_DEPRECATED); +@trigger_error('The ' . __NAMESPACE__ . '\RequestStack is deprecated in drupal:10.0.0 and is removed from drupal:11.0.0. There is no replacement. See https://www.drupal.org/node/3265357', E_USER_DEPRECATED); use Symfony\Component\HttpFoundation\Request; use Symfony\Component\HttpFoundation\RequestStack as SymfonyRequestStack; @@ -10,13 +10,12 @@ /** * Forward-compatibility shim for Symfony's RequestStack. * - * @deprecated in drupal:9.4.0 and is removed from drupal:10.0.0. - * There is no replacement. + * @deprecated in drupal:10.0.0 and is removed from drupal:11.0.0. There is no + * replacement. * * @see https://www.drupal.org/node/3265357 * - * @todo Remove this in Drupal 10. - * @see https://www.drupal.org/project/drupal/issues/3265121 + * @todo Remove this in Drupal 10 https://www.drupal.org/node/3265121 */ class RequestStack extends SymfonyRequestStack { @@ -27,22 +26,8 @@ class RequestStack extends SymfonyRequestStack { * The main request. */ public function getMainRequest(): ?Request { - @trigger_error('The ' . __NAMESPACE__ . '\RequestStack is deprecated in drupal:9.4.0 and is removed from drupal:10.0.0. There is no replacement. See https://www.drupal.org/node/3265357', E_USER_DEPRECATED); - - if (method_exists(SymfonyRequestStack::class, 'getMainRequest')) { - return parent::getMainRequest(); - } - else { - return parent::getMasterRequest(); - } - } - - /** - * {@inheritdoc} - */ - public function getMasterRequest(): ?Request { - @trigger_error('Drupal\Core\Http\RequestStack::getMasterRequest() is deprecated, use getMainRequest() instead.', E_USER_DEPRECATED); - return $this->getMainRequest(); + @trigger_error('The ' . __NAMESPACE__ . '\RequestStack is deprecated in drupal:10.0.0 and is removed from drupal:11.0.0. There is no replacement. See https://www.drupal.org/node/3265357', E_USER_DEPRECATED); + return parent::getMainRequest(); } } diff --git a/core/tests/Drupal/Tests/Core/Http/RequestStackLegacyTest.php b/core/tests/Drupal/Tests/Core/Http/RequestStackLegacyTest.php index 2fd702492b..1114e06a58 100644 --- a/core/tests/Drupal/Tests/Core/Http/RequestStackLegacyTest.php +++ b/core/tests/Drupal/Tests/Core/Http/RequestStackLegacyTest.php @@ -9,8 +9,7 @@ * @coversDefaultClass \Drupal\Core\Http\RequestStack * @group legacy * - * @todo Remove this in Drupal 10. - * @see https://www.drupal.org/project/drupal/issues/3265121 + * @todo Remove this in Drupal 10 https://www.drupal.org/node/3265121 */ class RequestStackLegacyTest extends UnitTestCase { @@ -22,20 +21,8 @@ class RequestStackLegacyTest extends UnitTestCase { public function testGetMainRequestDeprecation() { $stack = new RequestStack(); - $this->expectDeprecation('The Drupal\Core\Http\RequestStack is deprecated in drupal:9.4.0 and is removed from drupal:10.0.0. There is no replacement. See https://www.drupal.org/node/3265357'); + $this->expectDeprecation('The Drupal\Core\Http\RequestStack is deprecated in drupal:10.0.0 and is removed from drupal:11.0.0. There is no replacement. See https://www.drupal.org/node/3265357'); $this->assertNull($stack->getMainRequest()); } - /** - * Tests deprecation message in our subclassed RequestStack. - * - * @covers ::getMasterRequest - */ - public function testGetMasterRequestDeprecation() { - $stack = new RequestStack(); - - $this->expectDeprecation('Drupal\Core\Http\RequestStack::getMasterRequest() is deprecated, use getMainRequest() instead.'); - $this->assertNull($stack->getMasterRequest()); - } - }