DGI9-477: Fix/drush 12

composer.json

@@ -18,7 +18,7 @@
     "extra": {
         "drush": {
             "services": {
-                "drush.services.yml": "^10"
+                "drush.10.services.yml": "^10 || ^11"
             }
         }
     }

drush.10.services.yml

@@ -0,0 +1,68 @@
+---
+services:
+  islandora_drush_utils.deleter:
+    class: \Drupal\islandora_drush_utils\Drush\Commands\Deleter
+    arguments:
+      - '@entity_type.manager'
+      - '@queue'
+      - '@database'
+      - '@entity_field.manager'
+    tags:
+      - name: drush.command
+  islandora_drush_utils.rederiver:
+    class: \Drupal\islandora_drush_utils\Drush\Commands\Rederive
+    arguments:
+      - '@islandora.utils'
+      - '@entity_type.manager'
+    tags:
+      - name: drush.command
+  islandora_drush_utils.rederive_thumbnails:
+    class: \Drupal\islandora_drush_utils\Drush\Commands\GenerateThumbnails
+    arguments:
+      - '@entity_type.manager'
+      - '@database'
+    tags:
+      - name: drush.command
+  islandora_drush_utils.command.user_wrapper:
+    class: \Drupal\islandora_drush_utils\Drush\Commands\UserWrapperCommands
+    arguments:
+      - '@account_switcher'
+      - '@entity_type.manager'
+    tags:
+      - name: drush.command
+  islandora_drush_utils.command.user_wrapping_alterer:
+    class: \Drupal\islandora_drush_utils\Drush\CommandInfoAlterers\UserWrappingAlterer
+    tags:
+      - name: drush.command_info_alterer
+    arguments:
+      - '@logger.islandora_drush_utils'
+      - false
+  islandora_drush_utils.null_child_weight_updater:
+    class: \Drupal\islandora_drush_utils\Drush\Commands\NullChildWeight
+    arguments:
+      - '@entity_type.manager'
+      - '@database'
+      - '@islandora.utils'
+    tags:
+      - name: drush.command
+  islandora_drush_utils.missing_derivatives:
+    class: \Drupal\islandora_drush_utils\Drush\Commands\MissingDerivatives
+    arguments:
+      - '@entity_type.manager'
+      - '@dgi_standard_derivative_examiner.examiner'
+    tags:
+      - name: drush.command
+  islandora_drush_utils.derivatives_generator:
+    class: \Drupal\islandora_drush_utils\Drush\Commands\DerivativesGenerator
+    arguments:
+      - '@entity_type.manager'
+    tags:
+      - name: drush.command
+  islandora_drush_utils.bulk_publish_unpublish:
+    class: \Drupal\islandora_drush_utils\Drush\Commands\PublishUnpublishCollections
+    arguments:
+      - '@entity_type.manager'
+      - '@islandora.utils'
+      - '@logger.islandora_drush_utils'
+    tags:
+      - { name: drush.command }

src/Commands/UserWrappingAlterer.php → src/Drush/CommandInfoAlterers/UserWrappingAlterer.php

@@ -1,6 +1,6 @@
 <?php
 
-namespace Drupal\islandora_drush_utils\Commands;
+namespace Drupal\islandora_drush_utils\Drush\CommandInfoAlterers;
 
 use Consolidation\AnnotatedCommand\CommandInfoAltererInterface;
 use Consolidation\AnnotatedCommand\Parser\CommandInfo;
@@ -29,32 +29,20 @@ class UserWrappingAlterer implements CommandInfoAltererInterface {
     'migrate:rollback',
   ];
 
-  /**
-   * The logger to use.
-   *
-   * @var \Psr\Log\LoggerInterface
-   */
-  protected $logger;
-
-  /**
-   * Whether we should emit debug messages.
-   *
-   * @var bool
-   */
-  protected $debug;
-
   /**
    * Constructor.
    */
