Merge pull request #12 from discoverygarden/fix/move-away-from-compil…

…er-pass CTDA9-549: Move away from compiler pass.
discoverygarden · Jan 23, 2024 · 4a0eb4a · 4a0eb4a
2 parents d889a0c + 9b0250e
commit 4a0eb4a
Show file tree

Hide file tree

Showing 5 changed files with 26 additions and 52 deletions.
diff --git a/src/Annotation/DgiStandardDerivativeExaminerModel.php b/src/Annotation/DgiStandardDerivativeExaminerModel.php
@@ -3,6 +3,7 @@
 namespace Drupal\dgi_standard_derivative_examiner\Annotation;
 
 use Drupal\Component\Annotation\Plugin;
+use Drupal\dgi_standard_derivative_examiner\TargetPluginManager;
 
 /**
  * Model plugin info.
@@ -25,4 +26,11 @@ class DgiStandardDerivativeExaminerModel extends Plugin {
    */
   public string $uri;
 
+  /**
+   * The name of the class managing target plugins.
+   *
+   * @var string
+   */
+  public string $targetManagerClass = TargetPluginManager::class;
+
 }
diff --git a/src/DgiStandardDerivativeExaminerServiceProvider.php b/src/DgiStandardDerivativeExaminerServiceProvider.php
diff --git a/src/ModelTargetPluginManagerExtensionPass.php b/src/ModelTargetPluginManagerExtensionPass.php
diff --git a/src/Plugin/dgi_standard_derivative_examiner/ModelPluginBase.php b/src/Plugin/dgi_standard_derivative_examiner/ModelPluginBase.php
@@ -2,6 +2,7 @@
 
 namespace Drupal\dgi_standard_derivative_examiner\Plugin\dgi_standard_derivative_examiner;
 
+use Drupal\Core\DependencyInjection\ContainerInjectionInterface;
 use Drupal\Core\Plugin\ContainerFactoryPluginInterface;
 use Drupal\Core\Plugin\PluginBase;
 use Drupal\dgi_standard_derivative_examiner\ModelInterface;
@@ -35,7 +36,9 @@ abstract class ModelPluginBase extends PluginBase implements ContainerFactoryPlu
   public static function create(ContainerInterface $container, array $configuration, $plugin_id, $plugin_definition) {
     $instance = new static($configuration, $plugin_id, $plugin_definition);
 
-    $instance->targetPluginManager = $container->get("plugin.manager.dgi_standard_derivative_examiner.target.{$plugin_id}");
+    $instance->targetPluginManager = is_a($plugin_definition['targetManagerClass'], ContainerInjectionInterface::class, TRUE) ?
+       $plugin_definition['targetManagerClass']::create($container, $plugin_id) :
+       new $plugin_definition['targetManagerClass']($plugin_id);
 
     return $instance;
   }

diff --git a/src/TargetPluginManager.php b/src/TargetPluginManager.php
@@ -2,14 +2,16 @@
 
 namespace Drupal\dgi_standard_derivative_examiner;
 
+use Drupal\Core\DependencyInjection\ContainerInjectionInterface;
 use Drupal\Core\Extension\ModuleHandlerInterface;
 use Drupal\Core\Plugin\DefaultPluginManager;
 use Drupal\dgi_standard_derivative_examiner\Annotation\DgiStandardDerivativeExaminerTarget;
+use Symfony\Component\DependencyInjection\ContainerInterface;
 
 /**
  * Target plugin manager service.
  */
-class TargetPluginManager extends DefaultPluginManager implements TargetPluginManagerInterface {
+class TargetPluginManager extends DefaultPluginManager implements TargetPluginManagerInterface, ContainerInjectionInterface {
 
   /**
    * Constructor.
@@ -31,4 +33,15 @@ public function __construct(
     $this->alterInfo("dgi_standard_derivative_examiner_{$type}_target_plugin_info");
   }
 
+  /**
+   * {@inheritDoc}
+   */
+  public static function create(ContainerInterface $container, string $type = '') : self {
+    return new static(
+      $type,
+      $container->get('container.namespaces'),
+      $container->get('module_handler'),
+    );
+  }
+
 }