Erikmitk / kitodo-presentation

Classes/Hooks/KitodoProductionHacks.php

Spacing +1 added lines, -1 removed lines

@@ -57,7 +57,7 @@
                 }
                 $dmdIds = explode(' ', $id);
                 foreach ($dmdIds as $dmdId) {
-                    $recordIds = $xml->xpath('//mets:dmdSec[@ID="' . $dmdId . '"]//mods:mods/mods:recordInfo/mods:recordIdentifier');
+                    $recordIds = $xml->xpath('//mets:dmdSec[@ID="'.$dmdId.'"]//mods:mods/mods:recordInfo/mods:recordIdentifier');
                     if (!empty($recordIds)) {
                         $record_id = (string) $recordIds[0];
                         break;

Braces +2 added lines, -4 removed lines

@@ -20,8 +20,7 @@ 
  * @subpackage dlf
  * @access public
  */
-class KitodoProductionHacks
-{
+class KitodoProductionHacks {
     /**
      * Hook for \Kitodo\Dlf\Common\MetsDocument::establishRecordId()
      * When using Kitodo.Production the record identifier is saved only in MODS, but not
@@ -34,8 +33,7 @@ 
      *
      * @return void
      */
-    public function construct_postProcessRecordId(\SimpleXMLElement &$xml, &$record_id)
-    {
+    public function construct_postProcessRecordId(\SimpleXMLElement &$xml, &$record_id) {
         if (!$record_id) {
             $xml->registerXPathNamespace('mods', 'http://www.loc.gov/mods/v3');
             // Get all logical structure nodes with metadata, but without associated METS-Pointers.

Classes/Common/FulltextInterface.php

Braces +1 added lines, -2 removed lines

@@ -21,8 +21,7 @@
  * @access public
  * @abstract
  */
-interface FulltextInterface
-{
+interface FulltextInterface {
     /**
      * This extracts raw fulltext data from XML
      *

Classes/Common/MetadataInterface.php

Braces +1 added lines, -2 removed lines

@@ -21,8 +21,7 @@
  * @access public
  * @abstract
  */
-interface MetadataInterface
-{
+interface MetadataInterface {
     /**
      * This extracts metadata from XML
      *

Classes/Common/IiifUrlReader.php

Braces +3 added lines, -6 removed lines

@@ -25,8 +25,7 @@ 
  * @subpackage dlf
  * @access public
  */
-class IiifUrlReader implements UrlReaderInterface
-{
+class IiifUrlReader implements UrlReaderInterface {
     /**
      * Singleton instance of the class
      *
@@ -40,8 +39,7 @@ 
      * {@inheritDoc}
      * @see \Ubl\Iiif\Tools\UrlReaderInterface::getContent()
      */
-    public function getContent($url)
-    {
+    public function getContent($url) {
         $fileContents = GeneralUtility::getUrl($url);
         if ($fileContents !== false) {
             return $fileContents;
@@ -57,8 +55,7 @@ 
      *
      * @return IiifUrlReader
      */
-    public static function getInstance()
-    {
+    public static function getInstance() {
         if (!isset(self::$instance)) {
             self::$instance = new IiifUrlReader();
         }

Classes/Common/KitodoFlashMessageRenderer.php

Spacing +5 added lines, -5 removed lines

@@ -65,7 +65,7 @@ 
      */
     protected function getClass(FlashMessage $flashMessage): string
     {
-        return 'alert-' . self::$classes[$flashMessage->getSeverity()];
+        return 'alert-'.self::$classes[$flashMessage->getSeverity()];
     }
 
     /**
@@ -95,19 +95,19 @@ 
         $markup[] = '<div class="typo3-messages">';
         foreach ($flashMessages as $flashMessage) {
             $messageTitle = $flashMessage->getTitle();
-            $markup[] = '<div class="alert ' . htmlspecialchars($this->getClass($flashMessage)) . '">';
+            $markup[] = '<div class="alert '.htmlspecialchars($this->getClass($flashMessage)).'">';
             $markup[] = '  <div class="media">';
             $markup[] = '    <div class="media-left">';
             $markup[] = '      <span class="fa-stack fa-lg">';
             $markup[] = '        <i class="fa fa-circle fa-stack-2x"></i>';
-            $markup[] = '        <i class="fa fa-' . htmlspecialchars($this->getIconName($flashMessage)) . ' fa-stack-1x"></i>';
+            $markup[] = '        <i class="fa fa-'.htmlspecialchars($this->getIconName($flashMessage)).' fa-stack-1x"></i>';
             $markup[] = '      </span>';
             $markup[] = '    </div>';
             $markup[] = '    <div class="media-body">';
             if ($messageTitle !== '') {
-                $markup[] = '      <h4 class="alert-title">' . htmlspecialchars($messageTitle) . '</h4>';
+                $markup[] = '      <h4 class="alert-title">'.htmlspecialchars($messageTitle).'</h4>';
             }
-            $markup[] = '      <p class="alert-message">' . $flashMessage->getMessage() . '</p>';
+            $markup[] = '      <p class="alert-message">'.$flashMessage->getMessage().'</p>';
             $markup[] = '    </div>';
             $markup[] = '  </div>';
             $markup[] = '</div>';

Classes/ExpressionLanguage/DocumentTypeProvider.php

Braces +2 added lines, -4 removed lines

@@ -23,10 +23,8 @@
  * @subpackage dlf
  * @access public
  */
-class DocumentTypeProvider extends AbstractProvider
-{
-    public function __construct()
-    {
+class DocumentTypeProvider extends AbstractProvider {
+    public function __construct() {
         $this->expressionLanguageProviders = [
             DocumentTypeFunctionProvider::class
         ];

Classes/Hooks/Form/FieldInformation/SolrCoreStatus.php

Braces +1 added lines, -2 removed lines

@@ -24,8 +24,7 @@
  * @subpackage dlf
  * @access public
  */
-class SolrCoreStatus extends AbstractNode
-{
+class SolrCoreStatus extends AbstractNode {
     /**
      * Shows Solr core status for given 'index_name'
      *

Spacing +1 added lines, -1 removed lines

@@ -55,7 +55,7 @@
                     $uptimeInSeconds = floor($response->getUptime() / 1000);
                     $dateTimeFrom = new \DateTime('@0');
                     $dateTimeTo = new \DateTime("@$uptimeInSeconds");
-                    $uptime = $dateTimeFrom->diff($dateTimeTo)->format('%a ' . Helper::getLanguageService()->getLL('flash.days') . ', %H:%I:%S');
+                    $uptime = $dateTimeFrom->diff($dateTimeTo)->format('%a '.Helper::getLanguageService()->getLL('flash.days').', %H:%I:%S');
                     $numDocuments = $response->getNumberOfDocuments();
                     $startTime = $response->getStartTime() ? strftime('%c', $response->getStartTime()->getTimestamp()) : 'N/A';
                     $lastModified = $response->getLastModified() ? strftime('%c', $response->getLastModified()->getTimestamp()) : 'N/A';

Classes/Hooks/Form/FieldInformation/EditInProductionWarning.php

Braces +1 added lines, -2 removed lines

@@ -23,8 +23,7 @@
  * @subpackage dlf
  * @access public
  */
-class EditInProductionWarning extends AbstractNode
-{
+class EditInProductionWarning extends AbstractNode {
     /**
      * Generates warning message when editing 'index_name' field
      *

Classes/Common/IiifManifest.php

Spacing +6 added lines, -6 removed lines

@@ -694,16 +694,16 @@ 
                     && ($values = $iiifResource->jsonPath($resArray['xpath_sorting']) != null)
                 ) {
                     if (is_string($values)) {
-                        $metadata[$resArray['index_name'] . '_sorting'][0] = [trim((string) $values)];
+                        $metadata[$resArray['index_name'].'_sorting'][0] = [trim((string) $values)];
                     } elseif ($values instanceof JSONPath && is_array($values->data()) && count($values->data()) > 1) {
                         $metadata[$resArray['index_name']] = [];
                         foreach ($values->data() as $value) {
-                            $metadata[$resArray['index_name'] . '_sorting'][0] = trim((string) $value);
+                            $metadata[$resArray['index_name'].'_sorting'][0] = trim((string) $value);
                         }
                     }
                 }
-                if (empty($metadata[$resArray['index_name'] . '_sorting'][0])) {
-                    $metadata[$resArray['index_name'] . '_sorting'][0] = $metadata[$resArray['index_name']][0];
+                if (empty($metadata[$resArray['index_name'].'_sorting'][0])) {
+                    $metadata[$resArray['index_name'].'_sorting'][0] = $metadata[$resArray['index_name']][0];
                 }
             }
         }
@@ -831,7 +831,7 @@ 
                     }
                 }
             } else {
-                $this->logger->warning('Invalid structure resource @id "' . $id . '"');
+                $this->logger->warning('Invalid structure resource @id "'.$id.'"');
                 return $rawText;
             }
             $this->rawTextArray[$id] = $rawText;
@@ -880,7 +880,7 @@ 
                 }
             }
         }
-        $this->logger->error('Could not load IIIF manifest from "' . $location . '"');
+        $this->logger->error('Could not load IIIF manifest from "'.$location.'"');
         return false;
     }
 

Braces +27 added lines, -54 removed lines

@@ -56,8 +56,7 @@ 
  * @property-read string $thumbnail This holds the document's thumbnail location
  * @property-read string $toplevelId This holds the toplevel manifest's @id
  */
-final class IiifManifest extends Doc
-{
+final class IiifManifest extends Doc {
     /**
      * This holds the manifest file as string for serialization purposes
      * @see __sleep() / __wakeup()
@@ -118,8 +117,7 @@ 
      * {@inheritDoc}
      * @see Doc::establishRecordId()
      */
-    protected function establishRecordId($pid)
-    {
+    protected function establishRecordId($pid) {
         if ($this->iiif !== null) {
             /*
              *  FIXME This will not consistently work because we can not be sure to have the pid at hand. It may miss
@@ -174,8 +172,7 @@ 
      * {@inheritDoc}
      * @see Doc::getDocument()
      */
-    protected function getDocument()
-    {
+    protected function getDocument() {
         return $this->iiif;
     }
 
@@ -188,8 +185,7 @@ 
      * @return string 'IIIF1' if the resource is a Metadata API 1 resource, 'IIIF2' / 'IIIF3' if
      * the resource is a Presentation API 2 / 3 resource
      */
-    public function getIiifVersion()
-    {
+    public function getIiifVersion() {
         if (!isset($this->iiifVersion)) {
             if ($this->iiif instanceof AbstractIiifResource1) {
                 $this->iiifVersion = 'IIIF1';
@@ -230,8 +226,7 @@ 
      *
      * @return array|string
      */
-    protected function getUseGroups($use)
-    {
+    protected function getUseGroups($use) {
         if (!$this->useGrpsLoaded) {
             // Get configured USE attributes.
             $extConf = GeneralUtility::makeInstance(ExtensionConfiguration::class)->get(self::$extKey);
@@ -259,8 +254,7 @@ 
      * {@inheritDoc}
      * @see Doc::_getPhysicalStructure()
      */
-    protected function _getPhysicalStructure()
-    {
+    protected function _getPhysicalStructure() {
         // Is there no physical structure array yet?
         if (!$this->physicalStructureLoaded) {
             if ($this->iiif == null || !($this->iiif instanceof ManifestInterface)) {
@@ -373,8 +367,7 @@ 
      * {@inheritDoc}
      * @see Doc::getDownloadLocation()
      */
-    public function getDownloadLocation($id)
-    {
+    public function getDownloadLocation($id) {
         $fileLocation = $this->getFileLocation($id);
         $resource = $this->iiif->getContainedResourceById($fileLocation);
         if ($resource instanceof AbstractImageService) {
@@ -387,8 +380,7 @@ 
      * {@inheritDoc}
      * @see Doc::getFileLocation()
      */
-    public function getFileLocation($id)
-    {
+    public function getFileLocation($id) {
         if ($id == null) {
             return null;
         }
@@ -412,8 +404,7 @@ 
      * {@inheritDoc}
      * @see Doc::getFileMimeType()
      */
-    public function getFileMimeType($id)
-    {
+    public function getFileMimeType($id) {
         $fileResource = $this->iiif->getContainedResourceById($id);
         if ($fileResource instanceof CanvasInterface) {
             $format = "application/vnd.kitodo.iiif";
@@ -438,8 +429,7 @@ 
      * {@inheritDoc}
      * @see Doc::getLogicalStructure()
      */
-    public function getLogicalStructure($id, $recursive = false)
-    {
+    public function getLogicalStructure($id, $recursive = false) {
         $details = [];
         if (!$recursive && !empty($this->logicalUnits[$id])) {
             return $this->logicalUnits[$id];
@@ -474,8 +464,7 @@ 
      * @param array $processedStructures: IIIF resources that already have been processed
      * @return array Logical structure array
      */
-    protected function getLogicalStructureInfo(IiifResourceInterface $resource, $recursive = false, &$processedStructures = [])
-    {
+    protected function getLogicalStructureInfo(IiifResourceInterface $resource, $recursive = false, &$processedStructures = []) {
         $details = [];
         $details['id'] = $resource->getId();
         $details['dmdId'] = '';
@@ -567,8 +556,7 @@ 
      *
      * @todo This method is still in experimental; the method signature may change.
      */
-    public function getManifestMetadata($id, $cPid = 0, $withDescription = true, $withRights = true, $withRelated = true)
-    {
+    public function getManifestMetadata($id, $cPid = 0, $withDescription = true, $withRights = true, $withRelated = true) {
         if (!empty($this->originalMetadataArray[$id])) {
             return $this->originalMetadataArray[$id];
         }
@@ -610,8 +598,7 @@ 
      * {@inheritDoc}
      * @see Doc::getMetadata()
      */
-    public function getMetadata($id, $cPid = 0)
-    {
+    public function getMetadata($id, $cPid = 0) {
         if (!empty($this->metadataArray[$id]) && $this->metadataArray[0] == $cPid) {
             return $this->metadataArray[$id];
         }
@@ -718,8 +705,7 @@ 
      * {@inheritDoc}
      * @see Doc::_getSmLinks()
      */
-    protected function _getSmLinks()
-    {
+    protected function _getSmLinks() {
         if (!$this->smLinksLoaded && isset($this->iiif) && $this->iiif instanceof ManifestInterface) {
             if (!empty($this->iiif->getDefaultCanvases())) {
                 foreach ($this->iiif->getDefaultCanvases() as $canvas) {
@@ -743,8 +729,7 @@ 
      *
      * @param RangeInterface $range: Current range whose canvases shall be linked
      */
-    private function smLinkRangeCanvasesRecursively(RangeInterface $range)
-    {
+    private function smLinkRangeCanvasesRecursively(RangeInterface $range) {
         // map range's canvases including all child ranges' canvases
         if (!$range->isTopRange()) {
             foreach ($range->getAllCanvasesRecursively() as $canvas) {
@@ -767,8 +752,7 @@ 
      * @param CanvasInterface $canvas
      * @param IiifResourceInterface $resource
      */
-    private function smLinkCanvasToResource(CanvasInterface $canvas, IiifResourceInterface $resource)
-    {
+    private function smLinkCanvasToResource(CanvasInterface $canvas, IiifResourceInterface $resource) {
         $this->smLinks['l2p'][$resource->getId()][] = $canvas->getId();
         if (!is_array($this->smLinks['p2l'][$canvas->getId()]) || !in_array($resource->getId(), $this->smLinks['p2l'][$canvas->getId()])) {
             $this->smLinks['p2l'][$canvas->getId()][] = $resource->getId();
@@ -780,8 +764,7 @@ 
      * @see Doc::getFullText()
      */
     //TODO: rewrite it to get full OCR
-    public function getFullText($id)
-    {
+    public function getFullText($id) {
         $rawText = '';
         // Get text from raw text array if available.
         if (!empty($this->rawTextArray[$id])) {
@@ -838,8 +821,7 @@ 
      *
      * @return IiifResourceInterface
      */
-    public function getIiif()
-    {
+    public function getIiif() {
         return $this->iiif;
     }
 
@@ -847,8 +829,7 @@ 
      * {@inheritDoc}
      * @see Doc::init()
      */
-    protected function init($location)
-    {
+    protected function init($location) {
         $this->logger = GeneralUtility::makeInstance(LogManager::class)->getLogger(static::class);
     }
 
@@ -856,8 +837,7 @@ 
      * {@inheritDoc}
      * @see Doc::loadLocation()
      */
-    protected function loadLocation($location)
-    {
+    protected function loadLocation($location) {
         $fileResource = GeneralUtility::getUrl($location);
         if ($fileResource !== false) {
             $conf = GeneralUtility::makeInstance(ExtensionConfiguration::class)->get(self::$extKey);
@@ -880,8 +860,7 @@ 
      * {@inheritDoc}
      * @see \Kitodo\Dlf\Common\Doc::prepareMetadataArray()
      */
-    protected function prepareMetadataArray($cPid)
-    {
+    protected function prepareMetadataArray($cPid) {
         $id = $this->iiif->getId();
         $this->metadataArray[(string) $id] = $this->getMetadata((string) $id, $cPid);
     }
@@ -890,8 +869,7 @@ 
      * {@inheritDoc}
      * @see Doc::setPreloadedDocument()
      */
-    protected function setPreloadedDocument($preloadedDocument)
-    {
+    protected function setPreloadedDocument($preloadedDocument) {
         if ($preloadedDocument instanceof ManifestInterface) {
             $this->iiif = $preloadedDocument;
             return true;
@@ -903,8 +881,7 @@ 
      * {@inheritDoc}
      * @see Docu::ensureHasFulltextIsSet()
      */
-    protected function ensureHasFulltextIsSet()
-    {
+    protected function ensureHasFulltextIsSet() {
         /*
          *  TODO Check annotations and annotation lists of canvas for ALTO documents.
          *  Example:
@@ -950,8 +927,7 @@ 
      * {@inheritDoc}
      * @see \Kitodo\Dlf\Common\Doc::_getThumbnail()
      */
-    protected function _getThumbnail($forceReload = false)
-    {
+    protected function _getThumbnail($forceReload = false) {
         return $this->iiif->getThumbnailUrl();
     }
 
@@ -959,8 +935,7 @@ 
      * {@inheritDoc}
      * @see \Kitodo\Dlf\Common\Doc::_getToplevelId()
      */
-    protected function _getToplevelId()
-    {
+    protected function _getToplevelId() {
         if (empty($this->toplevelId)) {
             if (isset($this->iiif)) {
                 $this->toplevelId = $this->iiif->getId();
@@ -977,8 +952,7 @@ 
      *
      * @return void
      */
-    public function __wakeup()
-    {
+    public function __wakeup() {
         $conf = GeneralUtility::makeInstance(ExtensionConfiguration::class)->get(self::$extKey);
         IiifHelper::setUrlReader(IiifUrlReader::getInstance());
         IiifHelper::setMaxThumbnailHeight($conf['iiifThumbnailHeight']);
@@ -998,8 +972,7 @@ 
      *
      * @return string[]
      */
-    public function __sleep()
-    {
+    public function __sleep() {
         // TODO implement serializiation in IIIF library
         $jsonArray = $this->iiif->getOriginalJsonArray();
         $this->asJson = json_encode($jsonArray);