Inject dependencies into EntityDerivative derivative class

+++ b/core/modules/rest/lib/Drupal/rest/Plugin/Derivative/EntityDerivative.php
@@ -22,6 +24,36 @@ class EntityDerivative implements DerivativeInterface {
+   *   The base plugin ID.
+   * @param \Drupal\Core\Entity\EntityStorageControllerInterface $view_storage_controller
+   *   The entity storage controller to load views.

To load views? ;-)

Otherwise looks good to me. Note that this will collide with #2011122: Replace drupal_container() with injected services in the rest module, so whatever gets commited first somebody will need to re-roll.

Cool, assuming the testbot is happy, too.

+++ b/core/modules/rest/lib/Drupal/rest/Plugin/Derivative/EntityDerivative.phpundefined
@@ -7,12 +7,14 @@
@@ -22,6 +24,36 @@ class EntityDerivative implements DerivativeInterface {

@@ -22,6 +24,36 @@ class EntityDerivative implements DerivativeInterface {
+    $this->basePluginId = $base_plugin_id;

Missing @var docblock and protection afaics.

I think we should ignore $base_plugin_id as we don't use it all in this class and it just bloats the code.

Hard-coding the EntityManager class all over the place worries me, we should use an EntityManagerInterface for that. Otherwise the plugin.manager.entity service cannot really be swapped by contributed modules, which is bad. But that is a different issue (which might not even exist yet?), the other changes look good.

Back to RTBC

Needs a reroll

git ac https://drupal.org/files/2047593-11.patch
  % Total    % Received % Xferd  Average Speed   Time    Time     Time  Current
                                 Dload  Upload   Total   Spent    Left  Speed
100  3658  100  3658    0     0   5725      0 --:--:-- --:--:-- --:--:--  7243
error: patch failed: core/modules/rest/lib/Drupal/rest/Plugin/Type/ResourcePluginManager.php:7
error: core/modules/rest/lib/Drupal/rest/Plugin/Type/ResourcePluginManager.php: patch does not apply

Still looks good, back to RTBC.

Committed 6fa0fe8 and pushed to 8.x. Thanks!