From 530230fea324cff74c4aae10ae5894d950adff9d Mon Sep 17 00:00:00 2001
From: Lee Rowlands <lee.rowlands@previousnext.com.au>
Date: Tue, 13 Aug 2019 06:46:38 +1000
Subject: [PATCH] Issue #3069048 by bomoko, mikelutz, Berdir: Undeprecate
SelectionPluginBase::ensureBackwardCompatibilityConfiguration() and
::resolveBackwardCompatibilityConfiguration() and mark @internal
---
.../EntityReferenceSelection/SelectionPluginBase.php | 12 +++++++++---
.../EntityReferenceSelectionUnitTest.php | 2 +-
2 files changed, 10 insertions(+), 4 deletions(-)
diff --git a/core/lib/Drupal/Core/Entity/EntityReferenceSelection/SelectionPluginBase.php b/core/lib/Drupal/Core/Entity/EntityReferenceSelection/SelectionPluginBase.php
index 598bbcecfa5d..35818717cc60 100644
--- a/core/lib/Drupal/Core/Entity/EntityReferenceSelection/SelectionPluginBase.php
+++ b/core/lib/Drupal/Core/Entity/EntityReferenceSelection/SelectionPluginBase.php
@@ -120,8 +120,11 @@ public function entityQueryAlter(SelectInterface $query) {}
* @param array $configuration
* The configuration array to be altered.
*
- * @deprecated Scheduled for removal in Drupal 9.0.x.
+ * @internal
*
+ * @todo Remove this method call and its method in Drupal 9.
+ *
+ * @see https://www.drupal.org/project/drupal/issues/3069757
* @see https://www.drupal.org/node/2870971
*/
protected function resolveBackwardCompatibilityConfiguration(array &$configuration) {
@@ -134,7 +137,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 and will be removed before 9.0.0. Move the settings in the root of the configuration array. See https://www.drupal.org/node/2870971.", E_USER_DEPRECATED);
+ @trigger_error("Providing settings under 'handler_settings' is deprecated in drupal:8.4.0 support for 'handler_settings' is removed from drupal:9.0.0. Move the settings in the root of the configuration array. See https://www.drupal.org/node/2870971", E_USER_DEPRECATED);
// Settings passed in the root level take precedence over BC settings.
$configuration += $configuration['handler_settings'];
@@ -145,8 +148,11 @@ protected function resolveBackwardCompatibilityConfiguration(array &$configurati
/**
* Ensures a backward compatibility level configuration.
*
- * @deprecated Scheduled for removal in Drupal 9.0.x.
+ * @internal
+ *
+ * @todo Remove this method call and its method in Drupal 9.
*
+ * @see https://www.drupal.org/project/drupal/issues/3069757
* @see https://www.drupal.org/node/2870971
*/
protected function ensureBackwardCompatibilityConfiguration() {
diff --git a/core/tests/Drupal/Tests/Core/EntityReferenceSelection/EntityReferenceSelectionUnitTest.php b/core/tests/Drupal/Tests/Core/EntityReferenceSelection/EntityReferenceSelectionUnitTest.php
index 92eeb87a0d5e..c742f129ef00 100644
--- a/core/tests/Drupal/Tests/Core/EntityReferenceSelection/EntityReferenceSelectionUnitTest.php
+++ b/core/tests/Drupal/Tests/Core/EntityReferenceSelection/EntityReferenceSelectionUnitTest.php
@@ -189,7 +189,7 @@ public function testSetConfigurationBcLevel() {
*
* @covers ::setConfiguration
* @covers ::resolveBackwardCompatibilityConfiguration
- * @expectedDeprecation 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. See https://www.drupal.org/node/2870971.
+ * @expectedDeprecation Providing settings under 'handler_settings' is deprecated in drupal:8.4.0 support for 'handler_settings' is removed from drupal:9.0.0. Move the settings in the root of the configuration array. See https://www.drupal.org/node/2870971
*/
public function testDeprecationErrorTriggering() {
// Configuration with BC level.
--
GitLab