Issue #1851706 by yched, effulgentsia, tim.plunkett: Fixed Make all core...

Issue #1851706 by yched, effulgentsia, tim.plunkett: Fixed Make all core plugin managers be consistent as to whether  or ->discovery is passed to the factory.

core/modules/field/lib/Drupal/field/Plugin/Type/Formatter/FormatterPluginManager.php

@@ -38,7 +38,7 @@ public function __construct() {
     $this->discovery = new AlterDecorator($this->discovery, 'field_formatter_info');
     $this->discovery = new CacheDecorator($this->discovery, 'field_formatter_types', 'field');
 
-    $this->factory = new FormatterFactory($this);
+    $this->factory = new FormatterFactory($this->discovery);
   }
 
   /**

core/modules/field/lib/Drupal/field/Plugin/Type/Widget/WidgetPluginManager.php

@@ -39,7 +39,7 @@ public function __construct() {
     $this->discovery = new AlterDecorator($this->discovery, 'field_widget_info');
     $this->discovery = new CacheDecorator($this->discovery, 'field_widget_types',  'field');
 
-    $this->factory = new WidgetFactory($this);
+    $this->factory = new WidgetFactory($this->discovery);
   }
 
   /**

core/modules/layout/lib/Drupal/layout/Plugin/Type/LayoutManager.php

@@ -31,6 +31,6 @@ public function __construct() {
     $this->discovery = new DerivativeDiscoveryDecorator($this->discovery);
     $this->discovery = new ProcessDecorator($this->discovery, array($this, 'processDefinition'));
 
-    $this->factory = new ReflectionFactory($this);
+    $this->factory = new ReflectionFactory($this->discovery);
   }
 }

core/modules/rest/lib/Drupal/rest/Plugin/Type/ResourcePluginManager.php

@@ -23,7 +23,7 @@ class ResourcePluginManager extends PluginManagerBase {
   public function __construct() {
     // Create resource plugin derivatives from declaratively defined resources.
     $this->discovery = new DerivativeDiscoveryDecorator(new AnnotatedClassDiscovery('rest', 'resource'));
-    $this->factory = new ReflectionFactory($this);
+    $this->factory = new ReflectionFactory($this->discovery);
   }
 
   /**

core/modules/system/lib/Drupal/system/Plugin/Type/PluginUIManager.php

@@ -29,7 +29,7 @@ public function __construct() {
     $this->discovery = new DerivativeDiscoveryDecorator($this->discovery);
     $this->discovery = new AlterDecorator($this->discovery, 'plugin_ui');
     $this->discovery = new CacheDecorator($this->discovery, 'plugin_ui');
-    $this->factory = new DefaultFactory($this);
+    $this->factory = new DefaultFactory($this->discovery);
   }
 
   /**

core/modules/system/tests/modules/plugin_test/lib/Drupal/plugin_test/Plugin/DefaultsTestPluginManager.php

@@ -24,7 +24,7 @@ public function __construct() {
     // mock plugins for unit testing.
     $this->discovery = new StaticDiscovery();
     $this->discovery = new ProcessDecorator($this->discovery, array($this, 'ProcessDefinition'));
-    $this->factory = new DefaultFactory($this);
+    $this->factory = new DefaultFactory($this->discovery);
 
     // Specify default values.
     $this->defaults = array(

core/modules/views/lib/Drupal/views/Plugin/ViewsPluginManager.php

@@ -30,7 +30,7 @@ public function __construct($type) {
     $this->discovery = new AlterDecorator($this->discovery, 'views_plugins_' . $type);
     $this->discovery = new CacheDecorator($this->discovery, 'views:' . $type, 'views_info');
 
-    $this->factory = new DefaultFactory($this);
+    $this->factory = new DefaultFactory($this->discovery);
 
     $this->defaults += array(
       'parent' => 'parent',