Remove drush.services.yml files, use autowire and attributes (#4731)

Co-authored-by: Copilot <copilot@github.com>

Author: dafeder

composer.json

@@ -54,11 +54,6 @@
             "php-http/discovery": true,
             "tbachert/spi": true,
             "drupal/core-composer-scaffold": true
-        },
-        "audit": {
-            "ignore": {
-                "PKSA-dwsq-ppd2-mb1x": "Temporarily ignoring this advisory until core-recommended is updated to bring in symfony/polyfill-intl-idn 1.28."
-            }
         }
     },
     "extra": {

modules/dkan_common/dkan_common.services.yml

@@ -40,6 +40,7 @@ services:
     calls:
       - [setStorage, ['@?dkan.metastore.storage']]
       - [setResourceMapper, ['@?dkan.metastore.resource_mapper']]
+  Drupal\dkan_common\DatasetInfo: '@dkan.common.dataset_info'
 
   dkan.common.logger_channel:
     parent: logger.channel_base

modules/dkan_common/drush.services.yml

@@ -0,0 +1,29 @@
+<?php
+
+namespace Drupal\dkan_common\Drush\Commands;
+
+use Drupal\dkan_common\DatasetInfo;
+use Drush\Commands\DrushCommands;
+use Drush\Commands\AutowireTrait;
+use Drush\Attributes as CLI;
+
+/**
+ * Drush commands providing utility common to DKAN's sub-modules.
+ */
+final class CommonCommands extends DrushCommands {
+
+  use AutowireTrait;
+
+  public function __construct(protected DatasetInfo $datasetInfo) {
+    parent::__construct();
+  }
+
+  /**
+   * Display information about a dataset and its resource(s).
+   */
+  #[CLI\Command(name: 'dkan:dataset-info', description: 'Display information about a dataset and its resource(s).')]
+  public function datasetInfo(string $uuid) {
+    return json_encode($this->datasetInfo->gather($uuid), JSON_PRETTY_PRINT);
+  }
+
+}

modules/dkan_common/src/Commands/CommonCommands.php

@@ -2,13 +2,13 @@
 
 namespace Drupal\Tests\dkan_common\Unit\Commands;
 
-use Drupal\dkan_common\Commands\CommonCommands;
+use Drupal\dkan_common\Drush\Commands\CommonCommands;
 use Drupal\dkan_common\DatasetInfo;
 use PHPUnit\Framework\TestCase;
 
 /**
- * @covers \Drupal\dkan_common\Commands\CommonCommands
- * @coversDefaultClass \Drupal\dkan_common\Commands\CommonCommands
+ * @covers \Drupal\dkan_common\Drush\Commands\CommonCommands
+ * @coversDefaultClass \Drupal\dkan_common\Drush\Commands\CommonCommands
  */
 class CommonCommandsTest extends TestCase {
 

modules/dkan_common/src/Commands/JobStoreCommands.php

@@ -10,12 +10,14 @@ services:
       - '@dkan.metastore.resource_mapper'
       - '@event_dispatcher'
       - '@dkan.metastore.reference_lookup'
+  Drupal\dkan_datastore\DatastoreService: '@dkan.datastore.service'
 
   dkan.datastore.lookup:
     class: \Drupal\dkan_datastore\DatastoreLookup
     arguments:
       - '@database'
       - '@dkan.metastore.reference_lookup'
+  Drupal\dkan_datastore\DatastoreLookupInterface: '@dkan.datastore.lookup'
 
   dkan.datastore.service.post_import:
     class: \Drupal\dkan_datastore\Service\PostImport
@@ -32,6 +34,7 @@ services:
     arguments:
       - '@database'
       - '@dkan.metastore.resource_mapper'
+  Drupal\dkan_datastore\PostImportResultFactory: '@dkan.datastore.post_import_result_factory'
 
   dkan.datastore.query:
     class: \Drupal\dkan_datastore\Service\Query
@@ -47,6 +50,7 @@ services:
       - '@dkan.common.filefetcher_job_store_factory'
       - '@queue'
       - '@event_dispatcher'
+  Drupal\dkan_datastore\Service\ResourceLocalizer: '@dkan.datastore.service.resource_localizer'
 
   dkan.datastore.service.resource_processor_collector:
     class: \Drupal\dkan_datastore\Service\ResourceProcessorCollector
@@ -71,6 +75,7 @@ services:
       - '@dkan.metastore.storage'
       - '@dkan.datastore.service'
       - '@dkan.datastore.logger_channel'
+  Drupal\dkan_datastore\Service\ResourcePurger: '@dkan.datastore.service.resource_purger'
 
   dkan.datastore.service.factory.import:
     class: \Drupal\dkan_datastore\Service\Factory\ImportServiceFactory
@@ -138,6 +143,7 @@ services:
     arguments:
       - '@dkan.common.filefetcher_job_store_factory'
       - '@dkan.datastore.import_info'
+  Drupal\dkan_datastore\Service\Info\ImportInfoList: '@dkan.datastore.import_info_list'
 
   dkan.datastore.import_job_store_factory:
     class: \Drupal\dkan_datastore\Storage\ImportJobStoreFactory