Merge pull request #42 from discoverygarden/fix/drush-12

[DDST-215] Drush 12 compatibility
discoverygarden · Jun 4, 2024 · 881a302 · 881a302
2 parents 14287ee + 249e14d
commit 881a302
Show file tree

Hide file tree

Showing 14 changed files with 60 additions and 26 deletions.
diff --git a/composer.json b/composer.json
@@ -9,7 +9,7 @@
     "extra": {
         "drush": {
             "services": {
-                "drush.services.yml": "^10"
+                "drush.10-11.services.yml": "^10 || ^11"
             }
         }
     }

diff --git a/drush.services.yml → drush.10-11.services.yml b/drush.services.yml → drush.10-11.services.yml
@@ -1,24 +1,21 @@
 services:
   dgi_actions.commands:
-    class: \Drupal\dgi_actions\Commands\Generate
+    class: \Drupal\dgi_actions\Drush\Commands\Generate
     arguments: [
       '@http_client',
       '@entity_type.manager',
       '@dgi_actions.utils',
       '@dgi_actions.dgiutils',
       '@islandora.utils',
-      '@logger.dgi_actions'
+      '@logger.channel.dgi_actions'
     ]
     tags:
       - { name: drush.command }
   dgi_actions.print_missing_identifier_entity_ids:
-    class: \Drupal\dgi_actions\Commands\PrintMissingEntityIds
+    class: \Drupal\dgi_actions\Drush\Commands\PrintMissingEntityIds
     arguments: [
       '@entity_type.manager',
       '@dgi_actions.utils'
     ]
     tags:
       - { name: drush.command }
-  logger.dgi_actions:
-    parent: logger.channel_base
-    arguments: [ 'dgi_actions' ]
diff --git a/modules/dgi_actions_ark_identifier/src/Plugin/Action/DeleteArkIdentifier.php b/modules/dgi_actions_ark_identifier/src/Plugin/Action/DeleteArkIdentifier.php
@@ -3,10 +3,10 @@
 namespace Drupal\dgi_actions_ark_identifier\Plugin\Action;
 
 use Drupal\Core\Entity\EntityTypeManagerInterface;
-use Drupal\dgi_actions_ezid\Utility\EzidTrait;
 use Drupal\dgi_actions\Plugin\Action\DeleteIdentifier;
 use Drupal\dgi_actions\Plugin\Action\HttpActionDeleteTrait;
 use Drupal\dgi_actions\Utility\IdentifierUtils;
+use Drupal\dgi_actions_ezid\Utility\EzidTrait;
 use GuzzleHttp\ClientInterface;
 use GuzzleHttp\RequestOptions;
 use Psr\Http\Message\ResponseInterface;

diff --git a/modules/dgi_actions_handle/drush.services.yml b/modules/dgi_actions_handle/drush.services.yml
@@ -1,7 +1,7 @@
 ---
 services:
   dgi_actions_handle.commands:
-    class: \Drupal\dgi_actions_handle\Commands\HandleCommands
+    class: \Drupal\dgi_actions_handle\Drush\Commands\HandleCommands
     arguments: ['@http_client', '@entity_type.manager', '@dgi_actions.utils']
     tags:
       - { name: drush.command }
diff --git a/...ns_handle/src/Commands/HandleCommands.php → ...dle/src/Drush/Commands/HandleCommands.php b/...ns_handle/src/Commands/HandleCommands.php → ...dle/src/Drush/Commands/HandleCommands.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace Drupal\dgi_actions_handle\Commands;
+namespace Drupal\dgi_actions_handle\Drush\Commands;
 
 use Consolidation\AnnotatedCommand\CommandData;
 use Consolidation\AnnotatedCommand\CommandError;
@@ -9,6 +9,7 @@
 use Drupal\dgi_actions\Utility\IdentifierUtils;
 use Drush\Commands\DrushCommands;
 use GuzzleHttp\ClientInterface;
