use dependency injection for messenger and fix other deprecated functions for d9

src/Plugin/Action/AbstractGenerateDerivative.php

@@ -5,6 +5,7 @@ namespace Drupal\islandora\Plugin\Action;
 use Drupal\Core\Entity\EntityInterface;
 use Drupal\Core\Entity\EntityTypeManagerInterface;
 use Drupal\Core\Form\FormStateInterface;
+use Drupal\Core\Messenger\MessengerInterface;
 use Drupal\Core\Session\AccountInterface;
 use Drupal\Core\Url;
 use Drupal\islandora\IslandoraUtils;
@@ -42,6 +43,13 @@ class AbstractGenerateDerivative extends EmitEvent {
    */
   protected $token;
 
+  /**
+   * The messenger.
+   *
+   * @var \Drupal\Core\Messenger\MessengerInterface
+   */
+  protected $messenger;
+
   /**
    * Constructs a EmitEvent action.
    *
@@ -67,6 +75,8 @@ class AbstractGenerateDerivative extends EmitEvent {
    *   Media source service.
    * @param \Drupal\token\TokenInterface $token
    *   Token service.
+   * @param \Drupal\Core\Messenger\MessengerInterface $messenger
+   *   The messenger.
    */
   public function __construct(
     array $configuration,
@@ -79,7 +89,8 @@ class AbstractGenerateDerivative extends EmitEvent {
     JwtAuth $auth,
     IslandoraUtils $utils,
     MediaSourceService $media_source,
-    TokenInterface $token
+    TokenInterface $token,
+    MessengerInterface $messenger
   ) {
     parent::__construct(
       $configuration,
@@ -89,11 +100,13 @@ class AbstractGenerateDerivative extends EmitEvent {
       $entity_type_manager,
       $event_generator,
       $stomp,
-      $auth
+      $auth,
+      $messenger
     );
     $this->utils = $utils;
     $this->mediaSource = $media_source;
     $this->token = $token;
+    $this->messenger = $messenger;
   }
 
   /**
@@ -111,7 +124,8 @@ class AbstractGenerateDerivative extends EmitEvent {
       $container->get('jwt.authentication.jwt'),
       $container->get('islandora.utils'),
       $container->get('islandora.media_source_service'),
-      $container->get('token')
+      $container->get('token'),
+      $container->get('messenger')
     );
   }
 
@@ -127,7 +141,7 @@ class AbstractGenerateDerivative extends EmitEvent {
       'mimetype' => '',
       'args' => '',
       'destination_media_type' => '',
-      'scheme' => file_default_scheme(),
+      'scheme' => \Drupal::config('system.file')->get('default_scheme'),
       'path' => '[date:custom:Y]-[date:custom:m]/[node:nid].bin',
     ];
   }

src/Plugin/Action/AbstractGenerateDerivativeMediaFile.php

@@ -6,6 +6,7 @@ use Drupal\Core\Entity\EntityFieldManagerInterface;
 use Drupal\Core\Entity\EntityInterface;
 use Drupal\Core\Entity\EntityTypeManager;
 use Drupal\Core\Form\FormStateInterface;
+use Drupal\Core\Messenger\MessengerInterface;
 use Drupal\Core\Session\AccountInterface;
 use Drupal\Core\Url;
 use Drupal\islandora\EventGenerator\EmitEvent;
@@ -56,6 +57,13 @@ class AbstractGenerateDerivativeMediaFile extends EmitEvent {
    */
   protected $entityFieldManager;
 
+  /**
+   * The messenger.
+   *
+   * @var \Drupal\Core\Messenger\MessengerInterface
+   */
+  protected $messenger;
+
   /**
    * Constructs a EmitEvent action.
    *
@@ -83,6 +91,8 @@ class AbstractGenerateDerivativeMediaFile extends EmitEvent {
    *   Token service.
    * @param \Drupal\Core\Entity\EntityFieldManagerInterface $entity_field_manager
    *   Field Manager service.
+   * @param \Drupal\Core\Messenger\MessengerInterface $messenger
+   *   The messenger.
    */
   public function __construct(
     array $configuration,
@@ -96,7 +106,8 @@ class AbstractGenerateDerivativeMediaFile extends EmitEvent {
     IslandoraUtils $utils,
     MediaSourceService $media_source,
     Token $token,
-    EntityFieldManagerInterface $entity_field_manager
+    EntityFieldManagerInterface $entity_field_manager,
+    MessengerInterface $messenger
   ) {
     parent::__construct(
       $configuration,
@@ -106,12 +117,14 @@ class AbstractGenerateDerivativeMediaFile extends EmitEvent {
       $entity_type_manager,
       $event_generator,
       $stomp,
-      $auth
+      $auth,
+      $messenger
     );
     $this->utils = $utils;
     $this->mediaSource = $media_source;
     $this->token = $token;
     $this->entityFieldManager = $entity_field_manager;
+    $this->messenger = $messenger;
   }
 
   /**
@@ -130,7 +143,8 @@ class AbstractGenerateDerivativeMediaFile extends EmitEvent {
       $container->get('islandora.utils'),
       $container->get('islandora.media_source_service'),
       $container->get('token'),
-      $container->get('entity_field.manager')
+      $container->get('entity_field.manager'),
+      $container->get('messenger')
     );
   }
 

src/Plugin/Action/EmitFileEvent.php

@@ -5,8 +5,10 @@ namespace Drupal\islandora\Plugin\Action;
 use Drupal\Core\Entity\EntityInterface;
 use Drupal\Core\Entity\EntityTypeManagerInterface;
 use Drupal\Core\File\FileSystemInterface;
+use Drupal\Core\Messenger\MessengerInterface;
 use Drupal\Core\Session\AccountInterface;
 use Drupal\Core\Site\Settings;
+use Drupal\Core\StreamWrapper\StreamWrapperManager;
 use Drupal\jwt\Authentication\Provider\JwtAuth;
 use Drupal\islandora\EventGenerator\EmitEvent;
 use Drupal\islandora\EventGenerator\EventGeneratorInterface;
@@ -52,6 +54,8 @@ class EmitFileEvent extends EmitEvent {
    *   JWT Auth client.
    * @param \Drupal\Core\File\FileSystemInterface $file_system
    *   File system service.
+   * @param \Drupal\Core\Messenger\MessengerInterface $messenger
+   *   The messenger.
    */
   public function __construct(
     array $configuration,
@@ -62,7 +66,8 @@ class EmitFileEvent extends EmitEvent {
     EventGeneratorInterface $event_generator,
     StatefulStomp $stomp,
     JwtAuth $auth,
-    FileSystemInterface $file_system
+    FileSystemInterface $file_system,
+    MessengerInterface $messenger
   ) {
     parent::__construct(
       $configuration,
@@ -72,7 +77,8 @@ class EmitFileEvent extends EmitEvent {
       $entity_type_manager,
       $event_generator,
       $stomp,
-      $auth
+      $auth,
+      $messenger
     );
     $this->fileSystem = $file_system;
   }
@@ -90,7 +96,8 @@ class EmitFileEvent extends EmitEvent {
       $container->get('islandora.eventgenerator'),
       $container->get('islandora.stomp'),
       $container->get('jwt.authentication.jwt'),
-      $container->get('file_system')
+      $container->get('file_system'),
+      $container->get('messenger')
     );
   }
 
@@ -99,7 +106,7 @@ class EmitFileEvent extends EmitEvent {
    */
   protected function generateData(EntityInterface $entity) {
     $uri = $entity->getFileUri();
-    $scheme = $this->fileSystem->uriScheme($uri);
+    $scheme = StreamWrapperManager::getScheme($uri);
     $flysystem_config = Settings::get('flysystem');
 
     $data = parent::generateData($entity);

src/Plugin/Action/EmitMediaEvent.php

@@ -4,6 +4,7 @@ namespace Drupal\islandora\Plugin\Action;
 
 use Drupal\Core\Entity\EntityInterface;
 use Drupal\Core\Entity\EntityTypeManagerInterface;
+use Drupal\Core\Messenger\MessengerInterface;
 use Drupal\Core\Session\AccountInterface;
 use Drupal\jwt\Authentication\Provider\JwtAuth;
 use Drupal\islandora\EventGenerator\EmitEvent;
@@ -51,6 +52,8 @@ class EmitMediaEvent extends EmitEvent {
    *   JWT Auth client.
    * @param \Drupal\islandora\MediaSource\MediaSourceService $media_source
    *   Media source service.
+   * @param \Drupal\Core\Messenger\MessengerInterface $messenger
+   *   The messenger.
    */
   public function __construct(
     array $configuration,
@@ -61,7 +64,8 @@ class EmitMediaEvent extends EmitEvent {
     EventGeneratorInterface $event_generator,
     StatefulStomp $stomp,
     JwtAuth $auth,
-    MediaSourceService $media_source
+    MediaSourceService $media_source,
+    MessengerInterface $messenger
   ) {
     parent::__construct(
       $configuration,
@@ -71,7 +75,8 @@ class EmitMediaEvent extends EmitEvent {
       $entity_type_manager,
       $event_generator,
       $stomp,
-      $auth
+      $auth,
+      $messenger
     );
     $this->mediaSource = $media_source;
   }
@@ -89,7 +94,8 @@ class EmitMediaEvent extends EmitEvent {
       $container->get('islandora.eventgenerator'),
       $container->get('islandora.stomp'),
       $container->get('jwt.authentication.jwt'),
-      $container->get('islandora.media_source_service')
+      $container->get('islandora.media_source_service'),
+      $container->get('messenger')
     );
   }
 

src/Plugin/Condition/FileUsesFilesystem.php

@@ -6,6 +6,7 @@ use Drupal\Core\Condition\ConditionPluginBase;
 use Drupal\Core\File\FileSystemInterface;
 use Drupal\Core\Form\FormStateInterface;
 use Drupal\Core\Plugin\ContainerFactoryPluginInterface;
+use Drupal\Core\StreamWrapper\StreamWrapperManager;
 use Drupal\file\FileInterface;
 use Drupal\islandora\IslandoraUtils;
 use Symfony\Component\DependencyInjection\ContainerInterface;
@@ -151,7 +152,7 @@ class FileUsesFilesystem extends ConditionPluginBase implements ContainerFactory
    */
   protected function evaluateFile(FileInterface $file) {
     $uri = $file->getFileUri();
-    $scheme = $this->fileSystem->uriScheme($uri);
+    $scheme = StreamWrapperManager::getScheme($uri);
     return !empty($this->configuration['filesystems'][$scheme]);
   }
 

src/Plugin/Field/FieldFormatter/IslandoraImageFormatter.php

@@ -124,7 +124,7 @@ class IslandoraImageFormatter extends ImageFormatter {
       return $elements;
     }
 
-    $url = $node->urlInfo();
+    $url = $node->toUrl()->toString();
 
     foreach ($elements as &$element) {
       $element['#url'] = $url;