-  public function __construct(LoggerInterface $logger, $debug = FALSE) {
-    $this->logger = $logger;
-    $this->debug = $debug;
+  public function __construct(
+    protected LoggerInterface $logger,
+    protected $debug = FALSE,
+  ) {
+    // No-op.
   }
 
   /**
    * {@inheritdoc}
    */
-  public function alterCommandInfo(CommandInfo $commandInfo, $commandFileInstance) {
+  public function alterCommandInfo(CommandInfo $commandInfo, $commandFileInstance) : void {
     if (!$commandInfo->hasAnnotation(static::ANNO) && in_array($commandInfo->getName(), static::COMMANDS)) {
       if ($this->debug) {
         $this->logger->debug(

src/Commands/Deleter.php → src/Drush/Commands/Deleter.php

@@ -1,6 +1,6 @@
 <?php
 
-namespace Drupal\islandora_drush_utils\Commands;
+namespace Drupal\islandora_drush_utils\Drush\Commands;
 
 use Drupal\Component\Utility\Random;
 use Drupal\Core\Database\Connection;
@@ -12,6 +12,7 @@
 use Drupal\Core\Queue\QueueFactory;
 use Drupal\Core\Queue\QueueInterface;
 use Drupal\Core\TypedData\TranslatableInterface;
+use Drupal\islandora_drush_utils\Drush\Commands\Traits\LoggingTrait;
 use Drupal\media\MediaInterface;
 use Drupal\node\NodeInterface;
 use Drush\Commands\DrushCommands;
@@ -29,34 +30,6 @@ class Deleter extends DrushCommands implements ContainerInjectionInterface {
 
   use LoggingTrait;
 
-  /**
-   * The database connection service.
-   *
-   * @var \Drupal\Core\Database\Connection
-   */
-  protected Connection $database;
-
-  /**
-   * The entity type manager service.
-   *
-   * @var \Drupal\Core\Entity\EntityTypeManagerInterface
-   */
-  protected EntityTypeManagerInterface $entityTypeManager;
-
-  /**
-   * The entity field manager service.
-   *
-   * @var \Drupal\Core\Entity\EntityFieldManagerInterface
-   */
-  protected EntityFieldManagerInterface $entityFieldManager;
-
-  /**
-   * The queue factory service.
-   *
-   * @var \Drupal\Core\Queue\QueueFactory
-   */
-  protected QueueFactory $queueFactory;
-
   /**
    * The node storage service.
    *
@@ -103,16 +76,12 @@ class Deleter extends DrushCommands implements ContainerInjectionInterface {
    * Constructor.
    */
   public function __construct(
-        EntityTypeManagerInterface $entity_type_manager,
-        QueueFactory $queue_factory,
-        Connection $database,
-        EntityFieldManagerInterface $entity_field_manager
+        protected EntityTypeManagerInterface $entityTypeManager,
+        protected QueueFactory $queueFactory,
+        protected Connection $database,
+        protected EntityFieldManagerInterface $entityFieldManager
     ) {
     parent::__construct();
-    $this->entityTypeManager = $entity_type_manager;
-    $this->entityFieldManager = $entity_field_manager;
-    $this->queueFactory = $queue_factory;
-    $this->database = $database;
 
     $this->queuePrefix = implode(
           '.', [
@@ -127,7 +96,7 @@ public function __construct(
   /**
    * {@inheritDoc}
    */
-  public static function create(ContainerInterface $container) {
+  public static function create(ContainerInterface $container) : self {
     return new static(
       $container->get('entity_type.manager'),
       $container->get('queue'),

src/Commands/DerivativesGenerator.php → src/Drush/Commands/DerivativesGenerator.php

@@ -1,11 +1,12 @@
 <?php
 
-namespace Drupal\islandora_drush_utils\Commands;
+namespace Drupal\islandora_drush_utils\Drush\Commands;
 
 use Drupal\Core\DependencyInjection\ContainerInjectionInterface;
 use Drupal\Core\DependencyInjection\DependencySerializationTrait;
 use Drupal\Core\Entity\EntityTypeManagerInterface;
 use Drupal\Core\StringTranslation\StringTranslationTrait;
+use Drupal\islandora_drush_utils\Drush\Commands\Traits\NodeIdParsingTrait;
 use Drupal\islandora_drush_utils\Services\DerivativesGeneratorBatchService;
 use Drush\Commands\DrushCommands;
 use Symfony\Component\DependencyInjection\ContainerInterface;
@@ -19,22 +20,13 @@ class DerivativesGenerator extends DrushCommands implements ContainerInjectionIn
   use StringTranslationTrait;
   use NodeIdParsingTrait;
 
-  /**
-   * Entity type manager.
-   *
-   * @var \Drupal\Core\Entity\EntityTypeManagerInterface
-   */
-  protected $entityTypeManager;
-
   /**
    * Constructor.
-   *
-   * @param \Drupal\Core\Entity\EntityTypeManagerInterface $entity_type_manager
-   *   The entity type manager service.
    */
-  public function __construct(EntityTypeManagerInterface $entity_type_manager) {
+  public function __construct(
+    protected EntityTypeManagerInterface $entityTypeManager,
+  ) {
     parent::__construct();
-    $this->entityTypeManager = $entity_type_manager;
   }
 
   /**

src/Commands/GenerateThumbnails.php → src/Drush/Commands/GenerateThumbnails.php

@@ -1,11 +1,12 @@
 <?php
 
-namespace Drupal\islandora_drush_utils\Commands;
+namespace Drupal\islandora_drush_utils\Drush\Commands;
 
 use Drupal\Core\Database\Connection;
 use Drupal\Core\DependencyInjection\ContainerInjectionInterface;
 use Drupal\Core\Entity\EntityTypeManagerInterface;
 use Drupal\Core\StringTranslation\StringTranslationTrait;
+use Drupal\islandora_drush_utils\Drush\Commands\Traits\NodeIdParsingTrait;
 use Drupal\islandora_drush_utils\Services\DerivativesGeneratorBatchService;
 use Drush\Commands\DrushCommands;
 use Symfony\Component\DependencyInjection\ContainerInterface;
@@ -18,32 +19,19 @@ class GenerateThumbnails extends DrushCommands implements ContainerInjectionInte
   use StringTranslationTrait;
   use NodeIdParsingTrait;
 
-  /**
-   * Entity type manager.
-   *
-   * @var \Drupal\Core\Entity\EntityTypeManagerInterface
-   */
-  protected $storage;
-
-  /**
-   * Database connection.
-   *
-   * @var \Drupal\Core\Database\Connection
-   */
-  protected $database;
-
   /**
    * Constructor.
    *
-   * @param \Drupal\Core\Entity\EntityTypeManagerInterface $entity_type_manager
+   * @param \Drupal\Core\Entity\EntityTypeManagerInterface $storage
    *   The entity type manager service.
    * @param \Drupal\Core\Database\Connection $database
    *   A Drupal database connection.
    */
-  public function __construct(EntityTypeManagerInterface $entity_type_manager, Connection $database) {
+  public function __construct(
+    protected EntityTypeManagerInterface $storage,
+    protected Connection $database,
+  ) {
     parent::__construct();
-    $this->storage = $entity_type_manager;
-    $this->database = $database;
   }
 
   /**

src/Commands/MissingDerivatives.php → src/Drush/Commands/MissingDerivatives.php

@@ -1,13 +1,14 @@
 <?php
 
-namespace Drupal\islandora_drush_utils\Commands;
+namespace Drupal\islandora_drush_utils\Drush\Commands;
 
 use Drupal\Core\DependencyInjection\ContainerInjectionInterface;
 use Drupal\Core\DependencyInjection\DependencySerializationTrait;
 use Drupal\Core\Entity\EntityTypeManagerInterface;
 use Drupal\Core\Entity\Query\QueryInterface;
 use Drupal\Core\StringTranslation\StringTranslationTrait;
 use Drupal\dgi_standard_derivative_examiner\Utility\ExaminerInterface;
+use Drupal\islandora_drush_utils\Drush\Commands\Traits\LoggingTrait;
 use Drupal\node\NodeStorageInterface;
 use Drush\Commands\DrushCommands;
 use Psr\Log\LogLevel;