kitodo / kitodo-presentation

Classes/Common/Solr/SolrSearch.php

Indentation +2 added lines, -2 removed lines

@@ -365,8 +365,8 @@
                                 $searchResult['snippet'] = $doc['snippet'];
                                 $searchResult['highlight'] = $doc['highlight'];
                                 $searchResult['highlight_word'] = preg_replace('/^;|;$/', '',       // remove ; at beginning or end
-                                                                  preg_replace('/;+/', ';',         // replace any multiple of ; with a single ;
-                                                                  preg_replace('/[{~\d*}{\s+}{^=*\d+.*\d*}`~!@#$%\^&*()_|+-=?;:\'",.<>\{\}\[\]\\\]/', ';', $this->searchParams['query']))); // replace search operators and special characters with ;
+                                                                    preg_replace('/;+/', ';',         // replace any multiple of ; with a single ;
+                                                                    preg_replace('/[{~\d*}{\s+}{^=*\d+.*\d*}`~!@#$%\^&*()_|+-=?;:\'",.<>\{\}\[\]\\\]/', ';', $this->searchParams['query']))); // replace search operators and special characters with ;
                             }
                             $documents[$doc['uid']]['searchResults'][] = $searchResult;
                         }

Spacing +6 added lines, -6 removed lines

@@ -247,7 +247,7 @@ 
         // Add filter query for date search
         if (!empty($this->searchParams['dateFrom']) && !empty($this->searchParams['dateTo'])) {
             // combine dateFrom and dateTo into range search
-            $params['filterquery'][]['query'] = '{!join from=' . $fields['uid'] . ' to=' . $fields['uid'] . '}'. $fields['date'] . ':[' . $this->searchParams['dateFrom'] . ' TO ' . $this->searchParams['dateTo'] . ']';
+            $params['filterquery'][]['query'] = '{!join from=' . $fields['uid'] . ' to=' . $fields['uid'] . '}' . $fields['date'] . ':[' . $this->searchParams['dateFrom'] . ' TO ' . $this->searchParams['dateTo'] . ']';
         }
 
         // Add filter query for faceting.
