Drupal
/
drupal
mirror of https://git.drupalcode.org/project/drupal.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

Issue #3069048 by bomoko, mikelutz, Berdir: Undeprecate SelectionPluginBase::ensureBackwardCompatibilityConfiguration() and ::resolveBackwardCompatibilityConfiguration() and mark @internal

merge-requests/55/head
Lee Rowlands 2019-08-13 06:46:38 +10:00
parent 6280478a1a
commit 530230fea3
No known key found for this signature in database
GPG Key ID: 2B829A3DF9204DC4
2 changed files with 10 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
core/lib/Drupal/Core/Entity/EntityReferenceSelection/SelectionPluginBase.php
View File

@ -120,8 +120,11 @@ abstract class SelectionPluginBase extends PluginBase implements SelectionInterf
* @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 @@ abstract class SelectionPluginBase extends PluginBase implements SelectionInterf
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 @@ abstract class SelectionPluginBase extends PluginBase implements SelectionInterf
/**
* 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() {

2
core/tests/Drupal/Tests/Core/EntityReferenceSelection/EntityReferenceSelectionUnitTest.php
View File

@ -189,7 +189,7 @@ class EntityReferenceSelectionUnitTest extends UnitTestCase {
*
* @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.