+use Psr\Container\ContainerInterface;
 
 /**
  * Drush commands for Handle.net things.
@@ -53,6 +54,17 @@ public function __construct(ClientInterface $client, EntityTypeManagerInterface
     $this->utils = $utils;
   }
 
+  /**
+   * {@inheritDoc}
+   */
+  public static function create(ContainerInterface $container) : self {
+    return new static(
+      $container->get('http_client'),
+      $container->get('entity_type.manager'),
+      $container->get('dgi_actions.utils')
+    );
+  }
+
   /**
    * Validates the update command.
    *

diff --git a/...gi_actions_handle/src/Commands/Update.php → ...ions_handle/src/Drush/Commands/Update.php b/...gi_actions_handle/src/Commands/Update.php → ...ions_handle/src/Drush/Commands/Update.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace Drupal\dgi_actions_handle\Commands;
+namespace Drupal\dgi_actions_handle\Drush\Commands;
 
 use Drupal\dgi_actions\Entity\IdentifierInterface;
 use Drupal\dgi_actions_handle\Utility\HandleTrait;

diff --git a/src/Commands/Generate.php → src/Drush/Commands/Generate.php b/src/Commands/Generate.php → src/Drush/Commands/Generate.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace Drupal\dgi_actions\Commands;
+namespace Drupal\dgi_actions\Drush\Commands;
 
 use Consolidation\AnnotatedCommand\CommandData;
 use Consolidation\AnnotatedCommand\CommandError;
@@ -13,6 +13,7 @@
 use Drupal\islandora\IslandoraUtils;
 use Drush\Commands\DrushCommands;
 use GuzzleHttp\ClientInterface;
+use Psr\Container\ContainerInterface;
 use Psr\Log\LoggerInterface;
 
 /**
@@ -90,6 +91,19 @@ public function __construct(ClientInterface $client, EntityTypeManagerInterface
     $this->ourLogger = $logger;
   }
 
+  /**
+   * {@inheritDoc}
+   */
+  public static function create(ContainerInterface $container) : self {
+    return new static(
+      $container->get('http_client'),
+      $container->get('entity_type.manager'),
+      $container->get('dgi_actions.utils'),
+      $container->get('islandora.utils'),
+      $container->get('logger.channel.dgi_actions')
+    );
+  }
+
   /**
    * Generates missing identifiers for entities.
    *

diff --git a/src/Commands/PrintMissingEntityIds.php → src/Drush/Commands/PrintMissingEntityIds.php b/src/Commands/PrintMissingEntityIds.php → src/Drush/Commands/PrintMissingEntityIds.php
@@ -1,13 +1,14 @@
 <?php
 
-namespace Drupal\dgi_actions\Commands;
+namespace Drupal\dgi_actions\Drush\Commands;
 
 use Consolidation\AnnotatedCommand\CommandData;
 use Consolidation\AnnotatedCommand\CommandError;
 use Drupal\Core\DependencyInjection\DependencySerializationTrait;
 use Drupal\Core\Entity\EntityTypeManagerInterface;
 use Drupal\dgi_actions\Utility\IdentifierUtils;
 use Drush\Commands\DrushCommands;
+use Psr\Container\ContainerInterface;
 
 /**
  * Drush commands for generating identifiers for existing objects.
@@ -45,6 +46,16 @@ public function __construct(EntityTypeManagerInterface $entity_type_manager, Ide
     $this->identifierUtils = $identifier_utils;
   }
 
+  /**
+   * {@inheritDoc}
+   */
+  public static function create(ContainerInterface $container) : self {
+    return new static(
+      $container->get('entity_type.manager'),
+      $container->get('dgi_actions.utils')
+    );
+  }
+
   /**
    * Prints entity IDs with missing identifiers.
    *

diff --git a/src/Form/DataProfileDeleteForm.php b/src/Form/DataProfileDeleteForm.php
@@ -4,8 +4,8 @@
 
 use Drupal\Core\Entity\EntityConfirmFormBase;
 use Drupal\Core\Form\FormStateInterface;
-use Drupal\Core\Url;
 use Drupal\Core\StringTranslation\TranslatableMarkup;
+use Drupal\Core\Url;
 
 /**
  * Builds the form to delete Data Profile setting entities.

diff --git a/src/Plugin/Action/IdentifierAction.php b/src/Plugin/Action/IdentifierAction.php
@@ -2,16 +2,16 @@
 
 namespace Drupal\dgi_actions\Plugin\Action;
 
-use Drupal\Core\Entity\EntityTypeManagerInterface;
-use Drupal\dgi_actions\Entity\IdentifierInterface;
-use Drupal\dgi_actions\Utility\IdentifierUtils;
 use Drupal\Core\Action\ConfigurableActionBase;
-use Drupal\Core\Form\FormStateInterface;
 use Drupal\Core\Entity\EntityInterface;
+use Drupal\Core\Entity\EntityTypeManagerInterface;
+use Drupal\Core\Form\FormStateInterface;
 use Drupal\Core\Plugin\ContainerFactoryPluginInterface;
-use Symfony\Component\DependencyInjection\ContainerInterface;
-use Psr\Log\LoggerInterface;
 use Drupal\Core\Session\AccountInterface;
+use Drupal\dgi_actions\Entity\IdentifierInterface;
+use Drupal\dgi_actions\Utility\IdentifierUtils;
+use Psr\Log\LoggerInterface;
+use Symfony\Component\DependencyInjection\ContainerInterface;
 
 /**
  * Base class for Identifier Actions.

diff --git a/src/Plugin/Action/MintIdentifier.php b/src/Plugin/Action/MintIdentifier.php
@@ -2,8 +2,8 @@
 
 namespace Drupal\dgi_actions\Plugin\Action;
 
-use Drupal\Core\Entity\FieldableEntityInterface;
 use Drupal\Core\Entity\Exception\UndefinedLinkTemplateException;
+use Drupal\Core\Entity\FieldableEntityInterface;
 use Drupal\Core\Field\EntityReferenceFieldItemList;
 use Drupal\Core\Form\FormStateInterface;
 

diff --git a/src/Plugin/Condition/EntityHasIdentifier.php b/src/Plugin/Condition/EntityHasIdentifier.php
@@ -6,12 +6,12 @@
 use Drupal\Core\Condition\ConditionPluginBase;
 use Drupal\Core\Entity\EntityTypeManagerInterface;
 use Drupal\Core\Entity\FieldableEntityInterface;
-use Drupal\Core\StringTranslation\StringTranslationTrait;
-use Drupal\Core\Plugin\ContainerFactoryPluginInterface;
-use Symfony\Component\DependencyInjection\ContainerInterface;
 use Drupal\Core\Form\FormStateInterface;
+use Drupal\Core\Plugin\ContainerFactoryPluginInterface;
+use Drupal\Core\StringTranslation\StringTranslationTrait;
 use Drupal\dgi_actions\Utility\IdentifierUtils;
 use Psr\Log\LoggerInterface;
+use Symfony\Component\DependencyInjection\ContainerInterface;
 
 /**
  * Condition to check an Entity for an existing persistent identifier.

diff --git a/src/Plugin/DataProfileManager.php b/src/Plugin/DataProfileManager.php
@@ -2,9 +2,9 @@
 
 namespace Drupal\dgi_actions\Plugin;
 
-use Drupal\Core\Plugin\DefaultPluginManager;
 use Drupal\Core\Cache\CacheBackendInterface;
 use Drupal\Core\Extension\ModuleHandlerInterface;
+use Drupal\Core\Plugin\DefaultPluginManager;
 
 /**
  * Provides the Data profile plugin manager.

diff --git a/src/Plugin/ServiceDataTypeManager.php b/src/Plugin/ServiceDataTypeManager.php
@@ -2,9 +2,9 @@
 
 namespace Drupal\dgi_actions\Plugin;
 
-use Drupal\Core\Plugin\DefaultPluginManager;
 use Drupal\Core\Cache\CacheBackendInterface;
 use Drupal\Core\Extension\ModuleHandlerInterface;
+use Drupal\Core\Plugin\DefaultPluginManager;
 
 /**
  * Provides the Service data type plugin manager.