kitodo / kitodo-presentation

Classes/Common/SolrSearch.php

Spacing +10 added lines, -10 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 . ')';
             }
 
@@ -337,8 +337,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]);
                         }
                     }
@@ -438,8 +438,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]);
                 }
             }

Tests/Unit/Format/ModsTest.php

Spacing +12 added lines, -12 removed lines

@@ -50,10 +50,10 @@ 
      */
     public function extractAuthorsIfNoAutRoleTermAssigned(): void
     {
-        $xml = simplexml_load_file( __DIR__ . '/../../Fixtures/Format/modsAuthorNoAutRoleTerm.xml');
+        $xml = simplexml_load_file(__DIR__ . '/../../Fixtures/Format/modsAuthorNoAutRoleTerm.xml');
         $mods = new Mods();
 
-        $mods->extractMetadata($xml,$this->metadata);
+        $mods->extractMetadata($xml, $this->metadata);
 
         $this->assertEquals(
             [
@@ -70,10 +70,10 @@ 
      */
     public function extractAuthorsWithAutRoleTermAssigned(): void
     {
-        $xml = simplexml_load_file( __DIR__ . '/../../Fixtures/Format/modsAuthorWithAutRoleTerm.xml');
+        $xml = simplexml_load_file(__DIR__ . '/../../Fixtures/Format/modsAuthorWithAutRoleTerm.xml');
         $mods = new Mods();
 
-        $mods->extractMetadata($xml,$this->metadata);
+        $mods->extractMetadata($xml, $this->metadata);
         $this->assertEquals(
             [
                 'May, Jack, I',
@@ -92,10 +92,10 @@ 
      */
     public function extractPlaces(): void
     {
-        $xml = simplexml_load_file( __DIR__ . '/../../Fixtures/Format/modsOriginInfo.xml');
+        $xml = simplexml_load_file(__DIR__ . '/../../Fixtures/Format/modsOriginInfo.xml');
         $mods = new Mods();
 
-        $mods->extractMetadata($xml,$this->metadata);
+        $mods->extractMetadata($xml, $this->metadata);
 
         $this->assertEquals(
             [
@@ -121,10 +121,10 @@ 
      */
     public function extractYears(): void
     {
-        $xml = simplexml_load_file( __DIR__ . '/../../Fixtures/Format/modsOriginInfo.xml');
+        $xml = simplexml_load_file(__DIR__ . '/../../Fixtures/Format/modsOriginInfo.xml');
         $mods = new Mods();
 
-        $mods->extractMetadata($xml,$this->metadata);
+        $mods->extractMetadata($xml, $this->metadata);
 
         $this->assertEquals(
             [
@@ -150,10 +150,10 @@ 
      */
     public function extractPlacesWithElectronicEdInside(): void
     {
-        $xml = simplexml_load_file( __DIR__ . '/../../Fixtures/Format/modsOriginInfoWithEditionElectonicEd.xml');
+        $xml = simplexml_load_file(__DIR__ . '/../../Fixtures/Format/modsOriginInfoWithEditionElectonicEd.xml');
         $mods = new Mods();
 
-        $mods->extractMetadata($xml,$this->metadata);
+        $mods->extractMetadata($xml, $this->metadata);
 
         $this->assertEquals(
             [
@@ -179,10 +179,10 @@ 
      */
     public function extractYearsWithElectronicEdInside(): void
     {
-        $xml = simplexml_load_file( __DIR__ . '/../../Fixtures/Format/modsOriginInfoWithEditionElectonicEd.xml');
+        $xml = simplexml_load_file(__DIR__ . '/../../Fixtures/Format/modsOriginInfoWithEditionElectonicEd.xml');
         $mods = new Mods();
 
-        $mods->extractMetadata($xml,$this->metadata);
+        $mods->extractMetadata($xml, $this->metadata);
 
         $this->assertEquals(
             [

Tests/Unit/Format/TeiHeaderTest.php

Spacing +1 added lines, -1 removed lines

@@ -2,7 +2,7 @@
 
 namespace Kitodo\Dlf\Tests\Unit\Format;
 
-use Kitodo\Dlf\Format\TeiHeader ;
+use Kitodo\Dlf\Format\TeiHeader;
 use TYPO3\TestingFramework\Core\Unit\UnitTestCase;
 
 class TeiHeaderTest extends UnitTestCase

Tests/Unit/Format/AudioVideoMDTest.php

Spacing +6 added lines, -6 removed lines

@@ -26,12 +26,12 @@ 
      */
     public function canExtractVideoDuration(): void
     {
-        $xml = simplexml_load_file( __DIR__ . '/../../Fixtures/Format/audioVideo.xml');
+        $xml = simplexml_load_file(__DIR__ . '/../../Fixtures/Format/audioVideo.xml');
         $audioVideoMD = new AudioVideoMD();
 
         $videoXml = $xml->xpath('//videomd:VIDEOMD')[0];
 
-        $audioVideoMD->extractMetadata($videoXml,$this->metadata);
+        $audioVideoMD->extractMetadata($videoXml, $this->metadata);
 
         $this->assertEquals(
             ["00:01:30.07"],
@@ -55,12 +55,12 @@ 
      */
     public function canExtractAudioDuration(): void
     {
-        $xml = simplexml_load_file( __DIR__ . '/../../Fixtures/Format/audioVideo.xml');
+        $xml = simplexml_load_file(__DIR__ . '/../../Fixtures/Format/audioVideo.xml');
         $audioVideoMD = new AudioVideoMD();
 
         $audioXml = $xml->xpath('//audiomd:AUDIOMD')[0];
 
-        $audioVideoMD->extractMetadata($audioXml,$this->metadata);
+        $audioVideoMD->extractMetadata($audioXml, $this->metadata);
 
         $this->assertEquals(
             ["01:10:35.08"],
@@ -84,12 +84,12 @@ 
      */
     public function noDuration(): void
     {
-        $xml = simplexml_load_file( __DIR__ . '/../../Fixtures/Format/audioVideo.xml');
+        $xml = simplexml_load_file(__DIR__ . '/../../Fixtures/Format/audioVideo.xml');
         $audioVideoMD = new AudioVideoMD();
 
         $videoXml = $xml->xpath('//audiomd:AUDIOMD')[1];
 
-        $audioVideoMD->extractMetadata($videoXml,$this->metadata);
+        $audioVideoMD->extractMetadata($videoXml, $this->metadata);
 
         $this->assertEquals(
             [],

Tests/Unit/Format/AltoTest.php

Spacing +5 added lines, -5 removed lines

@@ -13,7 +13,7 @@ 
      */
     public function getRawData(): void
     {
-        $xml = simplexml_load_file( __DIR__ . '/../../Fixtures/Format/alto.xml');
+        $xml = simplexml_load_file(__DIR__ . '/../../Fixtures/Format/alto.xml');
         $alto = new Alto();
 
         $rawText = $alto->getRawText($xml);
@@ -27,7 +27,7 @@ 
      */
     public function getTextAsMiniOcr(): void
     {
-        $xml = simplexml_load_file( __DIR__ . '/../../Fixtures/Format/alto.xml');
+        $xml = simplexml_load_file(__DIR__ . '/../../Fixtures/Format/alto.xml');
         $alto = new Alto();
 
         $rawText = $alto->getTextAsMiniOcr($xml);
@@ -65,7 +65,7 @@ 
      */
     public function getTextAsMiniOcrNoTextBlock(): void
     {
-        $xml = simplexml_load_file( __DIR__ . '/../../Fixtures/Format/altoNoTextBlock.xml');
+        $xml = simplexml_load_file(__DIR__ . '/../../Fixtures/Format/altoNoTextBlock.xml');
         $alto = new Alto();
 
         $rawText = $alto->getTextAsMiniOcr($xml);
@@ -79,7 +79,7 @@ 
      */
     public function getTextAsMiniOcrNoTextline(): void
     {
-        $xml = simplexml_load_file( __DIR__ . '/../../Fixtures/Format/altoNoTextLine.xml');
+        $xml = simplexml_load_file(__DIR__ . '/../../Fixtures/Format/altoNoTextLine.xml');
         $alto = new Alto();
 
         $rawText = $alto->getTextAsMiniOcr($xml);
@@ -93,7 +93,7 @@ 
      */
     public function getTextAsMiniOcrNoString(): void
     {
-        $xml = simplexml_load_file( __DIR__ . '/../../Fixtures/Format/altoNoString.xml');
+        $xml = simplexml_load_file(__DIR__ . '/../../Fixtures/Format/altoNoString.xml');
         $alto = new Alto();
 
         $rawText = $alto->getTextAsMiniOcr($xml);

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
                 } else {
@@ -484,7 +484,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]);
                     }
                 }
             }

Classes/Controller/CalendarController.php

Spacing +5 added lines, -5 removed lines

@@ -127,7 +127,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));
                             }
@@ -218,8 +218,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->getDoc()->tableOfContents[0]['points']);
-        $this->view->assign('allYearDocTitle', $this->document->getDoc()->getTitle($this->document->getPartof()) ?: $this->document->getDoc()->tableOfContents[0]['label']);
+        $this->view->assign('parentDocumentId', $this->document->getPartof() ? : $this->document->getDoc()->tableOfContents[0]['points']);
+        $this->view->assign('allYearDocTitle', $this->document->getDoc()->getTitle($this->document->getPartof()) ? : $this->document->getDoc()->tableOfContents[0]['label']);
     }
 
     /**
@@ -255,7 +255,7 @@ 
 
                 if (empty($yearLabel)) {
                     // if neither order nor orderlabel is set, use the id...
-                    $yearLabel = (string)$id;
+                    $yearLabel = (string) $id;
                 }
 
                 $years[] = [
@@ -294,7 +294,7 @@ 
                     if (is_int($key)) {
                         $yearFilled[] = $yearArray[$key];
                     } else {
-                        $yearFilled[] = ['title' => $min+$i, 'documentId' => ''];
+                        $yearFilled[] = ['title' => $min + $i, 'documentId' => ''];
                     }
                 }
                 $yearArray = $yearFilled;