Inject dependencies into EntityDeriver derivative class

+++ b/core/lib/Drupal/Core/Entity/Plugin/DataType/Deriver/EntityDeriver.phpundefined
@@ -22,6 +24,36 @@ class EntityDeriver implements DerivativeInterface {
+   * The plugin entity manager.

Oh another variant.

Thank you

+++ b/core/lib/Drupal/Core/Entity/Plugin/DataType/Deriver/EntityDeriver.phpundefined
@@ -22,6 +24,36 @@ class EntityDeriver implements DerivativeInterface {
+    $this->basePluginId = $base_plugin_id;

Missing @var documentation and protected scope.

Finally.

+++ b/core/lib/Drupal/Core/Entity/Plugin/DataType/Deriver/EntityDeriver.phpundefined
@@ -22,6 +24,43 @@ class EntityDeriver implements DerivativeInterface {
+   * Constructs a ViewsBlock object.

Damn... sorry but I don't think we constructing a ViewsBlock object here...

Damian: I am sorry.

+++ b/core/lib/Drupal/Core/Entity/Plugin/DataType/Deriver/EntityDeriver.phpundefined
@@ -22,6 +24,43 @@ class EntityDeriver implements DerivativeInterface {
+
+  /**
+   * Constructs an EntityDeriver object.
+   *
+   * @param string $base_plugin_id
+   *   The base plugin ID.
+   * @param \Drupal\Core\Entity\EntityManager $entity_manager
+   *   The entity manager.
+   */
+  public function __construct($base_plugin_id, EntityManager $entity_manager) {
+    $this->basePluginId = $base_plugin_id;
+    $this->entityManager = $entity_manager;
+  }

I kind of prefer to have the constructor first

There we go.

Committed c7a9553 and pushed to 8.x. Thanks!