From 6ea2bb26a61926a790295fe1b01048515ebfd926 Mon Sep 17 00:00:00 2001 From: GoZ Date: Tue, 14 Feb 2017 09:20:17 +0100 Subject: [PATCH] Issue #2852403 by GoZ: Respect Coding standard in setConfiguration() with NestedArray::mergeDeep() in inline --- core/lib/Drupal/Core/Block/BlockBase.php | 6 +----- core/modules/workflows/src/Plugin/WorkflowTypeBase.php | 5 +---- 2 files changed, 2 insertions(+), 9 deletions(-) diff --git a/core/lib/Drupal/Core/Block/BlockBase.php b/core/lib/Drupal/Core/Block/BlockBase.php index 4d47afa..8e65a9b 100644 --- a/core/lib/Drupal/Core/Block/BlockBase.php +++ b/core/lib/Drupal/Core/Block/BlockBase.php @@ -68,11 +68,7 @@ public function getConfiguration() { * {@inheritdoc} */ public function setConfiguration(array $configuration) { - $this->configuration = NestedArray::mergeDeep( - $this->baseConfigurationDefaults(), - $this->defaultConfiguration(), - $configuration - ); + $this->configuration = NestedArray::mergeDeep($this->baseConfigurationDefaults(), $this->defaultConfiguration(), $configuration); } /** diff --git a/core/modules/workflows/src/Plugin/WorkflowTypeBase.php b/core/modules/workflows/src/Plugin/WorkflowTypeBase.php index 1ed9fca..6e7f6d8 100644 --- a/core/modules/workflows/src/Plugin/WorkflowTypeBase.php +++ b/core/modules/workflows/src/Plugin/WorkflowTypeBase.php @@ -101,10 +101,7 @@ public function getConfiguration() { * {@inheritDoc} */ public function setConfiguration(array $configuration) { - $this->configuration = NestedArray::mergeDeep( - $this->defaultConfiguration(), - $configuration - ); + $this->configuration = NestedArray::mergeDeep($this->defaultConfiguration(), $configuration); } /** -- 2.8.1