diff --git a/core/includes/bootstrap.inc b/core/includes/bootstrap.inc index 03af0c0a866525a6bc1a89db204a0645cefc14f4..ca90549d4058971c0d220c5f55b6b71405107a64 100644 --- a/core/includes/bootstrap.inc +++ b/core/includes/bootstrap.inc @@ -60,6 +60,11 @@ */ define('DRUPAL_ROOT', dirname(__DIR__, 2)); +/** + * Keep backward compatibility for sites with references to TranslationWrapper. + */ +class_alias(TranslatableMarkup::class, '\Drupal\Core\StringTranslation\TranslationWrapper', TRUE); + /** * Translates a string to the current language or to a given language. * diff --git a/core/lib/Drupal/Core/StringTranslation/TranslationWrapper.php b/core/lib/Drupal/Core/StringTranslation/TranslationWrapper.php deleted file mode 100644 index 72360cedd7f53837a1785267b2f3f82bba469ea6..0000000000000000000000000000000000000000 --- a/core/lib/Drupal/Core/StringTranslation/TranslationWrapper.php +++ /dev/null @@ -1,23 +0,0 @@ -<?php - -namespace Drupal\Core\StringTranslation; - -/** - * Provides translatable string class. - * - * @deprecated in drupal:8.0.0 and is removed from drupal:10.0.0. - * Use the \Drupal\Core\StringTranslation\TranslatableMarkup class instead. - * - * @see https://www.drupal.org/node/2571255 - */ -class TranslationWrapper extends TranslatableMarkup { - - /** - * {@inheritdoc} - */ - public function __construct($string, array $arguments = [], array $options = [], TranslationInterface $string_translation = NULL) { - @trigger_error(__CLASS__ . ' is deprecated in drupal:8.0.0 and is removed from drupal:10.0.0. Use the \Drupal\Core\StringTranslation\TranslatableMarkup class instead. See https://www.drupal.org/node/2571255', E_USER_DEPRECATED); - parent::__construct($string, $arguments, $options, $string_translation); - } - -} diff --git a/core/tests/Drupal/Tests/Core/StringTranslation/TranslationWrapperTest.php b/core/tests/Drupal/Tests/Core/StringTranslation/TranslationWrapperTest.php index 432778a3b5664545f4a1c76138b8c4f8bdc7da60..544d7afbc9158d1f1cde958cb5bfef2f5ce3ecf7 100644 --- a/core/tests/Drupal/Tests/Core/StringTranslation/TranslationWrapperTest.php +++ b/core/tests/Drupal/Tests/Core/StringTranslation/TranslationWrapperTest.php @@ -7,7 +7,7 @@ use Drupal\Tests\UnitTestCase; /** - * Tests the TranslationWrapper class. + * Tests the TranslationWrapper backward compatibility layer. * * @coversDefaultClass \Drupal\Core\StringTranslation\TranslationWrapper * @group StringTranslation @@ -16,11 +16,9 @@ class TranslationWrapperTest extends UnitTestCase { /** * @covers ::__construct - * @group legacy */ public function testTranslationWrapper() { - $this->expectDeprecation('Drupal\Core\StringTranslation\TranslationWrapper is deprecated in drupal:8.0.0 and is removed from drupal:10.0.0. Use the \Drupal\Core\StringTranslation\TranslatableMarkup class instead. See https://www.drupal.org/node/2571255'); - $object = new TranslationWrapper('Deprecated'); + $object = new TranslationWrapper('Backward compatibility'); $this->assertInstanceOf(TranslatableMarkup::class, $object); }