diff --git a/core/lib/Drupal/Core/Security/RequestSanitizer.php b/core/lib/Drupal/Core/Security/RequestSanitizer.php index 3f914d92586dac6c4e56c56360299706a38f0014..2b665eb39193234a6530c162abb3ff8db250293e 100644 --- a/core/lib/Drupal/Core/Security/RequestSanitizer.php +++ b/core/lib/Drupal/Core/Security/RequestSanitizer.php @@ -21,15 +21,6 @@ class RequestSanitizer { */ const SANITIZE_INPUT_SAFE_KEYS = 'sanitize_input_safe_keys'; - /** - * Previous name of SANITIZE_INPUT_SAFE_KEYS. - * - * @deprecated in drupal:9.1.0 and is removed from drupal:10.0.0. Use - * SANITIZE_INPUT_SAFE_KEYS instead. - * @see https://www.drupal.org/node/3163148 - */ - const SANITIZE_WHITELIST = 'sanitize_input_whitelist'; - /** * The name of the setting that determines if sanitized keys are logged. */ diff --git a/core/lib/Drupal/Core/Site/Settings.php b/core/lib/Drupal/Core/Site/Settings.php index 3998719e8bc917ca29d1357c53289461bba5cd3f..cc21589ed8674508f0bf8c19fa7cf86a4df42116 100644 --- a/core/lib/Drupal/Core/Site/Settings.php +++ b/core/lib/Drupal/Core/Site/Settings.php @@ -37,24 +37,7 @@ final class Settings { * * @see self::handleDeprecations() */ - private static $deprecatedSettings = [ - 'sanitize_input_whitelist' => [ - 'replacement' => 'sanitize_input_safe_keys', - 'message' => 'The "sanitize_input_whitelist" setting is deprecated in drupal:9.1.0 and will be removed in drupal:10.0.0. Use Drupal\Core\Security\RequestSanitizer::SANITIZE_INPUT_SAFE_KEYS instead. See https://www.drupal.org/node/3163148.', - ], - 'twig_sandbox_whitelisted_classes' => [ - 'replacement' => 'twig_sandbox_allowed_classes', - 'message' => 'The "twig_sandbox_whitelisted_classes" setting is deprecated in drupal:9.1.0 and is removed from drupal:10.0.0. Use "twig_sandbox_allowed_classes" instead. See https://www.drupal.org/node/3162897.', - ], - 'twig_sandbox_whitelisted_methods' => [ - 'replacement' => 'twig_sandbox_allowed_methods', - 'message' => 'The "twig_sandbox_whitelisted_methods" setting is deprecated in drupal:9.1.0 and is removed from drupal:10.0.0. Use "twig_sandbox_allowed_methods" instead. See https://www.drupal.org/node/3162897.', - ], - 'twig_sandbox_whitelisted_prefixes' => [ - 'replacement' => 'twig_sandbox_allowed_prefixes', - 'message' => 'The "twig_sandbox_whitelisted_prefixes" setting is deprecated in drupal:9.1.0 and is removed from drupal:10.0.0. Use "twig_sandbox_allowed_prefixes" instead. See https://www.drupal.org/node/3162897.', - ], - ]; + private static $deprecatedSettings = []; /** * Constructor. diff --git a/core/tests/Drupal/Tests/Core/Site/SettingsTest.php b/core/tests/Drupal/Tests/Core/Site/SettingsTest.php index c192a0199e60d5f0569b1d445f566ff938b5871b..89f9f9c8ae99856dd0fa1c83d50d3e4cfa4c75ab 100644 --- a/core/tests/Drupal/Tests/Core/Site/SettingsTest.php +++ b/core/tests/Drupal/Tests/Core/Site/SettingsTest.php @@ -303,24 +303,7 @@ public function testRealDeprecatedSettings(string $legacy_setting, string $expec * Provides data for testRealDeprecatedSettings(). */ public function providerTestRealDeprecatedSettings(): array { - return [ - [ - 'sanitize_input_whitelist', - 'The "sanitize_input_whitelist" setting is deprecated in drupal:9.1.0 and will be removed in drupal:10.0.0. Use Drupal\Core\Security\RequestSanitizer::SANITIZE_INPUT_SAFE_KEYS instead. See https://www.drupal.org/node/3163148.', - ], - [ - 'twig_sandbox_whitelisted_classes', - 'The "twig_sandbox_whitelisted_classes" setting is deprecated in drupal:9.1.0 and is removed from drupal:10.0.0. Use "twig_sandbox_allowed_classes" instead. See https://www.drupal.org/node/3162897.', - ], - [ - 'twig_sandbox_whitelisted_methods', - 'The "twig_sandbox_whitelisted_methods" setting is deprecated in drupal:9.1.0 and is removed from drupal:10.0.0. Use "twig_sandbox_allowed_methods" instead. See https://www.drupal.org/node/3162897.', - ], - [ - 'twig_sandbox_whitelisted_prefixes', - 'The "twig_sandbox_whitelisted_prefixes" setting is deprecated in drupal:9.1.0 and is removed from drupal:10.0.0. Use "twig_sandbox_allowed_prefixes" instead. See https://www.drupal.org/node/3162897.', - ], - ]; + return []; } }