kitodo / kitodo-presentation

Classes/Controller/ToolboxController.php

Braces +4 added lines, -2 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':
@@ -97,7 +98,8 @@ 
      *
      * @return void
      */
-    private function renderToolByName(string $tool) {
+    private function renderToolByName(string $tool)
+    {
         $this->$tool();
         $this->view->assign($tool, true);
     }

Classes/Controller/AbstractController.php

Braces +6 added lines, -3 removed lines

@@ -185,7 +185,8 @@ 
      *
      * @return void
      */
-    protected function configureProxyUrl(&$url) {
+    protected function configureProxyUrl(&$url)
+    {
         $this->uriBuilder->reset()
             ->setTargetPageUid($GLOBALS['TSFE']->id)
             ->setCreateAbsoluteUri(!empty($this->settings['forceAbsoluteUrl']))
@@ -282,7 +283,8 @@ 
      *
      * @return void
      */
-    protected function setPage() {
+    protected function setPage()
+    {
         if (!empty($this->requestData['logicalPage'])) {
             $this->requestData['page'] = $this->document->getDoc()->getPhysicalPage($this->requestData['logicalPage']);
             // The logical page parameter should not appear again
@@ -299,7 +301,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/TableOfContentsController.php

Spacing +1 added lines, -1 removed lines

@@ -269,7 +269,7 @@
      * @return void
      */
     private function sortMenuForNewspapers(&$menu) {
-        usort($menu[0]['_SUB_MENU'], function ($firstYear, $secondYear) {
+        usort($menu[0]['_SUB_MENU'], function($firstYear, $secondYear) {
             return $firstYear['orderlabel'] <=> $secondYear['orderlabel'];
         });
     }

Braces +8 added lines, -4 removed lines

@@ -245,7 +245,8 @@ 
      * @param array $type
      * @return string
      */
-    private function getTranslatedType($type) {
+    private function getTranslatedType($type)
+    {
         return Helper::translate($type, 'tx_dlf_structures', $this->settings['storagePid']);
     }
 
@@ -256,7 +257,8 @@ 
      * @param array &$menu
      * @return void
      */
-    private function sortMenu(&$menu) {
+    private function sortMenu(&$menu)
+    {
         if ($menu[0]['type'] == $this->getTranslatedType("newspaper")) {
             $this->sortMenuForNewspapers($menu);
         }
@@ -268,8 +270,10 @@ 
      * @param array &$menu
      * @return void
      */
-    private function sortMenuForNewspapers(&$menu) {
-        usort($menu[0]['_SUB_MENU'], function ($firstYear, $secondYear) {
+    private function sortMenuForNewspapers(&$menu)
+    {
+        usort($menu[0]['_SUB_MENU'], function ($firstYear, $secondYear)
+        {
             return $firstYear['orderlabel'] <=> $secondYear['orderlabel'];
         });
     }

Classes/Common/Indexer.php

Spacing +3 added lines, -3 removed lines

@@ -337,7 +337,7 @@ 
             $solrDoc->setField('title', $metadata['title'][0], self::$fields['fieldboost']['title']);
             $solrDoc->setField('volume', $metadata['volume'][0], self::$fields['fieldboost']['volume']);
             // verify date formatting
-            if(strtotime($metadata['date'][0])) {
+            if (strtotime($metadata['date'][0])) {
                 // do not alter dates YYYY or YYYY-MM or YYYY-MM-DD
                 if (
                     preg_match("/^[\d]{4}$/", $metadata['date'][0])
@@ -346,7 +346,7 @@ 
                 ) {
                     $solrDoc->setField('date', $metadata['date'][0]);
                 // change date YYYYMMDD to YYYY-MM-DD
-                } elseif (preg_match("/^[\d]{8}$/", $metadata['date'][0])){
+                } elseif (preg_match("/^[\d]{8}$/", $metadata['date'][0])) {
                     $solrDoc->setField('date', date("Y-m-d", strtotime($metadata['date'][0])));
                 // convert any datetime to proper ISO extended datetime format and timezone for SOLR
                 } elseif (preg_match("/^[0-9]{4}-[0-9]{2}-[0-9]{2}T.*$/", $metadata['date'][0])) {
@@ -483,7 +483,7 @@ 
                         !empty($data)
                         && substr($index_name, -8) == '_sorting'
                     ) {
-                        $solrDoc->setField($index_name , $doc->metadataArray[$doc->toplevelId][$index_name]);
+                        $solrDoc->setField($index_name, $doc->metadataArray[$doc->toplevelId][$index_name]);
                     }
                 }
             }

Braces +5 added lines, -3 removed lines

@@ -346,7 +346,7 @@ 
                 ) {
                     $solrDoc->setField('date', $metadata['date'][0]);
                 // change date YYYYMMDD to YYYY-MM-DD
-                } elseif (preg_match("/^[\d]{8}$/", $metadata['date'][0])){
+                } elseif (preg_match("/^[\d]{8}$/", $metadata['date'][0])) {
                     $solrDoc->setField('date', date("Y-m-d", strtotime($metadata['date'][0])));
                 // convert any datetime to proper ISO extended datetime format and timezone for SOLR
                 } elseif (preg_match("/^[0-9]{4}-[0-9]{2}-[0-9]{2}T.*$/", $metadata['date'][0])) {
@@ -555,7 +555,8 @@ 
      *
      * @return \Solarium\Core\Query\DocumentInterface
      */
-    private static function getSolrDocument($updateQuery, $document, $unit, $fullText = '') {
+    private static function getSolrDocument($updateQuery, $document, $unit, $fullText = '')
+    {
         $solrDoc = $updateQuery->createDocument();
         // Create unique identifier from document's UID and unit's XML ID.
         $solrDoc->setField('id', $document->getUid() . $unit['id']);
@@ -579,7 +580,8 @@ 
      *
      * @return array|string
      */
-    private static function removeAppendsFromAuthor($authors) {
+    private static function removeAppendsFromAuthor($authors)
+    {
         if (is_array($authors)) {
             foreach ($authors as $i => $author) {
                 $splitName = explode(chr(31), $author);

Classes/Common/Doc.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/Common/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 +12 added lines, -12 removed lines

@@ -212,7 +212,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.
@@ -243,16 +243,16 @@ 
             $virtualCollectionsQueryString = '';
             foreach ($this->collection as $collectionEntry) {
                 // check for virtual collections query string
-                if($collectionEntry->getIndexSearch()) {
-                    $virtualCollectionsQueryString .= empty($virtualCollectionsQueryString) ? '(' . $collectionEntry->getIndexSearch() . ')' : ' OR ('. $collectionEntry->getIndexSearch() . ')' ;
+                if ($collectionEntry->getIndexSearch()) {
+                    $virtualCollectionsQueryString .= empty($virtualCollectionsQueryString) ? '(' . $collectionEntry->getIndexSearch() . ')' : ' OR (' . $collectionEntry->getIndexSearch() . ')';
                 } else {
                     $collectionsQueryString .= empty($collectionsQueryString) ? '"' . $collectionEntry->getIndexName() . '"' : ' OR "' . $collectionEntry->getIndexName() . '"';
                 }
             }
             
             // distinguish between simple collection browsing and actual searching within the collection(s)
-            if(!empty($collectionsQueryString)) {
-                if(empty($query)) {
+            if (!empty($collectionsQueryString)) {
+                if (empty($query)) {
                     $collectionsQueryString = '(collection_faceting:(' . $collectionsQueryString . ') AND toplevel:true AND partof:0)';
                 } else {
                     $collectionsQueryString = '(collection_faceting:(' . $collectionsQueryString . '))';
@@ -260,7 +260,7 @@ 
             }
 
             // virtual collections might query documents that are neither toplevel:true nor partof:0 and need to be searched separatly
-            if(!empty($virtualCollectionsQueryString)) {
+            if (!empty($virtualCollectionsQueryString)) {
                 $virtualCollectionsQueryString = '(' . $virtualCollectionsQueryString . ')';
             }
 
@@ -339,8 +339,8 @@ 
                 }
                 if ($documents[$doc['uid']]) {
                     // 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]);
                         }
                     }
@@ -364,8 +364,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;
@@ -442,8 +442,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]);
                 }
             }

Classes/Controller/SearchController.php

Spacing +1 added lines, -1 removed lines

@@ -102,7 +102,7 @@
         $listRequestData = GeneralUtility::_GPmerged('tx_dlf_listview');
 
         if (isset($listRequestData['searchParameter']) && is_array($listRequestData['searchParameter'])) {
-            $this->searchParams = array_merge($this->searchParams ?: [], $listRequestData['searchParameter']);
+            $this->searchParams = array_merge($this->searchParams ? : [], $listRequestData['searchParameter']);
             $listViewSearch = true;
             $GLOBALS['TSFE']->fe_user->setKey('ses', 'search', $this->searchParams);
         }

Braces +4 added lines, -2 removed lines

@@ -358,7 +358,8 @@ 
      *
      * @return string The collection query string
      */
-    private function addCollectionsQuery($query) {
+    private function addCollectionsQuery($query)
+    {
         // if collections are given, we prepare the collections query string
         // extract collections from collection parameter
         $collections = null;
@@ -453,7 +454,8 @@ 
      *
      * @return array menu array
      */
-    private function processResults($facet, $facetCollectionArray, $search) {
+    private function processResults($facet, $facetCollectionArray, $search)
+    {
         $menuArray = [];
 
         if ($facet) {