From ec648e6e155d6173fcd519862d0ddda5adfea8e0 Mon Sep 17 00:00:00 2001 From: Eli Zoller Date: Mon, 30 Nov 2020 06:51:05 -0700 Subject: [PATCH] replace more url() -> toUrl() and remove unused variables --- modules/islandora_iiif/src/Plugin/views/style/IIIFManifest.php | 2 +- src/ContextProvider/MediaRouteContextProvider.php | 1 - src/EventGenerator/EventGenerator.php | 1 - src/EventSubscriber/LinkHeaderSubscriber.php | 1 - src/Form/ConfirmDeleteMediaAndFile.php | 1 - src/Form/IslandoraSettingsForm.php | 1 - src/Plugin/Action/AbstractGenerateDerivativeMediaFile.php | 1 - tests/src/Functional/ContentEntityTypeTest.php | 1 - tests/src/Functional/JsonldSelfReferenceReactionTest.php | 2 +- tests/src/Kernel/FedoraAdapterTest.php | 1 - 10 files changed, 2 insertions(+), 10 deletions(-) diff --git a/modules/islandora_iiif/src/Plugin/views/style/IIIFManifest.php b/modules/islandora_iiif/src/Plugin/views/style/IIIFManifest.php index 257c8a46..be71e0ee 100644 --- a/modules/islandora_iiif/src/Plugin/views/style/IIIFManifest.php +++ b/modules/islandora_iiif/src/Plugin/views/style/IIIFManifest.php @@ -186,7 +186,7 @@ class IIIFManifest extends StylePluginBase { 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->toUrl(); $mime_type = $image->entity->getMimeType(); $iiif_url = rtrim($iiif_address, '/') . '/' . urlencode($file_url); diff --git a/src/ContextProvider/MediaRouteContextProvider.php b/src/ContextProvider/MediaRouteContextProvider.php index c40699f1..4bfb19c7 100644 --- a/src/ContextProvider/MediaRouteContextProvider.php +++ b/src/ContextProvider/MediaRouteContextProvider.php @@ -39,7 +39,6 @@ class MediaRouteContextProvider implements ContextProviderInterface { * {@inheritdoc} */ public function getRuntimeContexts(array $unqualified_context_ids) { - $result = []; $context_definition = EntityContextDefinition::fromEntityTypeId('media')->setLabel(NULL)->setRequired(FALSE); $value = NULL; diff --git a/src/EventGenerator/EventGenerator.php b/src/EventGenerator/EventGenerator.php index 3175c224..b986746d 100644 --- a/src/EventGenerator/EventGenerator.php +++ b/src/EventGenerator/EventGenerator.php @@ -96,7 +96,6 @@ class EventGenerator implements EventGeneratorInterface { $event["target"] = $fedora_url; $entity_type = $entity->getEntityTypeId(); - $event_type = $data["event"]; if ($data["event"] == "Generate Derivative") { $event["type"] = "Activity"; $event["summary"] = $data["event"]; diff --git a/src/EventSubscriber/LinkHeaderSubscriber.php b/src/EventSubscriber/LinkHeaderSubscriber.php index 21311410..ce33ce2e 100644 --- a/src/EventSubscriber/LinkHeaderSubscriber.php +++ b/src/EventSubscriber/LinkHeaderSubscriber.php @@ -263,7 +263,6 @@ abstract class LinkHeaderSubscriber implements EventSubscriberInterface { $current_format = $this->requestStack->getCurrentRequest()->query->get('_format'); $links = []; - $route_name = $this->routeMatch->getRouteName(); if ($rest_resource_config) { $formats = $rest_resource_config->getFormats("GET"); diff --git a/src/Form/ConfirmDeleteMediaAndFile.php b/src/Form/ConfirmDeleteMediaAndFile.php index 04b7d458..64c1bff3 100644 --- a/src/Form/ConfirmDeleteMediaAndFile.php +++ b/src/Form/ConfirmDeleteMediaAndFile.php @@ -127,7 +127,6 @@ class ConfirmDeleteMediaAndFile extends DeleteMultipleForm { } // Check for files. $fields = $this->entityFieldManager->getFieldDefinitions('media', $entity->bundle()); - $files = []; foreach ($fields as $field) { $type = $field->getType(); if ($type == 'file' || $type == 'image') { diff --git a/src/Form/IslandoraSettingsForm.php b/src/Form/IslandoraSettingsForm.php index 72ebf11d..873c1974 100644 --- a/src/Form/IslandoraSettingsForm.php +++ b/src/Form/IslandoraSettingsForm.php @@ -272,7 +272,6 @@ class IslandoraSettingsForm extends ConfigFormBase { $geminiUrlValue = trim($form_state->getValue(self::GEMINI_URL)); if (!empty($geminiUrlValue)) { try { - $geminiUrl = Url::fromUri($geminiUrlValue); $client = GeminiClient::create($geminiUrlValue, $this->logger('islandora')); $client->findByUri('http://example.org'); } diff --git a/src/Plugin/Action/AbstractGenerateDerivativeMediaFile.php b/src/Plugin/Action/AbstractGenerateDerivativeMediaFile.php index d964c562..8dd92032 100644 --- a/src/Plugin/Action/AbstractGenerateDerivativeMediaFile.php +++ b/src/Plugin/Action/AbstractGenerateDerivativeMediaFile.php @@ -273,7 +273,6 @@ class AbstractGenerateDerivativeMediaFile extends EmitEvent { */ public function validateConfigurationForm(array &$form, FormStateInterface $form_state) { parent::validateConfigurationForm($form, $form_state); - $mimetype = $form_state->getValue('mimetype'); $exploded = explode('/', $form_state->getValue('mimetype')); if (count($exploded) != 2) { $form_state->setErrorByName( diff --git a/tests/src/Functional/ContentEntityTypeTest.php b/tests/src/Functional/ContentEntityTypeTest.php index 852e33bf..362ff7fb 100644 --- a/tests/src/Functional/ContentEntityTypeTest.php +++ b/tests/src/Functional/ContentEntityTypeTest.php @@ -48,7 +48,6 @@ class ContentEntityTypeTest extends IslandoraFunctionalTestBase { // Add a new media and confirm Hello World! is not printed to the // screen. - $file = current($this->getTestFiles('file')); $values = [ 'name[0][value]' => 'Test Media', 'files[field_media_file_0]' => __DIR__ . '/../../fixtures/test_file.txt', diff --git a/tests/src/Functional/JsonldSelfReferenceReactionTest.php b/tests/src/Functional/JsonldSelfReferenceReactionTest.php index f3f62ffd..e1c5493c 100644 --- a/tests/src/Functional/JsonldSelfReferenceReactionTest.php +++ b/tests/src/Functional/JsonldSelfReferenceReactionTest.php @@ -153,7 +153,7 @@ class JsonldSelfReferenceReactionTest extends IslandoraFunctionalTestBase { $reaction_id = 'islandora_map_uri_predicate'; list($file, $media) = $this->makeMediaAndFile($account); - $media_url = $media->url('canonical', ['absolute' => TRUE]); + $media_url = $media->toUrl('canonical', ['absolute' => TRUE]); $file_url = $file->createFileUrl(FALSE); $this->drupalGet($media_url); diff --git a/tests/src/Kernel/FedoraAdapterTest.php b/tests/src/Kernel/FedoraAdapterTest.php index 4d75ad07..80cabc24 100644 --- a/tests/src/Kernel/FedoraAdapterTest.php +++ b/tests/src/Kernel/FedoraAdapterTest.php @@ -621,7 +621,6 @@ class FedoraAdapterTest extends IslandoraKernelTestBase { $response = $prophecy->reveal(); $date = new \DateTime(); - $timestamp = $date->format("D, d M Y H:i:s O"); $fedora_prophecy->createVersion('', Argument::any(), NULL, Argument::any())->willReturn($prophecy->reveal());