D9 islandora

.travis.yml

@@ -1,8 +1,8 @@
 sudo: true
 language: php
 php:
-  - 7.2
   - 7.3
+  - 7.4
 
 env:
   - TESTSUITE=kernel
@@ -11,8 +11,6 @@ env:
 
 matrix:
     fast_finish: true
-    allow_failures:
-      - php: 7.3
 
 services:
   - mysql

composer.json

@@ -14,7 +14,7 @@
     }
   ],
   "require": {
-    "drupal/context": "^4.0",
+    "drupal/context": "^4.0@beta",
     "drupal/search_api": "~1.8",
     "islandora/jsonld": "dev-8.x-1.x",
     "stomp-php/stomp-php": "4.*",
@@ -25,9 +25,9 @@
     "drupal/features" : "^3.7",
     "drupal/migrate_plus" : "^5.1",
     "drupal/migrate_tools" : "^5.0",
-    "drupal/migrate_source_csv" : "^2.1",
+    "drupal/migrate_source_csv" : "^3.4",
     "drupal/token" : "^1.3",
-    "drupal/flysystem" : "^1.0",
+    "drupal/flysystem" : "^2.0@alpha",
     "islandora/crayfish-commons": "dev-dev",
     "drupal/file_replace": "^1.1"
 

drush.services.yml

@@ -1,5 +1,6 @@
 services:
   islandora.commands:
     class: \Drupal\islandora\Commands\IslandoraCommands
+    arguments: ['@entity_type.manager', '@current_user', '@account_switcher']
     tags:
       - { name: drush.command }

islandora.info.yml

@@ -5,30 +5,31 @@ description: "Islandora Core"
 type: module
 package: Islandora
 core: 8.x
+core_version_requirement: ^8 || ^9
 dependencies:
-  - block
-  - node
-  - path
-  - text
-  - options
-  - link
-  - jsonld
-  - search_api
-  - jwt
-  - rest
-  - filehash
-  - basic_auth
-  - context_ui
-  - action
-  - eva
-  - taxonomy
-  - views_ui
-  - media
-  - prepopulate
-  - features_ui
-  - migrate_tools
-  - migrate_source_csv
-  - content_translation
-  - flysystem
-  - token
-  - file_replace
+  - drupal:block
+  - drupal:node
+  - drupal:path
+  - drupal:text
+  - drupal:options
+  - drupal:link
+  - drupal:jsonld
+  - drupal:search_api
+  - drupal:jwt
+  - drupal:rest
+  - drupal:filehash
+  - drupal:basic_auth
+  - drupal:context_ui
+  - drupal:action
+  - drupal:eva
+  - drupal:taxonomy
+  - drupal:views_ui
+  - drupal:media
+  - drupal:prepopulate
+  - drupal:features_ui
+  - drupal:migrate_tools
+  - drupal:migrate_source_csv
+  - drupal:content_translation
+  - drupal:flysystem
+  - drupal:token
+  - drupal:file_replace

islandora.install

@@ -55,3 +55,18 @@ function islandora_update_8003(&$sandbox) {
     ->schema()
     ->dropTable('islandora_version_count');
 }
+
+/**
+ * Renames migration source keys -> ids.
+ */
+function islandora_update_8004() {
+  $config_factory = \Drupal::configFactory();
+  $config = $config_factory->getEditable('migrate_plus.migration.islandora__tags');
+  if ($config) {
+    if (!$config->get('source.ids')) {
+      $config->set('source.ids', $config->get('source.keys'));
+      $config->clear('source.keys');
+      $config->save(TRUE);
+    }
+  }
+}

islandora.routing.yml

@@ -78,5 +78,3 @@ islandora.confirm_delete_media_and_file:
     _form: 'Drupal\islandora\Form\ConfirmDeleteMediaAndFile'
   requirements:
     _permission: 'administer media+delete any media'
-
-

islandora.services.yml

@@ -48,10 +48,10 @@ services:
       - { name: 'context_provider' }
   islandora.media_source_service:
     class: Drupal\islandora\MediaSource\MediaSourceService
-    arguments: ['@entity_type.manager', '@current_user', '@language_manager', '@entity.query', '@file_system', '@islandora.utils']
+    arguments: ['@entity_type.manager', '@current_user', '@language_manager', '@file_system', '@islandora.utils']
   islandora.utils:
     class: Drupal\islandora\IslandoraUtils
-    arguments: ['@entity_type.manager', '@entity_field.manager', '@entity.query', '@context.manager', '@flysystem_factory', '@language_manager']
+    arguments: ['@entity_type.manager', '@entity_field.manager', '@context.manager', '@flysystem_factory', '@language_manager']
   islandora.gemini.client:
     class: Islandora\Crayfish\Commons\Client\GeminiClient
     factory: ['Drupal\islandora\GeminiClientFactory', create]

modules/islandora_audio/islandora_audio.info.yml

@@ -3,5 +3,6 @@ description: 'Islandora audio derivative actions'
 type: module
 package: Islandora
 core: 8.x
+core_version_requirement: ^8 || ^9
 dependencies:
-  - islandora
+  - drupal:islandora

modules/islandora_audio/src/Plugin/Action/GenerateAudioDerivative.php

@@ -34,8 +34,8 @@ public function defaultConfiguration() {
    */
   public function buildConfigurationForm(array $form, FormStateInterface $form_state) {
     $form = parent::buildConfigurationForm($form, $form_state);
-    $form['mimetype']['#description'] = t('Mimetype to convert to (e.g. audio/mpeg, audio/m4a, etc...)');
-    $form['args']['#description'] = t('Additional command line parameters for FFMpeg');
+    $form['mimetype']['#description'] = $this->t('Mimetype to convert to (e.g. audio/mpeg, audio/m4a, etc...)');
+    $form['args']['#description'] = $this->t('Additional command line parameters for FFMpeg');
     return $form;
   }
 
@@ -48,7 +48,7 @@ public function validateConfigurationForm(array &$form, FormStateInterface $form
     if ($exploded_mime[0] != 'audio') {
       $form_state->setErrorByName(
         'mimetype',
-        t('Please enter a audio mimetype (e.g. audio/mpeg, audio/m4a, etc...)')
+        $this->t('Please enter a audio mimetype (e.g. audio/mpeg, audio/m4a, etc...)')
       );
     }
   }

modules/islandora_audio/tests/src/Functional/GenerateAudioDerivativeTest.php

@@ -40,7 +40,7 @@ public function testGenerateAudioDerivativeFromScratch() {
     // Create an action to generate a audio derivative.
     $this->drupalGet('admin/config/system/actions');
     $this->getSession()->getPage()->findById("edit-action")->selectOption("Generate a audio derivative");
-    $this->getSession()->getPage()->pressButton(t('Create'));
+    $this->getSession()->getPage()->pressButton($this->t('Create'));
     $this->assertSession()->statusCodeEquals(200);
 
     $this->getSession()->getPage()->fillField('edit-label', "Generate audio test derivative");
@@ -53,7 +53,7 @@ public function testGenerateAudioDerivativeFromScratch() {
     $this->getSession()->getPage()->fillField('edit-args', "-f mp3");
     $this->getSession()->getPage()->fillField('edit-scheme', "public");
     $this->getSession()->getPage()->fillField('edit-path', "derp.mov");
-    $this->getSession()->getPage()->pressButton(t('Save'));
+    $this->getSession()->getPage()->pressButton($this->t('Save'));
     $this->assertSession()->statusCodeEquals(200);
 
     // Create a context and add the action as a derivative reaction.
@@ -68,7 +68,7 @@ public function testGenerateAudioDerivativeFromScratch() {
       'field_media_of[0][target_id]' => 'Test Node',
       'field_tags[0][target_id]' => 'Preservation Master',
     ];
-    $this->drupalPostForm('media/add/' . $this->testMediaType->id(), $values, t('Save'));
+    $this->drupalPostForm('media/add/' . $this->testMediaType->id(), $values, $this->t('Save'));
 
     $expected = [
       'source_uri' => 'test_file.txt',

modules/islandora_breadcrumbs/islandora_breadcrumbs.info.yml

@@ -2,6 +2,7 @@ name: 'Islandora Breadcrumbs'
 type: module
 description: 'Builds breadcrumbs based on field_member_of relationships.'
 core: 8.x
+core_version_requirement: ^8 || ^9
 package: Islandora
 dependencies:
-  - islandora
+  - drupal:islandora

modules/islandora_core_feature/config/install/migrate_plus.migration.islandora_tags.yml

@@ -15,7 +15,7 @@ source:
   plugin: csv
   path: modules/contrib/islandora/migrate/tags.csv
   header_row_count: 1
-  keys:
+  ids:
     - external_uri
 process:
   name: name

modules/islandora_core_feature/islandora_core_feature.info.yml

@@ -2,27 +2,28 @@ name: 'Islandora Core Feature'
 description: 'Minimum configuration required for Islandora.'
 type: module
 core: 8.x
+core_version_requirement: ^8 || ^9
 dependencies:
-  - basic_auth
-  - content_translation
-  - eva
-  - features
-  - field
-  - file
-  - filehash
-  - image
-  - islandora
-  - jsonld
-  - jwt
-  - language
-  - link
-  - media
-  - migrate_plus
-  - node
-  - rest
-  - serialization
-  - system
-  - taxonomy
-  - user
-  - views
+  - drupal:basic_auth
+  - drupal:content_translation
+  - drupal:eva
+  - drupal:features
+  - drupal:field
+  - drupal:file
+  - drupal:filehash
+  - drupal:image
+  - drupal:islandora
+  - drupal:jsonld
+  - drupal:jwt
+  - drupal:language
+  - drupal:link
+  - drupal:media
+  - drupal:migrate_plus
+  - drupal:node
+  - drupal:rest
+  - drupal:serialization
+  - drupal:system
+  - drupal:taxonomy
+  - drupal:user
+  - drupal:views
 package: Islandora

modules/islandora_iiif/islandora_iiif.info.yml

@@ -2,6 +2,7 @@ name: 'Islandora IIIF'
 type: module
 description: 'IIIF support for Islandora'
 core: 8.x
+core_version_requirement: ^8 || ^9
 package: Islandora
 dependencies:
-  - islandora
+  - drupal:islandora

modules/islandora_iiif/src/Form/IslandoraIIIFConfigForm.php

@@ -2,16 +2,49 @@
 
 namespace Drupal\islandora_iiif\Form;
 
+use Drupal\Core\Config\ConfigFactoryInterface;
 use Drupal\Core\Form\ConfigFormBase;
 use Drupal\Core\Form\FormStateInterface;
 use Drupal\Component\Utility\UrlHelper;
+use GuzzleHttp\ClientInterface;
 use GuzzleHttp\Exception\ClientException;
+use Symfony\Component\DependencyInjection\ContainerInterface;
 
 /**
  * Form to configure IslandoraIIIF.
  */
 class IslandoraIIIFConfigForm extends ConfigFormBase {
 
+  /**
+   * The HTTP client to fetch the files with.
+   *
+   * @var \GuzzleHttp\ClientInterface
+   */
+  protected $httpClient;
+
+  /**
+   * IslandoraIIIFConfigForm constructor.
+   *
+   * @param \GuzzleHttp\ClientInterface $http_client
+   *   A Guzzle client object.
+   * @param \Drupal\Core\Config\ConfigFactoryInterface $config_factory
+   *   The config factory service.
+   */
+  public function __construct(ClientInterface $http_client, ConfigFactoryInterface $config_factory) {
+    parent::__construct($config_factory);
+    $this->httpClient = $http_client;
+  }
+
+  /**
+   * {@inheritdoc}
+   */
+  public static function create(ContainerInterface $container) {
+    return new static(
+      $container->get('http_client'),
+      $container->get('config.factory')
+    );
+  }
+
   /**
    * {@inheritdoc}
    */
@@ -78,9 +111,8 @@ public function submitForm(array &$form, FormStateInterface $form_state) {
    *   True if server returns 200 on a HEAD request.
    */
   private function validateIiifUrl($server_uri) {
-    $client = \Drupal::httpClient();
     try {
-      $result = $client->head($server_uri);
+      $result = $this->httpClient->head($server_uri);
       return ($result->getStatusCode() == 200);
     }
     catch (ClientException $e) {

modules/islandora_iiif/src/Plugin/views/style/IIIFManifest.php

@@ -4,6 +4,7 @@
 
 use Drupal\views\Plugin\views\style\StylePluginBase;
 use Drupal\Core\Form\FormStateInterface;
+use Drupal\Core\Messenger\MessengerInterface;
 use Drupal\views\ResultRow;
 use Symfony\Component\DependencyInjection\ContainerInterface;
 use Symfony\Component\Serializer\SerializerInterface;
@@ -74,17 +75,25 @@ class IIIFManifest extends StylePluginBase {
    */
   protected $fileSystem;
 
+  /**
+   * The messenger.
+   *
+   * @var \Drupal\Core\Messenger\MessengerInterface
+   */
+  protected $messenger;
+
   /**
    * {@inheritdoc}
    */
-  public function __construct(array $configuration, $plugin_id, $plugin_definition, SerializerInterface $serializer, Request $request, ImmutableConfig $iiif_config, FileSystem $file_system, Client $http_client) {
+  public function __construct(array $configuration, $plugin_id, $plugin_definition, SerializerInterface $serializer, Request $request, ImmutableConfig $iiif_config, FileSystem $file_system, Client $http_client, MessengerInterface $messenger) {
     parent::__construct($configuration, $plugin_id, $plugin_definition);
 
     $this->serializer = $serializer;
     $this->request = $request;
     $this->iiifConfig = $iiif_config;
     $this->fileSystem = $file_system;
     $this->httpClient = $http_client;
+    $this->messenger = $messenger;
   }
 
   /**
@@ -99,7 +108,8 @@ public static function create(ContainerInterface $container, array $configuratio
       $container->get('request_stack')->getCurrentRequest(),
       $container->get('config.factory')->get('islandora_iiif.settings'),
       $container->get('file_system'),
-      $container->get('http_client')
+      $container->get('http_client'),
+      $container->get('messenger')
     );
   }
 
@@ -176,7 +186,7 @@ protected function getTileSourceFromRow(ResultRow $row, $iiif_address, $iiif_bas
         foreach ($images as $image) {
           // Create the IIIF URL for this file
           // Visiting $iiif_url will resolve to the info.json for the image.
-          $file_url = $image->entity->url();
+          $file_url = $image->entity->createFileUrl(FALSE);
           $mime_type = $image->entity->getMimeType();
           $iiif_url = rtrim($iiif_address, '/') . '/' . urlencode($file_url);
 
@@ -297,7 +307,7 @@ public function buildOptionsForm(&$form, FormStateInterface $form_state) {
 
     // If no fields to choose from, add an error message indicating such.
     if (count($field_options) == 0) {
-      drupal_set_message($this->t('No image or file fields were found in the View.
+      $this->messenger->addMessage($this->t('No image or file fields were found in the View.
         You will need to add a field to this View'), 'error');
     }