diff --git a/core/lib/Drupal/Core/Entity/EntityReferenceSelection/SelectionPluginBase.php b/core/lib/Drupal/Core/Entity/EntityReferenceSelection/SelectionPluginBase.php index 99be1f022c..b81b6678e6 100644 --- a/core/lib/Drupal/Core/Entity/EntityReferenceSelection/SelectionPluginBase.php +++ b/core/lib/Drupal/Core/Entity/EntityReferenceSelection/SelectionPluginBase.php @@ -130,7 +130,7 @@ protected function resolveBackwardCompatibilityConfiguration(array &$configurati if (!is_array($configuration['handler_settings'])) { throw new \InvalidArgumentException("The setting 'handler_settings' is reserved and cannot be used."); } - @trigger_error("Providing settings under 'handler_settings' is deprecated since version 8.3.x and will be removed before 9.0.0. Move the settings in the root of the configuration array.", E_USER_DEPRECATED); + @trigger_error("Providing settings under 'handler_settings' is deprecated and will be removed before 9.0.0. Move the settings in the root of the configuration array.", E_USER_DEPRECATED); // Settings passed in the root level take precedence over BC settings. $configuration += $configuration['handler_settings']; diff --git a/core/tests/Drupal/Tests/Core/EntityReferenceSelection/EntityReferenceSelectionUnitTest.php b/core/tests/Drupal/Tests/Core/EntityReferenceSelection/EntityReferenceSelectionUnitTest.php index 65556c3996..deb7370d44 100644 --- a/core/tests/Drupal/Tests/Core/EntityReferenceSelection/EntityReferenceSelectionUnitTest.php +++ b/core/tests/Drupal/Tests/Core/EntityReferenceSelection/EntityReferenceSelectionUnitTest.php @@ -211,13 +211,13 @@ public function testDeprecationErrorTriggering() { $config = ['setting1' => TRUE]; new TestSelection($config, 'test_selector', []); // Check that deprecation error has not been triggered. - $this->assertNoError("Providing settings under 'handler_settings' is deprecated since version 8.3.x and will be removed before 9.0.0. Move the settings in the root of the configuration array.", E_USER_DEPRECATED); + $this->assertNoError("Providing settings under 'handler_settings' is deprecated and will be removed before 9.0.0. Move the settings in the root of the configuration array.", E_USER_DEPRECATED); // Configuration with BC level. $config = ['handler_settings' => ['setting1' => TRUE]]; new TestSelection($config, 'test_selector', []); // Check that deprecation error has been triggered. - $this->assertError("Providing settings under 'handler_settings' is deprecated since version 8.3.x and will be removed before 9.0.0. Move the settings in the root of the configuration array.", E_USER_DEPRECATED); + $this->assertError("Providing settings under 'handler_settings' is deprecated and will be removed before 9.0.0. Move the settings in the root of the configuration array.", E_USER_DEPRECATED); } /**