Issue #2385429 by tim.plunkett: setExecutableManager() is implemented on the wrong class

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;
+  }
+
 }

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.
    *