From a36629890bdfa5004819286cefd5071f9d793724 Mon Sep 17 00:00:00 2001 From: elizoller Date: Thu, 4 Mar 2021 18:24:09 +0000 Subject: [PATCH 1/3] fix for filesysystem interface --- modules/islandora_iiif/src/Plugin/views/style/IIIFManifest.php | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/modules/islandora_iiif/src/Plugin/views/style/IIIFManifest.php b/modules/islandora_iiif/src/Plugin/views/style/IIIFManifest.php index 2479c8395..a171a4db3 100644 --- a/modules/islandora_iiif/src/Plugin/views/style/IIIFManifest.php +++ b/modules/islandora_iiif/src/Plugin/views/style/IIIFManifest.php @@ -11,6 +11,7 @@ use Symfony\Component\HttpFoundation\Request; use Drupal\Core\Config\ImmutableConfig; use Drupal\Core\File\FileSystem; +use Drupal\Core\File\FileSystemInterface; use GuzzleHttp\Client; use GuzzleHttp\Exception\ClientException; use GuzzleHttp\Exception\ConnectException; @@ -85,7 +86,7 @@ class IIIFManifest extends StylePluginBase { /** * {@inheritdoc} */ - public function __construct(array $configuration, $plugin_id, $plugin_definition, SerializerInterface $serializer, Request $request, ImmutableConfig $iiif_config, FileSystem $file_system, Client $http_client, MessengerInterface $messenger) { + public function __construct(array $configuration, $plugin_id, $plugin_definition, SerializerInterface $serializer, Request $request, ImmutableConfig $iiif_config, FileSystemInterface $file_system, Client $http_client, MessengerInterface $messenger) { parent::__construct($configuration, $plugin_id, $plugin_definition); $this->serializer = $serializer; From 301e1a0cc216a3138ccc0da7c131b1cfab5fb162 Mon Sep 17 00:00:00 2001 From: elizoller Date: Thu, 4 Mar 2021 21:09:51 +0000 Subject: [PATCH 2/3] remove unreferenced class --- modules/islandora_iiif/src/Plugin/views/style/IIIFManifest.php | 1 - 1 file changed, 1 deletion(-) diff --git a/modules/islandora_iiif/src/Plugin/views/style/IIIFManifest.php b/modules/islandora_iiif/src/Plugin/views/style/IIIFManifest.php index a171a4db3..073ca04e8 100644 --- a/modules/islandora_iiif/src/Plugin/views/style/IIIFManifest.php +++ b/modules/islandora_iiif/src/Plugin/views/style/IIIFManifest.php @@ -10,7 +10,6 @@ use Symfony\Component\Serializer\SerializerInterface; use Symfony\Component\HttpFoundation\Request; use Drupal\Core\Config\ImmutableConfig; -use Drupal\Core\File\FileSystem; use Drupal\Core\File\FileSystemInterface; use GuzzleHttp\Client; use GuzzleHttp\Exception\ClientException; From 71cbda2a9dcbb8e650b2a35f880b2e661cce41dc Mon Sep 17 00:00:00 2001 From: elizoller Date: Fri, 5 Mar 2021 17:31:56 +0000 Subject: [PATCH 3/3] update drupal core to 9.1.5 --- .github/workflows/build-8.x-1.x.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/build-8.x-1.x.yml b/.github/workflows/build-8.x-1.x.yml index 53304b042..5216753b9 100644 --- a/.github/workflows/build-8.x-1.x.yml +++ b/.github/workflows/build-8.x-1.x.yml @@ -23,7 +23,7 @@ jobs: matrix: php-versions: ["7.3", "7.4"] test-suite: ["kernel", "functional", "functional-javascript"] - drupal-version: ["8.9.11", "9.1.1"] + drupal-version: ["8.9.11", "9.1.5"] name: PHP ${{ matrix.php-versions }} drupal ${{ matrix.drupal-version }} test-suite ${{ matrix.test-suite }}