@@ -279,7 +279,7 @@ 
             foreach ($this->collection as $collectionEntry) {
                 // check for virtual collections query string
                 if ($collectionEntry->getIndexSearch()) {
-                    $virtualCollectionsQueryString .= empty($virtualCollectionsQueryString) ? '(' . $collectionEntry->getIndexSearch() . ')' : ' OR ('. $collectionEntry->getIndexSearch() . ')' ;
+                    $virtualCollectionsQueryString .= empty($virtualCollectionsQueryString) ? '(' . $collectionEntry->getIndexSearch() . ')' : ' OR (' . $collectionEntry->getIndexSearch() . ')';
                 } else {
                     $collectionsQueryString .= empty($collectionsQueryString) ? '"' . $collectionEntry->getIndexName() . '"' : ' OR "' . $collectionEntry->getIndexName() . '"';
                 }
@@ -399,8 +399,8 @@ 
                             if ($this->searchParams['fulltext'] == '1') {
                                 $searchResult['snippet'] = $doc['snippet'];
                                 $searchResult['highlight'] = $doc['highlight'];
-                                $searchResult['highlight_word'] = preg_replace('/^;|;$/', '',       // remove ; at beginning or end
-                                                                  preg_replace('/;+/', ';',         // replace any multiple of ; with a single ;
+                                $searchResult['highlight_word'] = preg_replace('/^;|;$/', '', // remove ; at beginning or end
+                                                                  preg_replace('/;+/', ';', // replace any multiple of ; with a single ;
                                                                   preg_replace('/[{~\d*}{\s+}{^=*\d+.*\d*}`~!@#$%\^&*()_|+-=?;:\'",.<>\{\}\[\]\\\]/', ';', $this->searchParams['query']))); // replace search operators and special characters with ;
                             }
                             $documents[$doc['uid']]['searchResults'][] = $searchResult;
@@ -478,8 +478,8 @@ 
 
         foreach ($result['documents'] as $doc) {
             // translate language code if applicable
-            if($doc['metadata']['language']) {
-                foreach($doc['metadata']['language'] as $indexName => $language) {
+            if ($doc['metadata']['language']) {
+                foreach ($doc['metadata']['language'] as $indexName => $language) {
                     $doc['metadata']['language'][$indexName] = Helper::getLanguageName($doc['metadata']['language'][$indexName]);
                 }
             }

Braces +2 added lines, -1 removed lines

@@ -590,7 +590,8 @@
         return $resultSet;
     }
 
-    private function getDocument($record, $highlighting, $fields, $parameters) {
+    private function getDocument($record, $highlighting, $fields, $parameters)
+    {
         $resultDocument = new ResultDocument($record, $highlighting, $fields);
 
         $document = [

Classes/Controller/ToolboxController.php

Braces +6 added lines, -3 removed lines

@@ -60,7 +60,8 @@ 
      *
      * @return void
      */
-    private function renderTool() {
+    private function renderTool()
+    {
         if (!empty($this->settings['tool'])) {
             switch ($this->settings['tool']) {
                 case 'tx_dlf_annotationtool':
@@ -104,7 +105,8 @@ 
      *
      * @return void
      */
-    private function renderToolByName(string $tool) {
+    private function renderToolByName(string $tool)
+    {
         $this->$tool();
         $this->view->assign($tool, true);
     }
@@ -474,7 +476,8 @@ 
      *
      * @return bool true if empty, false otherwise
      */
-    private function isFullTextEmpty() {
+    private function isFullTextEmpty()
+    {
         $fileGrpsFulltext = GeneralUtility::trimExplode(',', $this->extConf['fileGrpFulltext']);
         while ($fileGrpFulltext = array_shift($fileGrpsFulltext)) {
             $fullTextFile = $this->doc->physicalStructureInfo[$this->doc->physicalStructure[$this->requestData['page']]]['files'][$fileGrpFulltext];

Classes/Controller/TableOfContentsController.php

Spacing +2 added lines, -2 removed lines

@@ -315,7 +315,7 @@ 
                 }
             }
         }
-        return $entry['label'] ?: $entry['orderlabel'];
+        return $entry['label'] ? : $entry['orderlabel'];
     }
 
     /**
@@ -346,7 +346,7 @@ 
      * @return void
      */
     private function sortSubMenu(&$menu) {
-        usort($menu[0]['_SUB_MENU'], function ($firstElement, $secondElement) {
+        usort($menu[0]['_SUB_MENU'], function($firstElement, $secondElement) {
             if (!empty($firstElement['orderlabel'])) {
                 return $firstElement['orderlabel'] <=> $secondElement['orderlabel'];
             }

Braces +14 added lines, -7 removed lines

@@ -239,7 +239,8 @@ 
      *
      * @return void
      */
-    private function getAllLogicalUnits() {
+    private function getAllLogicalUnits()
+    {
         if (
             !empty($this->requestData['page'])
             && !empty($this->document->getCurrentDocument()->physicalStructure)
@@ -265,7 +266,8 @@ 
      *
      * @return string
      */
-    private function getTranslatedType($type) {
+    private function getTranslatedType($type)
+    {
         return Helper::translate($type, 'tx_dlf_structures', $this->settings['storagePid']);
     }
 
@@ -285,7 +287,8 @@ 
      *
      * @return bool
      */
-    private function isMultiElement($type) {
+    private function isMultiElement($type)
+    {
         return $type === 'multivolume_work' || $type === 'multipart_manuscript';
     }
     /**
@@ -297,7 +300,8 @@ 
      *
      * @return string
      */
-    private function setTitle($entry) {
+    private function setTitle($entry)
+    {
         if (empty($entry['label']) && empty($entry['orderlabel'])) {
             foreach ($this->settings['titleReplacements'] as $titleReplacement) {
                 if ($entry['type'] == $titleReplacement['type']) {
@@ -327,7 +331,8 @@ 
      *
      * @return void
      */
-    private function sortMenu(&$menu) {
+    private function sortMenu(&$menu)
+    {
         if ($menu[0]['type'] == $this->getTranslatedType("newspaper")) {
             $this->sortSubMenu($menu);
         }
@@ -345,8 +350,10 @@ 
      *
      * @return void
      */
-    private function sortSubMenu(&$menu) {
-        usort($menu[0]['_SUB_MENU'], function ($firstElement, $secondElement) {
+    private function sortSubMenu(&$menu)
+    {
+        usort($menu[0]['_SUB_MENU'], function ($firstElement, $secondElement)
+        {
             if (!empty($firstElement['orderlabel'])) {
                 return $firstElement['orderlabel'] <=> $secondElement['orderlabel'];
             }

Classes/Controller/NavigationController.php

Braces +2 added lines, -1 removed lines

@@ -28,7 +28,8 @@
      * @param \Kitodo\Dlf\Domain\Model\PageSelectForm|NULL $pageSelectForm
      * @return void
      */
-    public function pageSelectAction(\Kitodo\Dlf\Domain\Model\PageSelectForm $pageSelectForm = NULL) {
+    public function pageSelectAction(\Kitodo\Dlf\Domain\Model\PageSelectForm $pageSelectForm = NULL)
+    {
         if ($pageSelectForm) {
             $uri = $this->uriBuilder->reset()
                 ->setArguments(

Upper-Lower-Casing +1 added lines, -1 removed lines

@@ -28,7 +28,7 @@
      * @param \Kitodo\Dlf\Domain\Model\PageSelectForm|NULL $pageSelectForm
      * @return void
      */
-    public function pageSelectAction(\Kitodo\Dlf\Domain\Model\PageSelectForm $pageSelectForm = NULL) {
+    public function pageSelectAction(\Kitodo\Dlf\Domain\Model\PageSelectForm $pageSelectForm = null) {
         if ($pageSelectForm) {
             $uri = $this->uriBuilder->reset()
                 ->setArguments(

Classes/Common/AbstractDocument.php

Braces +2 added lines, -1 removed lines

@@ -898,7 +898,8 @@
      *
      * @return array
      */
-    protected function initializeMetadata($format) {
+    protected function initializeMetadata($format)
+    {
         return [
             'title' => [],
             'title_sorting' => [],

Classes/Controller/AbstractController.php

Braces +6 added lines, -3 removed lines

@@ -186,7 +186,8 @@ 
      *
      * @return void
      */
-    protected function configureProxyUrl(&$url) {
+    protected function configureProxyUrl(&$url)
+    {
         $this->uriBuilder->reset()
             ->setTargetPageUid($GLOBALS['TSFE']->id)
             ->setCreateAbsoluteUri(!empty($this->settings['forceAbsoluteUrl']))
@@ -283,7 +284,8 @@ 
      *
      * @return void
      */
-    protected function setPage() {
+    protected function setPage()
+    {
         if (!empty($this->requestData['logicalPage'])) {
             $this->requestData['page'] = $this->document->getCurrentDocument()->getPhysicalPage($this->requestData['logicalPage']);
             // The logical page parameter should not appear again
@@ -300,7 +302,8 @@ 
      *
      * @return void
      */
-    protected function setDefaultPage() {
+    protected function setDefaultPage()
+    {
         // Set default values if not set.
         // $this->requestData['page'] may be integer or string (physical structure @ID)
         if (

Classes/Controller/CalendarController.php

Spacing +5 added lines, -5 removed lines

@@ -125,7 +125,7 @@ 
                 foreach ($year['children'] as $month) {
                     foreach ($month['children'] as $day) {
                         foreach ($day['children'] as $issue) {
-                            $title = $issue['label'] ?: $issue['orderlabel'];
+                            $title = $issue['label'] ? : $issue['orderlabel'];
                             if (strtotime($title) !== false) {
                                 $title = strftime('%x', strtotime($title));
                             }
@@ -216,8 +216,8 @@ 
         $this->view->assign('calendarData', $calendarData);
         $this->view->assign('documentId', $this->document->getUid());
         $this->view->assign('yearLinkTitle', $yearLinkTitle);
-        $this->view->assign('parentDocumentId', $this->document->getPartof() ?: $this->document->getCurrentDocument()->tableOfContents[0]['points']);
-        $this->view->assign('allYearDocTitle', $this->document->getCurrentDocument()->getTitle($this->document->getPartof()) ?: $this->document->getCurrentDocument()->tableOfContents[0]['label']);
+        $this->view->assign('parentDocumentId', $this->document->getPartof() ? : $this->document->getCurrentDocument()->tableOfContents[0]['points']);
+        $this->view->assign('allYearDocTitle', $this->document->getCurrentDocument()->getTitle($this->document->getPartof()) ? : $this->document->getCurrentDocument()->tableOfContents[0]['label']);
     }
 
     /**
@@ -253,7 +253,7 @@ 
 
                 if (empty($yearLabel)) {
                     // if neither order nor orderlabel is set, use the id...
-                    $yearLabel = (string)$id;
+                    $yearLabel = (string) $id;
                 }
 
                 $years[] = [
@@ -292,7 +292,7 @@ 
                     if (is_int($key)) {
                         $yearFilled[] = $yearArray[$key];
                     } else {
-                        $yearFilled[] = ['title' => $min+$i, 'documentId' => ''];
+                        $yearFilled[] = ['title' => $min + $i, 'documentId' => ''];
                     }
                 }
                 $yearArray = $yearFilled;

Classes/Middleware/SearchInDocument.php

Indentation +1 added lines, -1 removed lines

@@ -152,7 +152,7 @@
         // field for which highlighting is going to be performed,
         // is required if you want to have OCR highlighting
         $solrRequest->addParam('hl.ocr.fl', $this->fields['fulltext']);
-         // return the coordinates of highlighted search as absolute coordinates
+            // return the coordinates of highlighted search as absolute coordinates
         $solrRequest->addParam('hl.ocr.absoluteHighlights', 'on');
         // max amount of snippets for a single page
         $solrRequest->addParam('hl.snippets', 40);