From abb22d7d9a1bebd74b46c8bf806e93f5974cffb9 Mon Sep 17 00:00:00 2001
From: Alex Pott <alex.a.pott@googlemail.com>
Date: Tue, 9 Jun 2015 13:43:42 +0100
Subject: [PATCH] Issue #2385429 by tim.plunkett: setExecutableManager() is
implemented on the wrong class
---
.../Core/Condition/ConditionPluginBase.php | 16 ++++++++++++++++
.../Core/Executable/ExecutablePluginBase.php | 15 ---------------
2 files changed, 16 insertions(+), 15 deletions(-)
diff --git a/core/lib/Drupal/Core/Condition/ConditionPluginBase.php b/core/lib/Drupal/Core/Condition/ConditionPluginBase.php
index 4b4a07b6b624..5237d0d29ac7 100644
--- a/core/lib/Drupal/Core/Condition/ConditionPluginBase.php
+++ b/core/lib/Drupal/Core/Condition/ConditionPluginBase.php
@@ -7,6 +7,7 @@
namespace Drupal\Core\Condition;
+use Drupal\Core\Executable\ExecutableManagerInterface;
use Drupal\Core\Executable\ExecutablePluginBase;
use Drupal\Core\Form\FormStateInterface;
use Drupal\Core\Plugin\ContextAwarePluginAssignmentTrait;
@@ -24,6 +25,13 @@ abstract class ConditionPluginBase extends ExecutablePluginBase implements Condi
use ContextAwarePluginAssignmentTrait;
+ /**
+ * The condition manager to proxy execute calls through.
+ *
+ * @var \Drupal\Core\Executable\ExecutableInterface
+ */
+ protected $executableManager;
+
/**
* {@inheritdoc}
*/
@@ -107,4 +115,12 @@ public function calculateDependencies() {
return array();
}
+ /**
+ * {@inheritdoc}
+ */
+ public function setExecutableManager(ExecutableManagerInterface $executableManager) {
+ $this->executableManager = $executableManager;
+ return $this;
+ }
+
}
diff --git a/core/lib/Drupal/Core/Executable/ExecutablePluginBase.php b/core/lib/Drupal/Core/Executable/ExecutablePluginBase.php
index 38767e10dbd4..c438e1d6e4af 100644
--- a/core/lib/Drupal/Core/Executable/ExecutablePluginBase.php
+++ b/core/lib/Drupal/Core/Executable/ExecutablePluginBase.php
@@ -16,21 +16,6 @@
*/
abstract class ExecutablePluginBase extends ContextAwarePluginBase implements ExecutableInterface {
- /**
- * The condition manager to proxy execute calls through.
- *
- * @var \Drupal\Component\Plugin\PluginManagerInterface
- */
- protected $executableManager;
-
- /**
- * {@inheritdoc}
- */
- public function setExecutableManager(ExecutableManagerInterface $executableManager) {
- $this->executableManager = $executableManager;
- return $this;
- }
-
/**
* Gets an array of definitions of available configuration options.
*
--
GitLab