From 973f1881b40752f97ec314589c938bf57eb0c0ea Mon Sep 17 00:00:00 2001 From: Daniel Berthereau Date: Mon, 19 Nov 2018 00:00:00 +0100 Subject: [PATCH] Fixed with php-cs. --- Module.php | 3 +- data/scripts/upgrade.php | 72 ++++++++++++++++-------- src/Site/BlockLayout/UniversalViewer.php | 7 ++- src/View/Helper/UniversalViewer.php | 9 ++- 4 files changed, 61 insertions(+), 30 deletions(-) diff --git a/Module.php b/Module.php index 2aa2b52..b3f1a6d 100644 --- a/Module.php +++ b/Module.php @@ -64,7 +64,8 @@ public function install(ServiceLocatorInterface $serviceLocator) $t = $serviceLocator->get('MvcTranslator'); throw new ModuleCannotInstallException( $t->translate('The UniversalViewer library should be installed.') // @translate - . ' ' . $t->translate('See module’s installation documentation.')); // @translate + . ' ' . $t->translate('See module’s installation documentation.') // @translate + ); } $this->manageSettings($serviceLocator->get('Omeka\Settings'), 'install'); diff --git a/data/scripts/upgrade.php b/data/scripts/upgrade.php index 1b5cf4c..716a3d7 100644 --- a/data/scripts/upgrade.php +++ b/data/scripts/upgrade.php @@ -26,39 +26,59 @@ $defaultSettings = $config[strtolower(__NAMESPACE__)]['config']; $defaultSiteSettings = $config[strtolower(__NAMESPACE__)]['site_settings']; - $settings->set('universalviewer_manifest_description_property', - @$defaultSettings['universalviewer_manifest_description_property']); + $settings->set( + 'universalviewer_manifest_description_property', + @$defaultSettings['universalviewer_manifest_description_property'] + ); - $settings->set('universalviewer_manifest_attribution_property', - @$defaultSettings['universalviewer_manifest_attribution_property']); + $settings->set( + 'universalviewer_manifest_attribution_property', + @$defaultSettings['universalviewer_manifest_attribution_property'] + ); - $settings->set('universalviewer_manifest_attribution_default', - $settings->get('universalviewer_attribution')); + $settings->set( + 'universalviewer_manifest_attribution_default', + $settings->get('universalviewer_attribution') + ); $settings->delete('universalviewer_attribution'); - $settings->set('universalviewer_manifest_license_property', - @$defaultSettings['universalviewer_manifest_license_property']); + $settings->set( + 'universalviewer_manifest_license_property', + @$defaultSettings['universalviewer_manifest_license_property'] + ); - $settings->set('universalviewer_manifest_license_default', - $settings->get('universalviewer_licence')); + $settings->set( + 'universalviewer_manifest_license_default', + $settings->get('universalviewer_licence') + ); $settings->delete('universalviewer_licence'); - $settings->set('universalviewer_manifest_logo_default', - @$defaultSettings['universalviewer_manifest_logo_default']); + $settings->set( + 'universalviewer_manifest_logo_default', + @$defaultSettings['universalviewer_manifest_logo_default'] + ); - $settings->set('universalviewer_append_item_set_show', - $settings->get('universalviewer_append_collections_show')); + $settings->set( + 'universalviewer_append_item_set_show', + $settings->get('universalviewer_append_collections_show') + ); $settings->delete('universalviewer_append_collections_show'); - $settings->set('universalviewer_append_item_show', - $settings->get('universalviewer_append_items_show')); + $settings->set( + 'universalviewer_append_item_show', + $settings->get('universalviewer_append_items_show') + ); $settings->delete('universalviewer_append_items_show'); - $settings->set('universalviewer_append_item_set_browse', - $defaultSiteSettings['universalviewer_append_item_set_browse']); + $settings->set( + 'universalviewer_append_item_set_browse', + $defaultSiteSettings['universalviewer_append_item_set_browse'] + ); - $settings->set('universalviewer_append_item_browse', - $defaultSiteSettings['universalviewer_append_item_browse']); + $settings->set( + 'universalviewer_append_item_browse', + $defaultSiteSettings['universalviewer_append_item_browse'] + ); $style = $defaultSiteSettings['universalviewer_style']; $width = $settings->get('universalviewer_width') ?: ''; @@ -74,16 +94,20 @@ $settings->delete('universalviewer_width'); $settings->delete('universalviewer_height'); - $settings->set('universalviewer_iiif_max_size', - $settings->get('universalviewer_max_dynamic_size')); + $settings->set( + 'universalviewer_iiif_max_size', + $settings->get('universalviewer_max_dynamic_size') + ); $settings->delete('universalviewer_max_dynamic_size'); } if (version_compare($oldVersion, '3.5', '<=') && version_compare($newVersion, '3.5', '>=') ) { - $settings->set('universalviewer_manifest_property', - $settings->get('universalviewer_alternative_manifest_property')); + $settings->set( + 'universalviewer_manifest_property', + $settings->get('universalviewer_alternative_manifest_property') + ); $oldSettings = [ 'universalviewer_manifest_description_property', diff --git a/src/Site/BlockLayout/UniversalViewer.php b/src/Site/BlockLayout/UniversalViewer.php index a47071a..a7d4fdd 100644 --- a/src/Site/BlockLayout/UniversalViewer.php +++ b/src/Site/BlockLayout/UniversalViewer.php @@ -42,8 +42,11 @@ public function getLabel() return 'Universal Viewer'; // @translate } - public function form(PhpRenderer $view, SiteRepresentation $site, - SitePageRepresentation $page = null, SitePageBlockRepresentation $block = null + public function form( + PhpRenderer $view, + SiteRepresentation $site, + SitePageRepresentation $page = null, + SitePageBlockRepresentation $block = null ) { return $view->blockAttachmentsForm($block); } diff --git a/src/View/Helper/UniversalViewer.php b/src/View/Helper/UniversalViewer.php index 1a1ead2..c33e2d5 100644 --- a/src/View/Helper/UniversalViewer.php +++ b/src/View/Helper/UniversalViewer.php @@ -149,7 +149,8 @@ public function __invoke($resource, $options = []) break; } - $urlManifest = $view->url($route, + $urlManifest = $view->url( + $route, ['id' => $resource->id()], ['force_canonical' => true] ); @@ -229,12 +230,14 @@ protected function render($urlManifest, $options = []) ? $this->basePath($options['config']) : $this->assetPath('universal-viewer/config.json', 'UniversalViewer'); - $html = sprintf('
', + $html = sprintf( + '
', $class, $config, $urlManifest, $locale, - $style); + $style + ); $view->headScript()->appendFile( $view->assetUrl('vendor/uv/lib/embed.js', 'UniversalViewer', false, false), 'application/javascript',