Merge pull request #51 from drupol/Issue-2504031-Fix-__construct-of-plugins-to-be-compatible-with-Drupal-8

Issue #2504031: Fix __construct of plugins to be compatible with Drupal 8 and take the necessary configuration

Author: drupol

src/DependencyInjection/Container.php

@@ -225,6 +225,20 @@ public function has($id) {
     return isset($this->services[$id]) || isset($this->serviceDefinitions[$id]);
   }
 
+  /**
+   * {@inheritdoc}
+   */
+  public function createInstance($plugin_id, $service_definition) {
+    $temporary_name = 'plugin_' . $plugin_id;
+    $this->serviceDefinitions[$temporary_name] = $service_definition;
+
+    $plugin = $this->get($temporary_name);
+    unset($this->serviceDefinitions[$temporary_name]);
+    unset($this->services[$temporary_name]);
+
+    return $plugin;
+  }
+
   /**
    * {@inheritdoc}
    */

src/Plugin/ContainerAwarePluginManager.php

@@ -59,10 +59,15 @@ public function hasDefinition($plugin_id) {
    * {@inheritdoc}
    */
   public function createInstance($plugin_id, array $configuration = array()) {
-    // @todo: Use ->expandArguments() when get() disallows getting private
-    //        services.
-    $plugin = clone $this->container->get($this->servicePrefix . $plugin_id);
-    return $plugin;
+    $plugin_definition = $this->getDefinition($plugin_id);
+    $plugin_definition += array(
+      'arguments' => array(),
+    );
+
+    array_unshift($plugin_definition['arguments'], $plugin_id);
+    array_unshift($plugin_definition['arguments'], $configuration);
+
+    return $this->container->createInstance($this->servicePrefix . $plugin_id, $plugin_definition);
   }
 
   /**