NEW: Stateless plugins, plugin registry as simple list

_config/plugins.yml

@@ -4,12 +4,12 @@ Name: graphql-plugins
 SilverStripe\Core\Injector\Injector:
   SilverStripe\GraphQL\Schema\Registry\PluginRegistry:
     constructor:
-      paginator: '%$SilverStripe\GraphQL\Schema\Plugin\PaginationPlugin'
-      dataobjectPaginator: '%$SilverStripe\GraphQL\Schema\DataObject\Plugin\Paginator'
-      dataobjectQueryFilter: '%$SilverStripe\GraphQL\Schema\DataObject\Plugin\QueryFilter\QueryFilter'
-      dataobjectQuerySort: '%$SilverStripe\GraphQL\Schema\DataObject\Plugin\QuerySort'
-      dataobjectInheritance: '%$SilverStripe\GraphQL\Schema\DataObject\Plugin\Inheritance'
-      canViewPermission: '%$SilverStripe\GraphQL\Schema\DataObject\Plugin\CanViewPermission'
-      firstResult: '%$SilverStripe\GraphQL\Schema\DataObject\Plugin\FirstResult'
-      inheritedPlugins: '%$SilverStripe\GraphQL\Schema\DataObject\Plugin\InheritedPlugins'
-      sorter: '%$SilverStripe\GraphQL\Schema\Plugin\SortPlugin'
+      - 'SilverStripe\GraphQL\Schema\Plugin\PaginationPlugin'
+      - 'SilverStripe\GraphQL\Schema\DataObject\Plugin\Paginator'
+      - 'SilverStripe\GraphQL\Schema\DataObject\Plugin\QueryFilter\QueryFilter'
+      - 'SilverStripe\GraphQL\Schema\DataObject\Plugin\QuerySort'
+      - 'SilverStripe\GraphQL\Schema\DataObject\Plugin\Inheritance'
+      - 'SilverStripe\GraphQL\Schema\DataObject\Plugin\CanViewPermission'
+      - 'SilverStripe\GraphQL\Schema\DataObject\Plugin\FirstResult'
+      - 'SilverStripe\GraphQL\Schema\DataObject\Plugin\InheritedPlugins'
+      - 'SilverStripe\GraphQL\Schema\Plugin\SortPlugin'

src/Schema/Plugin/AbstractNestedInputPlugin.php

@@ -162,7 +162,7 @@ protected function buildAllFieldsConfig(ModelType $modelType, Schema $schema, in
                 $filters[$fieldObj->getName()] = true;
             }
         }
-        $this->_allConfigCache[$modelType->getName()] = $filters;
+        $this->_allConfigCache[$key] = $filters;
 
         return $filters;
     }

src/Schema/Registry/PluginRegistry.php

@@ -4,6 +4,7 @@
 namespace SilverStripe\GraphQL\Schema\Registry;
 
 use SilverStripe\Core\Injector\Injectable;
+use SilverStripe\Core\Injector\Injector;
 use SilverStripe\GraphQL\Schema\Exception\SchemaBuilderException;
 use SilverStripe\GraphQL\Schema\Interfaces\PluginInterface;
 use SilverStripe\GraphQL\Schema\Schema;
@@ -21,25 +22,26 @@ class PluginRegistry
     private $plugins = [];
 
     /**
-     * @param PluginInterface[] ...$plugins
+     * @param array ...$plugins
      * @throws SchemaBuilderException
      */
     public function __construct(...$plugins)
     {
         foreach ($plugins as $plugin) {
+            $inst = Injector::inst()->get($plugin);
             Schema::invariant(
-                $plugin instanceof PluginInterface,
+                $inst instanceof PluginInterface,
                 '%s only accepts implementations of %s',
                 __CLASS__,
                 PluginInterface::class
             );
-            $existing = $this->plugins[$plugin->getIdentifier()] ?? null;
+            $existing = $this->plugins[$inst->getIdentifier()] ?? null;
             Schema::invariant(
-                !$existing || (get_class($existing) === get_class($plugin)),
+                !$existing || ($existing === $plugin),
                 'Two different plugins are registered under identifier %s',
-                $plugin->getIdentifier()
+                $inst->getIdentifier()
             );
-            $this->plugins[$plugin->getIdentifier()] = $plugin;
+            $this->plugins[$inst->getIdentifier()] = $plugin;
         }
     }
 
@@ -49,6 +51,8 @@ public function __construct(...$plugins)
      */
     public function getPluginByID(string $id): ?PluginInterface
     {
-        return $this->plugins[$id] ?? null;
+        $class = $this->plugins[$id] ?? null;
+
+        return $class ? Injector::inst()->create($class) : null;
     }
 }

src/Schema/Schema.php

@@ -406,6 +406,8 @@ private function applyComponentPlugins(SchemaComponent $component, string $name)
             // Duck programming here just because there is such an exhaustive list of possible
             // interfaces, and they can't have a common ancestor until PHP 7.4 allows it.
             // https://wiki.php.net/rfc/covariant-returns-and-contravariant-parameters
+            // ideally, this should be `instanceof PluginInterface` and PluginInterface should have
+            // apply(SchemaComponent)
             if (!method_exists($plugin, 'apply')) {
                 continue;
             }