Erikmitk / kitodo-presentation

Classes/Common/SolrSearch.php

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

@@ -34,7 +34,7 @@ 
      * @param array $searchParams
      * @param QueryResult $listedMetadata
      */
-    public function __construct($documentRepository, $collection, $settings, $searchParams, $listedMetadata = null)
+    public function __construct($documentRepository, $collection, $settings, $searchParams, $listedMetadata = NULL)
     {
         $this->documentRepository = $documentRepository;
         $this->collection = $collection;
@@ -50,7 +50,7 @@ 
 
     public function count()
     {
-        if ($this->result === null) {
+        if ($this->result === NULL) {
             return 0;
         }
 
@@ -91,9 +91,9 @@ 
     public function offsetGet($offset)
     {
         $idx = $this->result['document_keys'][$offset];
-        $document = $this->result['documents'][$idx] ?? null;
+        $document = $this->result['documents'][$idx] ?? NULL;
 
-        if ($document !== null) {
+        if ($document !== NULL) {
             // It may happen that a Solr group only includes non-toplevel results,
             // in which case metadata of toplevel entry isn't yet filled.
             if (empty($document['metadata'])) {
@@ -107,7 +107,7 @@ 
 
             // get title of parent/grandparent/... if empty
             if (empty($document['title']) && $document['partOf'] > 0) {
-                $superiorTitle = Doc::getTitle($document['partOf'], true);
+                $superiorTitle = Doc::getTitle($document['partOf'], TRUE);
                 if (!empty($superiorTitle)) {
                     $document['title'] = '[' . $superiorTitle . ']';
                 }
@@ -180,7 +180,7 @@ 
             if (!empty($this->searchParams['query'])) {
                 $query = $fields['fulltext'] . ':(' . Solr::escapeQuery(trim($this->searchParams['query'])) . ')';
             }
-            $params['fulltext'] = true;
+            $params['fulltext'] = TRUE;
         } else {
             // Retain given search field if valid.
             if (!empty($this->searchParams['query'])) {
@@ -289,17 +289,17 @@ 
         $this->params = $params;
 
         // Send off query to get total number of search results in advance
-        $this->submit(0, 1, false);
+        $this->submit(0, 1, FALSE);
     }
 
-    public function submit($start, $rows, $processResults = true)
+    public function submit($start, $rows, $processResults = TRUE)
     {
         $params = $this->params;
         $params['start'] = $start;
         $params['rows'] = $rows;
 
         // Perform search.
-        $result = $this->searchSolr($params, true);
+        $result = $this->searchSolr($params, TRUE);
 
         // Initialize values
         $documents = [];
@@ -329,7 +329,7 @@ 
                             $doc['metadata']['language'][$indexName] = Helper::getLanguageName($doc['metadata']['language'][$indexName]);
                         }
                     }
-                    if ($doc['toplevel'] === false) {
+                    if ($doc['toplevel'] === FALSE) {
                         // this maybe a chapter, article, ..., year
                         if ($doc['type'] === 'year') {
                             continue;
@@ -353,7 +353,7 @@ 
                             }
                             $documents[$doc['uid']]['searchResults'][] = $searchResult;
                         }
-                    } else if ($doc['toplevel'] === true) {
+                    } else if ($doc['toplevel'] === TRUE) {
                         foreach ($params['listMetadataRecords'] as $indexName => $solrField) {
                             if (isset($doc['metadata'][$indexName])) {
                                 $documents[$doc['uid']]['metadata'][$indexName] = $doc['metadata'][$indexName];
@@ -421,7 +421,7 @@ 
         $params['filterquery'][] = ['query' => 'toplevel:true'];
 
         // Perform search.
-        $result = $this->searchSolr($params, true);
+        $result = $this->searchSolr($params, TRUE);
 
         foreach ($result['documents'] as $doc) {
             // translate language code if applicable
@@ -446,7 +446,7 @@ 
      *
      * @return array The Apache Solr Documents that were fetched
      */
-    protected function searchSolr($parameters = [], $enableCache = true)
+    protected function searchSolr($parameters = [], $enableCache = TRUE)
     {
         // Set query.
         $parameters['query'] = isset($parameters['query']) ? $parameters['query'] : '*';
@@ -465,10 +465,10 @@ 
         }
 
         $cacheIdentifier = '';
-        $cache = null;
+        $cache = NULL;
         // Calculate cache identifier.
-        if ($enableCache === true) {
-            $cacheIdentifier = Helper::digest($solr->core . print_r($parameters, true));
+        if ($enableCache === TRUE) {
+            $cacheIdentifier = Helper::digest($solr->core . print_r($parameters, TRUE));
             $cache = GeneralUtility::makeInstance(CacheManager::class)->getCache('tx_dlf_solr');
         }
         $resultSet = [
@@ -476,22 +476,22 @@ 
             'numberOfToplevels' => 0,
             'numFound' => 0,
         ];
-        if ($enableCache === false || ($entry = $cache->get($cacheIdentifier)) === false) {
+        if ($enableCache === FALSE || ($entry = $cache->get($cacheIdentifier)) === FALSE) {
             $selectQuery = $solr->service->createSelect($parameters);
 
             $grouping = $selectQuery->getGrouping();
             $grouping->addField('uid');
             $grouping->setLimit(100); // Results in group (TODO: check)
-            $grouping->setNumberOfGroups(true);
+            $grouping->setNumberOfGroups(TRUE);
 
-            if ($parameters['fulltext'] === true) {
+            if ($parameters['fulltext'] === TRUE) {
                 // get highlighting component and apply settings
                 $selectQuery->getHighlighting();
             }
 
             $solrRequest = $solr->service->createRequest($selectQuery);
 
-            if ($parameters['fulltext'] === true) {
+            if ($parameters['fulltext'] === TRUE) {
                 // If it is a fulltext search, enable highlighting.
                 // field for which highlighting is going to be performed,
                 // is required if you want to have OCR highlighting
@@ -512,7 +512,7 @@ 
             $resultSet['numberOfToplevels'] = $uidGroup->getNumberOfGroups();
             $resultSet['numFound'] = $uidGroup->getMatches();
             $highlighting = [];
-            if ($parameters['fulltext'] === true) {
+            if ($parameters['fulltext'] === TRUE) {
                 $data = $result->getData();
                 $highlighting = $data['ocrHighlighting'];
             }
@@ -543,7 +543,7 @@ 
             }
 
             // Save value in cache.
-            if (!empty($resultSet) && $enableCache === true) {
+            if (!empty($resultSet) && $enableCache === TRUE) {
                 $cache->set($cacheIdentifier, $resultSet);
             }
         } else {

Spacing +32 added lines, -32 removed lines

@@ -98,7 +98,7 @@ 
             // in which case metadata of toplevel entry isn't yet filled.
             if (empty($document['metadata'])) {
                 $document['metadata'] = $this->fetchToplevelMetadataFromSolr([
-                    'query' => 'uid:' . $document['uid'],
+                    'query' => 'uid:'.$document['uid'],
                     'start' => 0,
                     'rows' => 1,
                     'sort' => ['score' => 'desc'],
@@ -109,7 +109,7 @@ 
             if (empty($document['title']) && $document['partOf'] > 0) {
                 $superiorTitle = Doc::getTitle($document['partOf'], true);
                 if (!empty($superiorTitle)) {
-                    $document['title'] = '[' . $superiorTitle . ']';
+                    $document['title'] = '['.$superiorTitle.']';
                 }
             }
         }
@@ -172,13 +172,13 @@ 
         // Set search query.
         if (
             (!empty($this->searchParams['fulltext']))
-            || preg_match('/' . $fields['fulltext'] . ':\((.*)\)/', trim($this->searchParams['query']), $matches)
+            || preg_match('/'.$fields['fulltext'].':\((.*)\)/', trim($this->searchParams['query']), $matches)
         ) {
             // If the query already is a fulltext query e.g using the facets
             $this->searchParams['query'] = empty($matches[1]) ? $this->searchParams['query'] : $matches[1];
             // Search in fulltext field if applicable. Query must not be empty!
             if (!empty($this->searchParams['query'])) {
-                $query = $fields['fulltext'] . ':(' . Solr::escapeQuery(trim($this->searchParams['query'])) . ')';
+                $query = $fields['fulltext'].':('.Solr::escapeQuery(trim($this->searchParams['query'])).')';
             }
             $params['fulltext'] = true;
         } else {
@@ -201,9 +201,9 @@ 
                         in_array($this->searchParams['extOperator'][$i], $allowedOperators)
                     ) {
                         if (!empty($query)) {
-                            $query .= ' ' . $this->searchParams['extOperator'][$i] . ' ';
+                            $query .= ' '.$this->searchParams['extOperator'][$i].' ';
                         }
-                        $query .= Indexer::getIndexFieldName($this->searchParams['extField'][$i], $this->settings['storagePid']) . ':(' . Solr::escapeQuery($this->searchParams['extQuery'][$i]) . ')';
+                        $query .= Indexer::getIndexFieldName($this->searchParams['extField'][$i], $this->settings['storagePid']).':('.Solr::escapeQuery($this->searchParams['extQuery'][$i]).')';
                     }
                 }
             }
@@ -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.
@@ -229,12 +229,12 @@ 
         ) {
             // Search in document and all subordinates (valid for up to three levels of hierarchy).
             $params['filterquery'][]['query'] = '_query_:"{!join from='
-                . $fields['uid'] . ' to=' . $fields['partof'] . '}'
-                . $fields['uid'] . ':{!join from=' . $fields['uid'] . ' to=' . $fields['partof'] . '}'
-                . $fields['uid'] . ':' . $this->searchParams['documentId'] . '"' . ' OR {!join from='
-                . $fields['uid'] . ' to=' . $fields['partof'] . '}'
-                . $fields['uid'] . ':' . $this->searchParams['documentId'] . ' OR '
-                . $fields['uid'] . ':' . $this->searchParams['documentId'];
+                . $fields['uid'].' to='.$fields['partof'].'}'
+                . $fields['uid'].':{!join from='.$fields['uid'].' to='.$fields['partof'].'}'
+                . $fields['uid'].':'.$this->searchParams['documentId'].'"'.' OR {!join from='
+                . $fields['uid'].' to='.$fields['partof'].'}'
+                . $fields['uid'].':'.$this->searchParams['documentId'].' OR '
+                . $fields['uid'].':'.$this->searchParams['documentId'];
         }
 
         // if collections are given, we prepare the collection query string
@@ -243,25 +243,25 @@ 
             $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() . '"';
+                    $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)) {
-                    $collectionsQueryString = '(collection_faceting:(' . $collectionsQueryString . ') AND toplevel:true AND partof:0)';
+            if (!empty($collectionsQueryString)) {
+                if (empty($query)) {
+                    $collectionsQueryString = '(collection_faceting:('.$collectionsQueryString.') AND toplevel:true AND partof:0)';
                 } else {
-                    $collectionsQueryString = '(collection_faceting:(' . $collectionsQueryString . '))';
+                    $collectionsQueryString = '(collection_faceting:('.$collectionsQueryString.'))';
                 }
             }
 
             // virtual collections might query documents that are neither toplevel:true nor partof:0 and need to be searched separatly
-            if(!empty($virtualCollectionsQueryString)) {
-                $virtualCollectionsQueryString = '(' . $virtualCollectionsQueryString . ')';
+            if (!empty($virtualCollectionsQueryString)) {
+                $virtualCollectionsQueryString = '('.$virtualCollectionsQueryString.')';
             }
 
             // combine both querystrings into a single filterquery via OR if both are given, otherwise pass either of those
@@ -294,8 +294,8 @@ 
         if ($this->listedMetadata) {
             foreach ($this->listedMetadata as $metadata) {
                 if ($metadata->getIndexStored() || $metadata->getIndexIndexed()) {
-                    $listMetadataRecord = $metadata->getIndexName() . '_' . ($metadata->getIndexTokenized() ? 't' : 'u') . ($metadata->getIndexStored() ? 's' : 'u') . ($metadata->getIndexIndexed() ? 'i' : 'u');
-                    $params['fields'] .= ',' . $listMetadataRecord;
+                    $listMetadataRecord = $metadata->getIndexName().'_'.($metadata->getIndexTokenized() ? 't' : 'u').($metadata->getIndexStored() ? 's' : 'u').($metadata->getIndexIndexed() ? 'i' : 'u');
+                    $params['fields'] .= ','.$listMetadataRecord;
                     $params['listMetadataRecords'][$metadata->getIndexName()] = $listMetadataRecord;
                 }
             }
@@ -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]);
                         }
                     }
@@ -379,7 +379,7 @@ 
                             $children = $childrenOf[$doc['uid']] ?? [];
                             if (!empty($children)) {
                                 $metadataOf = $this->fetchToplevelMetadataFromSolr([
-                                    'query' => 'partof:' . $doc['uid'],
+                                    'query' => 'partof:'.$doc['uid'],
                                     'start' => 0,
                                     'rows' => 100,
                                 ]);
@@ -426,8 +426,8 @@ 
         if ($this->listedMetadata) {
             foreach ($this->listedMetadata as $metadata) {
                 if ($metadata->getIndexStored() || $metadata->getIndexIndexed()) {
-                    $listMetadataRecord = $metadata->getIndexName() . '_' . ($metadata->getIndexTokenized() ? 't' : 'u') . ($metadata->getIndexStored() ? 's' : 'u') . ($metadata->getIndexIndexed() ? 'i' : 'u');
-                    $params['fields'] .= ',' . $listMetadataRecord;
+                    $listMetadataRecord = $metadata->getIndexName().'_'.($metadata->getIndexTokenized() ? 't' : 'u').($metadata->getIndexStored() ? 's' : 'u').($metadata->getIndexIndexed() ? 'i' : 'u');
+                    $params['fields'] .= ','.$listMetadataRecord;
                     $params['listMetadataRecords'][$metadata->getIndexName()] = $listMetadataRecord;
                 }
             }
@@ -440,8 +440,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]);
                 }
             }
@@ -483,7 +483,7 @@ 
         $cache = null;
         // Calculate cache identifier.
         if ($enableCache === true) {
-            $cacheIdentifier = Helper::digest($solr->core . print_r($parameters, true));
+            $cacheIdentifier = Helper::digest($solr->core.print_r($parameters, true));
             $cache = GeneralUtility::makeInstance(CacheManager::class)->getCache('tx_dlf_solr');
         }
         $resultSet = [

Classes/Api/Viaf/Client.php

Spacing +3 added lines, -3 removed lines

@@ -66,7 +66,7 @@ 
     public function __construct($viaf, RequestFactory $requestFactory)
     {
         $this->logger = GeneralUtility::makeInstance(LogManager::class)->getLogger(static::class);
-        $this->viafUrl = 'http://viaf.org/viaf/' . $viaf;
+        $this->viafUrl = 'http://viaf.org/viaf/'.$viaf;
         $this->requestFactory = $requestFactory;
     }
 
@@ -92,7 +92,7 @@ 
         try {
             $response = $this->requestFactory->request($url);
         } catch (\Exception $e) {
-            $this->logger->warning('Could not fetch data from URL "' . $url . '". Error: ' . $e->getMessage() . '.');
+            $this->logger->warning('Could not fetch data from URL "'.$url.'". Error: '.$e->getMessage().'.');
             return false;
         }
         return $response->getBody()->getContents();
@@ -105,6 +105,6 @@ 
      **/
     protected function getApiEndpoint()
     {
-        return $this->viafUrl . '/' . $this->endpoint;
+        return $this->viafUrl.'/'.$this->endpoint;
     }
 }

Braces +4 added lines, -8 removed lines

@@ -25,8 +25,7 @@ 
  * @subpackage dlf
  * @access public
  **/
-class Client
-{
+class Client {
     /**
      * This holds the logger
      *
@@ -63,8 +62,7 @@ 
      * @param RequestFactory $requestFactory a request object to inject
      * @return void
      **/
-    public function __construct($viaf, RequestFactory $requestFactory)
-    {
+    public function __construct($viaf, RequestFactory $requestFactory) {
         $this->logger = GeneralUtility::makeInstance(LogManager::class)->getLogger(static::class);
         $this->viafUrl = 'http://viaf.org/viaf/' . $viaf;
         $this->requestFactory = $requestFactory;
@@ -86,8 +84,7 @@ 
      *
      * @return object|bool
      **/
-    public function getData()
-    {
+    public function getData() {
         $url = $this->getApiEndpoint();
         try {
             $response = $this->requestFactory->request($url);
@@ -103,8 +100,7 @@ 
      *
      * @return string
      **/
-    protected function getApiEndpoint()
-    {
+    protected function getApiEndpoint() {
         return $this->viafUrl . '/' . $this->endpoint;
     }
 }

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

@@ -47,14 +47,14 @@ 
      *
      * @var string
      **/
-    private $viafUrl = null;
+    private $viafUrl = NULL;
 
     /**
      * The request object
      *
      * @var RequestFactoryInterface
      **/
-    private $requestFactory = null;
+    private $requestFactory = NULL;
 
     /**
      * Constructs a new instance
@@ -93,7 +93,7 @@ 
             $response = $this->requestFactory->request($url);
         } catch (\Exception $e) {
             $this->logger->warning('Could not fetch data from URL "' . $url . '". Error: ' . $e->getMessage() . '.');
-            return false;
+            return FALSE;
         }
         return $response->getBody()->getContents();
     }

Classes/Api/Viaf/Profile.php

Braces +6 added lines, -12 removed lines

@@ -25,8 +25,7 @@ 
  * @subpackage dlf
  * @access public
  **/
-class Profile
-{
+class Profile {
     /**
      * This holds the logger
      *
@@ -57,8 +56,7 @@ 
      *
      * @return void
      **/
-    public function __construct($viaf)
-    {
+    public function __construct($viaf) {
         $this->logger = GeneralUtility::makeInstance(LogManager::class)->getLogger(static::class);
         $this->client = new Client($viaf, GeneralUtility::makeInstance(RequestFactory::class));
     }
@@ -68,8 +66,7 @@ 
      *
      * @return array|false
      **/
-    public function getData()
-    {
+    public function getData() {
         $this->getRaw();
         if (!empty($this->raw)) {
             $data = [];
@@ -87,8 +84,7 @@ 
      *
      * @return string|false
      **/
-    public function getAddress()
-    {
+    public function getAddress() {
         $this->getRaw();
         if (!empty($this->raw->asXML())) {
             return (string) $this->raw->xpath('./ns1:nationalityOfEntity/ns1:data/ns1:text')[0];
@@ -103,8 +99,7 @@ 
      *
      * @return string|false
      **/
-    public function getFullName()
-    {
+    public function getFullName() {
         $this->getRaw();
         if (!empty($this->raw->asXML())) {
             $rawName = $this->raw->xpath('./ns1:mainHeadings/ns1:data/ns1:text');
@@ -122,8 +117,7 @@ 
      *
      * @return void
      **/
-    protected function getRaw()
-    {
+    protected function getRaw() {
         $data = $this->client->getData();
         if (!isset($this->raw) && $data != false) {
             $this->raw = Helper::getXmlFileAsString($data);

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

@@ -48,7 +48,7 @@ 
      *
      * @var \SimpleXmlElement|false
      **/
-    private $raw = null;
+    private $raw = NULL;
 
     /**
      * Constructs client instance
@@ -78,7 +78,7 @@ 
             return $data;
         } else {
             $this->logger->warning('No data found for given VIAF URL');
-            return false;
+            return FALSE;
         }
     }
 
@@ -94,7 +94,7 @@ 
             return (string) $this->raw->xpath('./ns1:nationalityOfEntity/ns1:data/ns1:text')[0];
         } else {
             $this->logger->warning('No address found for given VIAF URL');
-            return false;
+            return FALSE;
         }
     }
 
@@ -113,7 +113,7 @@ 
             return $name;
         } else {
             $this->logger->warning('No name found for given VIAF URL');
-            return false;
+            return FALSE;
         }
     }
 
@@ -125,7 +125,7 @@ 
     protected function getRaw()
     {
         $data = $this->client->getData();
-        if (!isset($this->raw) && $data != false) {
+        if (!isset($this->raw) && $data != FALSE) {
             $this->raw = Helper::getXmlFileAsString($data);
             $this->raw->registerXPathNamespace('ns1', 'http://viaf.org/viaf/terms#');
         }

Classes/Controller/MetadataController.php

Spacing +2 added lines, -2 removed lines

@@ -112,7 +112,7 @@ 
             array_unshift($metadata, $data);
         }
         if (empty($metadata)) {
-            $this->logger->warning('No metadata found for document with UID ' . $this->document->getUid());
+            $this->logger->warning('No metadata found for document with UID '.$this->document->getUid());
             return '';
         }
         ksort($metadata);
@@ -215,7 +215,7 @@ 
                         if (empty(implode('', $value)) && $this->settings['getTitle'] && $this->document->getPartof()) {
                             $superiorTitle = Doc::getTitle($this->document->getPartof(), true);
                             if (!empty($superiorTitle)) {
-                                $metadata[$i][$name] = ['[' . $superiorTitle . ']'];
+                                $metadata[$i][$name] = ['['.$superiorTitle.']'];
                             }
                         }
                         if (!empty($value)) {

Braces +9 added lines, -18 removed lines

@@ -29,8 +29,7 @@ 
  * @subpackage dlf
  * @access public
  */
-class MetadataController extends AbstractController
-{
+class MetadataController extends AbstractController {
     /**
      * @var CollectionRepository
      */
@@ -39,8 +38,7 @@ 
     /**
      * @param CollectionRepository $collectionRepository
      */
-    public function injectCollectionRepository(CollectionRepository $collectionRepository)
-    {
+    public function injectCollectionRepository(CollectionRepository $collectionRepository) {
         $this->collectionRepository = $collectionRepository;
     }
 
@@ -52,8 +50,7 @@ 
     /**
      * @param MetadataRepository $metadataRepository
      */
-    public function injectMetadataRepository(MetadataRepository $metadataRepository)
-    {
+    public function injectMetadataRepository(MetadataRepository $metadataRepository) {
         $this->metadataRepository = $metadataRepository;
     }
 
@@ -65,16 +62,14 @@ 
     /**
      * @param StructureRepository $structureRepository
      */
-    public function injectStructureRepository(StructureRepository $structureRepository)
-    {
+    public function injectStructureRepository(StructureRepository $structureRepository) {
         $this->structureRepository = $structureRepository;
     }
 
     /**
      * @return string|void
      */
-    public function mainAction()
-    {
+    public function mainAction() {
         $this->cObj = $this->configurationManager->getContentObject();
 
         // Load current document.
@@ -130,8 +125,7 @@ 
      *
      * @return string The metadata array ready for output
      */
-    protected function printMetadata(array $metadata, $useOriginalIiifManifestMetadata = false)
-    {
+    protected function printMetadata(array $metadata, $useOriginalIiifManifestMetadata = false) {
         if ($useOriginalIiifManifestMetadata) {
             $iiifData = [];
             foreach ($metadata as $row) {
@@ -269,8 +263,7 @@ 
                     }
 
                     if (is_array($metadata[$i][$name])) {
-                        $metadata[$i][$name] = array_values(array_filter($metadata[$i][$name], function($metadataValue)
-                        {
+                        $metadata[$i][$name] = array_values(array_filter($metadata[$i][$name], function($metadataValue) {
                             return !empty($metadataValue);
                         }));
                     }
@@ -294,8 +287,7 @@ 
      *
      * @return array metadata
      */
-    private function getMetadata()
-    {
+    private function getMetadata() {
         $metadata = [];
         if ($this->settings['rootline'] < 2) {
             // Get current structure's @ID.
@@ -333,8 +325,7 @@ 
      *
      * @return array metadata
      */
-    private function getMetadataForIds($id, $metadata)
-    {
+    private function getMetadataForIds($id, $metadata) {
         $useOriginalIiifManifestMetadata = $this->settings['originalIiifMetadata'] == 1 && $this->document->getDoc() instanceof IiifManifest;
         foreach ($id as $sid) {
             if ($useOriginalIiifManifestMetadata) {

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

@@ -80,8 +80,8 @@ 
         // Load current document.
         $this->loadDocument($this->requestData);
         if (
-            $this->document === null
-            || $this->document->getDoc() === null
+            $this->document === NULL
+            || $this->document->getDoc() === NULL
         ) {
             // Quit without doing anything if required variables are not set.
             return '';
@@ -130,7 +130,7 @@ 
      *
      * @return string The metadata array ready for output
      */
-    protected function printMetadata(array $metadata, $useOriginalIiifManifestMetadata = false)
+    protected function printMetadata(array $metadata, $useOriginalIiifManifestMetadata = FALSE)
     {
         if ($useOriginalIiifManifestMetadata) {
             $iiifData = [];
@@ -148,14 +148,14 @@ 
                             $iiifData[$key] = [
                                 'label' => $key,
                                 'value' => $group,
-                                'buildUrl' => true,
+                                'buildUrl' => TRUE,
                             ];
                         } else {
                             // Data output
                             $iiifData[$key] = [
                                 'label' => $key,
                                 'value' => $group,
-                                'buildUrl' => false,
+                                'buildUrl' => FALSE,
                             ];
                         }
                     } else {
@@ -172,18 +172,18 @@ 
                                 $iiifData[$key]['data'][] = [
                                     'label' => $nolabel ? '' : $label,
                                     'value' => $value,
-                                    'buildUrl' => true,
+                                    'buildUrl' => TRUE,
                                 ];
                             } else {
                                 $iiifData[$key]['data'][] = [
                                     'label' => $label,
                                     'value' => $value,
-                                    'buildUrl' => false,
+                                    'buildUrl' => FALSE,
                                 ];
                             }
                         }
                     }
-                    $this->view->assign('useIiif', true);
+                    $this->view->assign('useIiif', TRUE);
                     $this->view->assign('iiifData', $iiifData);
                 }
             }
@@ -213,7 +213,7 @@ 
                     if ($name == 'title') {
                         // Get title of parent document if needed.
                         if (empty(implode('', $value)) && $this->settings['getTitle'] && $this->document->getPartof()) {
-                            $superiorTitle = Doc::getTitle($this->document->getPartof(), true);
+                            $superiorTitle = Doc::getTitle($this->document->getPartof(), TRUE);
                             if (!empty($superiorTitle)) {
                                 $metadata[$i][$name] = ['[' . $superiorTitle . ']'];
                             }

Classes/Common/MetsDocument.php

Braces +32 added lines, -64 removed lines

@@ -50,8 +50,7 @@ 
  * @property-read string $toplevelId This holds the toplevel structure's @ID (METS) or the manifest's @id (IIIF)
  * @property-read string $parentHref URL of the parent document (determined via mptr element), or empty string if none is available
  */
-final class MetsDocument extends Doc
-{
+final class MetsDocument extends Doc {
     /**
      * Subsections / tags that may occur within `<mets:amdSec>`.
      *
@@ -176,8 +175,7 @@ 
      *
      * @return  void
      */
-    public function addMetadataFromMets(&$metadata, $id)
-    {
+    public function addMetadataFromMets(&$metadata, $id) {
         $details = $this->getLogicalStructure($id);
         if (!empty($details)) {
             $metadata['mets_order'][0] = $details['order'];
@@ -191,8 +189,7 @@ 
      * {@inheritDoc}
      * @see \Kitodo\Dlf\Common\Doc::establishRecordId()
      */
-    protected function establishRecordId($pid)
-    {
+    protected function establishRecordId($pid) {
         // Check for METS object @ID.
         if (!empty($this->mets['OBJID'])) {
             $this->recordId = (string) $this->mets['OBJID'];
@@ -212,8 +209,7 @@ 
      * {@inheritDoc}
      * @see \Kitodo\Dlf\Common\Doc::getDownloadLocation()
      */
-    public function getDownloadLocation($id)
-    {
+    public function getDownloadLocation($id) {
         $fileMimeType = $this->getFileMimeType($id);
         $fileLocation = $this->getFileLocation($id);
         if ($fileMimeType === 'application/vnd.kitodo.iiif') {
@@ -238,8 +234,7 @@ 
      * {@inheritDoc}
      * @see \Kitodo\Dlf\Common\Doc::getFileLocation()
      */
-    public function getFileLocation($id)
-    {
+    public function getFileLocation($id) {
         $location = $this->mets->xpath('./mets:fileSec/mets:fileGrp/mets:file[@ID="' . $id . '"]/mets:FLocat[@LOCTYPE="URL"]');
         if (
             !empty($id)
@@ -256,8 +251,7 @@ 
      * {@inheritDoc}
      * @see \Kitodo\Dlf\Common\Doc::getFileMimeType()
      */
-    public function getFileMimeType($id)
-    {
+    public function getFileMimeType($id) {
         $mimetype = $this->mets->xpath('./mets:fileSec/mets:fileGrp/mets:file[@ID="' . $id . '"]/@MIMETYPE');
         if (
             !empty($id)
@@ -274,8 +268,7 @@ 
      * {@inheritDoc}
      * @see \Kitodo\Dlf\Common\Doc::getLogicalStructure()
      */
-    public function getLogicalStructure($id, $recursive = false)
-    {
+    public function getLogicalStructure($id, $recursive = false) {
         $details = [];
         // Is the requested logical unit already loaded?
         if (
@@ -315,8 +308,7 @@ 
      *
      * @return array Array of the element's id, label, type and physical page indexes/mptr link
      */
-    protected function getLogicalStructureInfo(\SimpleXMLElement $structure, $recursive = false)
-    {
+    protected function getLogicalStructureInfo(\SimpleXMLElement $structure, $recursive = false) {
         // Get attributes.
         foreach ($structure->attributes() as $attribute => $value) {
             $attributes[$attribute] = (string) $value;
@@ -420,8 +412,7 @@ 
      * {@inheritDoc}
      * @see \Kitodo\Dlf\Common\Doc::getMetadata()
      */
-    public function getMetadata($id, $cPid = 0)
-    {
+    public function getMetadata($id, $cPid = 0) {
         // Make sure $cPid is a non-negative integer.
         $cPid = max(intval($cPid), 0);
         // If $cPid is not given, try to get it elsewhere.
@@ -675,8 +666,7 @@ 
      * @param string $id: The "@ID" attribute of the file node
      * @return void
      */
-    protected function getMetadataIds($id)
-    {
+    protected function getMetadataIds($id) {
         // Load amdSecChildIds concordance
         $this->_getMdSec();
         $this->_getFileInfos();
@@ -723,8 +713,7 @@ 
      * {@inheritDoc}
      * @see \Kitodo\Dlf\Common\Doc::getFullText()
      */
-    public function getFullText($id)
-    {
+    public function getFullText($id) {
         $fullText = '';
 
         // Load fileGrps and check for full text files.
@@ -739,8 +728,7 @@ 
      * {@inheritDoc}
      * @see Doc::getStructureDepth()
      */
-    public function getStructureDepth($logId)
-    {
+    public function getStructureDepth($logId) {
         $ancestors = $this->mets->xpath('./mets:structMap[@TYPE="LOGICAL"]//mets:div[@ID="' . $logId . '"]/ancestor::*');
         if (!empty($ancestors)) {
             return count($ancestors);
@@ -753,8 +741,7 @@ 
      * {@inheritDoc}
      * @see \Kitodo\Dlf\Common\Doc::init()
      */
-    protected function init($location)
-    {
+    protected function init($location) {
         $this->logger = GeneralUtility::makeInstance(LogManager::class)->getLogger(get_class($this));
         // Get METS node from XML file.
         $this->registerNamespaces($this->xml);
@@ -778,8 +765,7 @@ 
      * {@inheritDoc}
      * @see \Kitodo\Dlf\Common\Doc::loadLocation()
      */
-    protected function loadLocation($location)
-    {
+    protected function loadLocation($location) {
         $fileResource = Helper::getUrl($location);
         if ($fileResource !== false) {
             $xml = Helper::getXmlFileAsString($fileResource);
@@ -797,8 +783,7 @@ 
      * {@inheritDoc}
      * @see \Kitodo\Dlf\Common\Doc::ensureHasFulltextIsSet()
      */
-    protected function ensureHasFulltextIsSet()
-    {
+    protected function ensureHasFulltextIsSet() {
         // Are the fileGrps already loaded?
         if (!$this->fileGrpsLoaded) {
             $this->_getFileGrps();
@@ -809,8 +794,7 @@ 
      * {@inheritDoc}
      * @see Doc::setPreloadedDocument()
      */
-    protected function setPreloadedDocument($preloadedDocument)
-    {
+    protected function setPreloadedDocument($preloadedDocument) {
 
         if ($preloadedDocument instanceof \SimpleXMLElement) {
             $this->xml = $preloadedDocument;
@@ -823,8 +807,7 @@ 
      * {@inheritDoc}
      * @see Doc::getDocument()
      */
-    protected function getDocument()
-    {
+    protected function getDocument() {
         return $this->mets;
     }
 
@@ -835,8 +818,7 @@ 
      *
      * @return array Array of metadata sections with their IDs as array key
      */
-    protected function _getMdSec()
-    {
+    protected function _getMdSec() {
         if (!$this->mdSecLoaded) {
             $this->loadFormats();
 
@@ -878,8 +860,7 @@ 
         return $this->mdSec;
     }
 
-    protected function _getDmdSec()
-    {
+    protected function _getDmdSec() {
         $this->_getMdSec();
         return $this->dmdSec;
     }
@@ -893,8 +874,7 @@ 
      *
      * @return array|null The processed metadata section
      */
-    protected function processMdSec($element)
-    {
+    protected function processMdSec($element) {
         $mdId = (string) $element->attributes()->ID;
         if (empty($mdId)) {
             return null;
@@ -934,8 +914,7 @@ 
      *
      * @return array Array of file use groups with file IDs
      */
-    protected function _getFileGrps()
-    {
+    protected function _getFileGrps() {
         if (!$this->fileGrpsLoaded) {
             // Get configured USE attributes.
             $extConf = GeneralUtility::makeInstance(ExtensionConfiguration::class)->get(self::$extKey);
@@ -987,8 +966,7 @@ 
      * @access protected
      * @return array
      */
-    protected function _getFileInfos()
-    {
+    protected function _getFileInfos() {
         $this->_getFileGrps();
         return $this->fileInfos;
     }
@@ -997,8 +975,7 @@ 
      * {@inheritDoc}
      * @see \Kitodo\Dlf\Common\Doc::prepareMetadataArray()
      */
-    protected function prepareMetadataArray($cPid)
-    {
+    protected function prepareMetadataArray($cPid) {
         $ids = $this->mets->xpath('./mets:structMap[@TYPE="LOGICAL"]//mets:div[@DMDID]/@ID');
         // Get all logical structure nodes with metadata.
         if (!empty($ids)) {
@@ -1016,8 +993,7 @@ 
      *
      * @return \SimpleXMLElement The XML's METS part as \SimpleXMLElement object
      */
-    protected function _getMets()
-    {
+    protected function _getMets() {
         return $this->mets;
     }
 
@@ -1025,8 +1001,7 @@ 
      * {@inheritDoc}
      * @see \Kitodo\Dlf\Common\Doc::_getPhysicalStructure()
      */
-    protected function _getPhysicalStructure()
-    {
+    protected function _getPhysicalStructure() {
         // Is there no physical structure array yet?
         if (!$this->physicalStructureLoaded) {
             // Does the document have a structMap node of type "PHYSICAL"?
@@ -1088,8 +1063,7 @@ 
      * {@inheritDoc}
      * @see \Kitodo\Dlf\Common\Doc::_getSmLinks()
      */
-    protected function _getSmLinks()
-    {
+    protected function _getSmLinks() {
         if (!$this->smLinksLoaded) {
             $smLinks = $this->mets->xpath('./mets:structLink/mets:smLink');
             if (!empty($smLinks)) {
@@ -1107,8 +1081,7 @@ 
      * {@inheritDoc}
      * @see \Kitodo\Dlf\Common\Doc::_getThumbnail()
      */
-    protected function _getThumbnail($forceReload = false)
-    {
+    protected function _getThumbnail($forceReload = false) {
         if (
             !$this->thumbnailLoaded
             || $forceReload
@@ -1187,8 +1160,7 @@ 
      * {@inheritDoc}
      * @see \Kitodo\Dlf\Common\Doc::_getToplevelId()
      */
-    protected function _getToplevelId()
-    {
+    protected function _getToplevelId() {
         if (empty($this->toplevelId)) {
             // Get all logical structure nodes with metadata, but without associated METS-Pointers.
             $divs = $this->mets->xpath('./mets:structMap[@TYPE="LOGICAL"]//mets:div[@DMDID and not(./mets:mptr)]');
@@ -1217,8 +1189,7 @@ 
      *
      * @return string|null
      */
-    public function _getParentHref()
-    {
+    public function _getParentHref() {
         if ($this->parentHref === null) {
             $this->parentHref = '';
 
@@ -1240,8 +1211,7 @@ 
      *
      * @return array Properties to be serialized
      */
-    public function __sleep()
-    {
+    public function __sleep() {
         // \SimpleXMLElement objects can't be serialized, thus save the XML as string for serialization
         $this->asXML = $this->xml->asXML();
         return ['uid', 'pid', 'recordId', 'parentId', 'asXML'];
@@ -1254,8 +1224,7 @@ 
      *
      * @return string String representing the METS object
      */
-    public function __toString()
-    {
+    public function __toString() {
         $xml = new \DOMDocument('1.0', 'utf-8');
         $xml->appendChild($xml->importNode(dom_import_simplexml($this->mets), true));
         $xml->formatOutput = true;
@@ -1270,8 +1239,7 @@ 
      *
      * @return void
      */
-    public function __wakeup()
-    {
+    public function __wakeup() {
         $xml = Helper::getXmlFileAsString($this->asXML);
         if ($xml !== false) {
             $this->asXML = '';

Classes/Controller/TableOfContentsController.php

Braces +5 added lines, -10 removed lines

@@ -24,8 +24,7 @@ 
  * @subpackage dlf
  * @access public
  */
-class TableOfContentsController extends AbstractController
-{
+class TableOfContentsController extends AbstractController {
     /**
      * This holds the active entries according to the currently selected page
      *
@@ -39,8 +38,7 @@ 
      *
      * @return void
      */
-    public function mainAction()
-    {
+    public function mainAction() {
         // Load current document.
         $this->loadDocument($this->requestData);
         if (
@@ -66,8 +64,7 @@ 
      * @access protected
      * @return array HMENU array
      */
-    protected function makeMenuArray()
-    {
+    protected function makeMenuArray() {
         // Set default values for page if not set.
         // $this->requestData['page'] may be integer or string (physical structure @ID)
         if (
@@ -143,8 +140,7 @@ 
      *
      * @return array HMENU array for menu entry
      */
-    protected function getMenuEntry(array $entry, $recursive = false)
-    {
+    protected function getMenuEntry(array $entry, $recursive = false) {
         $entry = $this->resolveMenuEntry($entry);
 
         $entryArray = [];
@@ -238,8 +234,7 @@ 
      * @param array $entry
      * @return array
      */
-    protected function resolveMenuEntry($entry)
-    {
+    protected function resolveMenuEntry($entry) {
         // If the menu entry points to the parent document,
         // resolve to the parent UID set on indexation.
         $doc = $this->document->getDoc();

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

@@ -44,8 +44,8 @@ 
         // Load current document.
         $this->loadDocument($this->requestData);
         if (
-            $this->document === null
-            || $this->document->getDoc() === null
+            $this->document === NULL
+            || $this->document->getDoc() === NULL
         ) {
             // Quit without doing anything if required variables are not set.
             return;
@@ -102,12 +102,12 @@ 
             }
             // Go through table of contents and create all menu entries.
             foreach ($this->document->getDoc()->tableOfContents as $entry) {
-                $menuArray[] = $this->getMenuEntry($entry, true);
+                $menuArray[] = $this->getMenuEntry($entry, TRUE);
             }
         } else {
             // Go through table of contents and create top-level menu entries.
             foreach ($this->document->getDoc()->tableOfContents as $entry) {
-                $menuArray[] = $this->getMenuEntry($entry, false);
+                $menuArray[] = $this->getMenuEntry($entry, FALSE);
             }
             // Build table of contents from database.
             $result = $this->documentRepository->getTableOfContentsFromDb($this->document->getUid(), $this->document->getPid(), $this->settings);
@@ -126,7 +126,7 @@ 
                         'pagination' => '',
                         'targetUid' => $resArray['uid']
                     ];
-                    $menuArray[0]['_SUB_MENU'][] = $this->getMenuEntry($entry, false);
+                    $menuArray[0]['_SUB_MENU'][] = $this->getMenuEntry($entry, FALSE);
                 }
             }
         }
@@ -143,7 +143,7 @@ 
      *
      * @return array HMENU array for menu entry
      */
-    protected function getMenuEntry(array $entry, $recursive = false)
+    protected function getMenuEntry(array $entry, $recursive = FALSE)
     {
         $entry = $this->resolveMenuEntry($entry);
 
@@ -201,7 +201,7 @@ 
         }
         // Build sub-menu if available and called recursively.
         if (
-            $recursive === true
+            $recursive === TRUE
             && !empty($entry['children'])
         ) {
             // Build sub-menu only if one of the following conditions apply:
@@ -219,7 +219,7 @@ 
                     if (in_array($child['id'], $this->activeEntries)) {
                         $entryArray['ITEM_STATE'] = 'ACT';
                     }
-                    $entryArray['_SUB_MENU'][] = $this->getMenuEntry($child, true);
+                    $entryArray['_SUB_MENU'][] = $this->getMenuEntry($child, TRUE);
                 }
             }
             // Append "IFSUB" to "ITEM_STATE" if this entry has sub-entries.

Classes/Controller/CollectionController.php

Spacing +4 added lines, -4 removed lines

@@ -96,20 +96,20 @@
         foreach ($collections as $collection) {
             $solr_query = '';
             if ($collection->getIndexSearch() != '') {
-                $solr_query .= '(' . $collection->getIndexSearch() . ')';
+                $solr_query .= '('.$collection->getIndexSearch().')';
             } else {
-                $solr_query .= 'collection:("' . Solr::escapeQuery($collection->getIndexName()) . '")';
+                $solr_query .= 'collection:("'.Solr::escapeQuery($collection->getIndexName()).'")';
             }
 
             // virtual collection might yield documents, that are not toplevel true or partof anything
             if ($collection->getIndexSearch()) {
                 $params['query'] = $solr_query;
             } else {
-                $params['query'] = $solr_query . ' AND partof:0 AND toplevel:true';
+                $params['query'] = $solr_query.' AND partof:0 AND toplevel:true';
             }
             $partOfNothing = $solr->search_raw($params);
 
-            $params['query'] = $solr_query . ' AND NOT partof:0 AND toplevel:true';
+            $params['query'] = $solr_query.' AND NOT partof:0 AND toplevel:true';
             $partOfSomething = $solr->search_raw($params);
             // Titles are all documents that are "root" elements i.e. partof == 0
             $collectionInfo['titles'] = [];

Classes/Controller/SearchController.php

Spacing +22 added lines, -22 removed lines

@@ -108,13 +108,13 @@ 
         }
 
         // sanitize date search input
-        if(empty($this->searchParams['dateFrom']) && !empty($this->searchParams['dateTo'])) {
+        if (empty($this->searchParams['dateFrom']) && !empty($this->searchParams['dateTo'])) {
             $this->searchParams['dateFrom'] = '*';
         }
-        if(empty($this->searchParams['dateTo']) && !empty($this->searchParams['dateFrom'])) {
+        if (empty($this->searchParams['dateTo']) && !empty($this->searchParams['dateFrom'])) {
             $this->searchParams['dateTo'] = 'NOW';
         }
-        if($this->searchParams['dateFrom'] > $this->searchParams['dateTo']) {
+        if ($this->searchParams['dateFrom'] > $this->searchParams['dateTo']) {
             $tmpDate = $this->searchParams['dateFrom'];
             $this->searchParams['dateFrom'] = $this->searchParams['dateTo'];
             $this->searchParams['dateTo'] = $tmpDate;
@@ -175,7 +175,7 @@ 
 
         // Add uHash parameter to suggest parameter to make a basic protection of this form.
         if ($this->settings['suggest']) {
-            $this->view->assign('uHash', GeneralUtility::hmac((string) (new Typo3Version()) . Environment::getExtensionsPath(), 'SearchSuggest'));
+            $this->view->assign('uHash', GeneralUtility::hmac((string) (new Typo3Version()).Environment::getExtensionsPath(), 'SearchSuggest'));
         }
 
         $this->view->assign('viewData', $this->viewData);
@@ -198,7 +198,7 @@ 
         // Get facets from plugin configuration.
         $facets = [];
         foreach (GeneralUtility::trimExplode(',', $this->settings['facets'], true) as $facet) {
-            $facets[$facet . '_faceting'] = Helper::translate($facet, 'tx_dlf_metadata', $this->settings['storagePid']);
+            $facets[$facet.'_faceting'] = Helper::translate($facet, 'tx_dlf_metadata', $this->settings['storagePid']);
         }
 
         $this->view->assign('facetsMenu', $this->makeFacetsMenuArray($facets));
@@ -240,13 +240,13 @@ 
         $searchParams = $this->searchParams;
         if (
             (!empty($searchParams['fulltext']))
-            || preg_match('/' . $fields['fulltext'] . ':\((.*)\)/', trim($searchParams['query']), $matches)
+            || preg_match('/'.$fields['fulltext'].':\((.*)\)/', trim($searchParams['query']), $matches)
         ) {
             // If the query already is a fulltext query e.g using the facets
             $searchParams['query'] = empty($matches[1]) ? $searchParams['query'] : $matches[1];
             // Search in fulltext field if applicable. Query must not be empty!
             if (!empty($this->searchParams['query'])) {
-                $search['query'] = $fields['fulltext'] . ':(' . Solr::escapeQuery(trim($searchParams['query'])) . ')';
+                $search['query'] = $fields['fulltext'].':('.Solr::escapeQuery(trim($searchParams['query'])).')';
             }
         } else {
             // Retain given search field if valid.
@@ -259,7 +259,7 @@ 
         // extract collections from collection parameter
         $collection = null;
         if ($this->searchParams['collection']) {
-            foreach(explode(',', $this->searchParams['collection']) as $collectionEntry) {
+            foreach (explode(',', $this->searchParams['collection']) as $collectionEntry) {
                 $collection[] = $this->collectionRepository->findByUid($collectionEntry);
             }
             
@@ -269,26 +269,26 @@ 
             $virtualCollectionsQueryString = '';
             foreach ($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() . '"';
+                    $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($searchParams['query'])) {
-                    $collectionsQueryString = '(collection_faceting:(' . $collectionsQueryString . ') AND toplevel:true AND partof:0)';
+            if (!empty($collectionsQueryString)) {
+                if (empty($searchParams['query'])) {
+                    $collectionsQueryString = '(collection_faceting:('.$collectionsQueryString.') AND toplevel:true AND partof:0)';
                 } else {
-                    $collectionsQueryString = '(collection_faceting:(' . $collectionsQueryString . '))';
+                    $collectionsQueryString = '(collection_faceting:('.$collectionsQueryString.'))';
                 }
             }
 
             // virtual collections might query documents that are neither toplevel:true nor partof:0 and need to be searched separatly
-            if(!empty($virtualCollectionsQueryString)) {
-                $virtualCollectionsQueryString = '(' . $virtualCollectionsQueryString . ')';
+            if (!empty($virtualCollectionsQueryString)) {
+                $virtualCollectionsQueryString = '('.$virtualCollectionsQueryString.')';
             }
 
             // combine both querystrings into a single filterquery via OR if both are given, otherwise pass either of those
@@ -298,7 +298,7 @@ 
         // add filter query for date search
         if (!empty($this->searchParams['dateFrom']) && !empty($this->searchParams['dateTo'])) {
             // combine dateFrom and dateTo into filterquery as range search
-            $search['params']['filterquery'][]['query'] = '{!join from=' . $fields['uid'] . ' to=' . $fields['uid'] . '}' . $fields['date'] . ':[' . $this->searchParams['dateFrom'] . ' TO ' . $this->searchParams['dateTo'] . ']';
+            $search['params']['filterquery'][]['query'] = '{!join from='.$fields['uid'].' to='.$fields['uid'].'}'.$fields['date'].':['.$this->searchParams['dateFrom'].' TO '.$this->searchParams['dateTo'].']';
         }
 
         // Add extended search query.
@@ -316,9 +316,9 @@ 
                         in_array($searchParams['extOperator'][$i], $allowedOperators)
                     ) {
                         if (!empty($search['query'])) {
-                            $search['query'] .= ' ' . $searchParams['extOperator'][$i] . ' ';
+                            $search['query'] .= ' '.$searchParams['extOperator'][$i].' ';
                         }
-                        $search['query'] .= Indexer::getIndexFieldName($searchParams['extField'][$i], $this->settings['storagePid']) . ':(' . Solr::escapeQuery($searchParams['extQuery'][$i]) . ')';
+                        $search['query'] .= Indexer::getIndexFieldName($searchParams['extField'][$i], $this->settings['storagePid']).':('.Solr::escapeQuery($searchParams['extQuery'][$i]).')';
                     }
                 }
             }
@@ -444,7 +444,7 @@ 
         $entryArray['doNotLinkIt'] = 0;
         // Check if facet is already selected.
         $queryColumn = array_column($search['params']['filterquery'], 'query');
-        $index = array_search($field . ':("' . Solr::escapeQuery($value) . '")', $queryColumn);
+        $index = array_search($field.':("'.Solr::escapeQuery($value).'")', $queryColumn);
         if ($index !== false) {
             // Facet is selected, thus remove it from filter.
             unset($queryColumn[$index]);
@@ -458,7 +458,7 @@ 
             }
         } else {
             // Facet is not selected, thus add it to filter.
-            $queryColumn[] = $field . ':("' . Solr::escapeQuery($value) . '")';
+            $queryColumn[] = $field.':("'.Solr::escapeQuery($value).'")';
             $entryArray['ITEM_STATE'] = 'NO';
         }
         $entryArray['queryColumn'] = $queryColumn;

Braces +10 added lines, -20 removed lines

@@ -32,8 +32,7 @@ 
  * @subpackage dlf
  * @access public
  */
-class SearchController extends AbstractController
-{
+class SearchController extends AbstractController {
     /**
      * @var CollectionRepository
      */
@@ -42,8 +41,7 @@ 
     /**
      * @param CollectionRepository $collectionRepository
      */
-    public function injectCollectionRepository(CollectionRepository $collectionRepository)
-    {
+    public function injectCollectionRepository(CollectionRepository $collectionRepository) {
         $this->collectionRepository = $collectionRepository;
     }
 
@@ -55,8 +53,7 @@ 
     /**
      * @param MetadataRepository $metadataRepository
      */
-    public function injectMetadataRepository(MetadataRepository $metadataRepository)
-    {
+    public function injectMetadataRepository(MetadataRepository $metadataRepository) {
         $this->metadataRepository = $metadataRepository;
     }
 
@@ -71,8 +68,7 @@ 
      *
      * @return void
      */
-    public function searchAction()
-    {
+    public function searchAction() {
         // if search was triggered, get search parameters from POST variables
         $this->searchParams = $this->getParametersSafely('searchParameter');
 
@@ -87,8 +83,7 @@ 
      *
      * @return void
      */
-    public function mainAction()
-    {
+    public function mainAction() {
         $listViewSearch = false;
         // Quit without doing anything if required variables are not set.
         if (empty($this->settings['solrcore'])) {
@@ -188,8 +183,7 @@ 
      *
      * @return string HTML output of facets menu
      */
-    protected function addFacetsMenu()
-    {
+    protected function addFacetsMenu() {
         // Quit without doing anything if no facets are configured.
         if (empty($this->settings['facets']) && empty($this->settings['facetCollections'])) {
             return '';
@@ -214,8 +208,7 @@ 
      *
      * @return array HMENU array
      */
-    public function makeFacetsMenuArray($facets)
-    {
+    public function makeFacetsMenuArray($facets) {
         $menuArray = [];
         // Set default value for facet search.
         $search = [
@@ -271,8 +264,7 @@ 
                 // check for virtual collections query string
                 if($collectionEntry->getIndexSearch()) {
                     $virtualCollectionsQueryString .= empty($virtualCollectionsQueryString) ? '(' . $collectionEntry->getIndexSearch() . ')' : ' OR ('. $collectionEntry->getIndexSearch() . ')' ;
-                }
-                else {
+                } else {
                     $collectionsQueryString .= empty($collectionsQueryString) ? '"' . $collectionEntry->getIndexName() . '"' : ' OR "' . $collectionEntry->getIndexName() . '"';
                 }
             }
@@ -421,8 +413,7 @@ 
      *
      * @return array The array for the facet's menu entry
      */
-    protected function getFacetsMenuEntry($field, $value, $count, $search, &$state)
-    {
+    protected function getFacetsMenuEntry($field, $value, $count, $search, &$state) {
         $entryArray = [];
         // Translate value.
         if ($field == 'owner_faceting') {
@@ -473,8 +464,7 @@ 
      *
      * @return string The extended search form or an empty string
      */
-    protected function addExtendedSearch()
-    {
+    protected function addExtendedSearch() {
         // Quit without doing anything if no fields for extended search are selected.
         if (
             empty($this->settings['extendedSlotCount'])

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

@@ -77,7 +77,7 @@ 
         $this->searchParams = $this->getParametersSafely('searchParameter');
 
         // output is done by main action
-        $this->forward('main', null, null, ['searchParameter' => $this->searchParams]);
+        $this->forward('main', NULL, NULL, ['searchParameter' => $this->searchParams]);
     }
 
     /**
@@ -89,7 +89,7 @@ 
      */
     public function mainAction()
     {
-        $listViewSearch = false;
+        $listViewSearch = FALSE;
         // Quit without doing anything if required variables are not set.
         if (empty($this->settings['solrcore'])) {
             $this->logger->warning('Incomplete plugin configuration');
@@ -103,7 +103,7 @@ 
 
         if (isset($listRequestData['searchParameter']) && is_array($listRequestData['searchParameter'])) {
             $this->searchParams = array_merge($this->searchParams ? : [], $listRequestData['searchParameter']);
-            $listViewSearch = true;
+            $listViewSearch = TRUE;
             $GLOBALS['TSFE']->fe_user->setKey('ses', 'search', $this->searchParams);
         }
 
@@ -128,7 +128,7 @@ 
 
         // If a targetPid is given, the results will be shown by ListView on the target page.
         if (!empty($this->settings['targetPid']) && !empty($this->searchParams) && !$listViewSearch) {
-            $this->redirect('main', 'ListView', null,
+            $this->redirect('main', 'ListView', NULL,
                 [
                     'searchParameter' => $this->searchParams,
                     'widgetPage' => $widgetPage
@@ -139,16 +139,16 @@ 
         // If no search has been executed, no variables habe to be prepared. An empty form will be shown.
         if (is_array($this->searchParams) && !empty($this->searchParams)) {
             // get all sortable metadata records
-            $sortableMetadata = $this->metadataRepository->findByIsSortable(true);
+            $sortableMetadata = $this->metadataRepository->findByIsSortable(TRUE);
 
             // get all metadata records to be shown in results
-            $listedMetadata = $this->metadataRepository->findByIsListed(true);
+            $listedMetadata = $this->metadataRepository->findByIsListed(TRUE);
 
             $solrResults = [];
             $numResults = 0;
             // Do not execute the Solr search if used together with ListView plugin.
             if (!$listViewSearch) {
-                $solrResults = $this->documentRepository->findSolrByCollection(null, $this->settings, $this->searchParams, $listedMetadata);
+                $solrResults = $this->documentRepository->findSolrByCollection(NULL, $this->settings, $this->searchParams, $listedMetadata);
                 $numResults = $solrResults->getNumFound();
             }
 
@@ -197,7 +197,7 @@ 
 
         // Get facets from plugin configuration.
         $facets = [];
-        foreach (GeneralUtility::trimExplode(',', $this->settings['facets'], true) as $facet) {
+        foreach (GeneralUtility::trimExplode(',', $this->settings['facets'], TRUE) as $facet) {
             $facets[$facet . '_faceting'] = Helper::translate($facet, 'tx_dlf_metadata', $this->settings['storagePid']);
         }
 
@@ -257,7 +257,7 @@ 
 
         // if collections are given, we prepare the collection query string
         // extract collections from collection parameter
-        $collection = null;
+        $collection = NULL;
         if ($this->searchParams['collection']) {
             foreach(explode(',', $this->searchParams['collection']) as $collectionEntry) {
                 $collection[] = $this->collectionRepository->findByUid($collectionEntry);
@@ -445,7 +445,7 @@ 
         // Check if facet is already selected.
         $queryColumn = array_column($search['params']['filterquery'], 'query');
         $index = array_search($field . ':("' . Solr::escapeQuery($value) . '")', $queryColumn);
-        if ($index !== false) {
+        if ($index !== FALSE) {
             // Facet is selected, thus remove it from filter.
             unset($queryColumn[$index]);
             $queryColumn = array_values($queryColumn);
@@ -453,7 +453,7 @@ 
             $state = 'ACTIFSUB';
             // Reset facets
             if ($this->settings['resetFacets']) {
-                $entryArray['resetFacet'] = true;
+                $entryArray['resetFacet'] = TRUE;
                 $entryArray['queryColumn'] = $queryColumn;
             }
         } else {
@@ -484,7 +484,7 @@ 
         }
 
         // Get field selector options.
-        $searchFields = GeneralUtility::trimExplode(',', $this->settings['extendedFields'], true);
+        $searchFields = GeneralUtility::trimExplode(',', $this->settings['extendedFields'], TRUE);
 
         $slotCountArray = [];
         for ($i = 0; $i < $this->settings['extendedSlotCount']; $i++) {

Classes/Controller/ListViewController.php

Spacing +1 added lines, -1 removed lines

@@ -75,7 +75,7 @@
         // extract collection(s) from collection parameter
         $collection = null;
         if ($this->searchParams['collection']) {
-            foreach(explode(',', $this->searchParams['collection']) as $collectionEntry) {
+            foreach (explode(',', $this->searchParams['collection']) as $collectionEntry) {
                 $collection[] = $this->collectionRepository->findByUid($collectionEntry);
             }
         }

Braces +4 added lines, -8 removed lines

@@ -29,8 +29,7 @@ 
  * @subpackage dlf
  * @access public
  */
-class ListViewController extends AbstractController
-{
+class ListViewController extends AbstractController {
     /**
      * @var CollectionRepository
      */
@@ -39,8 +38,7 @@ 
     /**
      * @param CollectionRepository $collectionRepository
      */
-    public function injectCollectionRepository(CollectionRepository $collectionRepository)
-    {
+    public function injectCollectionRepository(CollectionRepository $collectionRepository) {
         $this->collectionRepository = $collectionRepository;
     }
 
@@ -52,8 +50,7 @@ 
     /**
      * @param MetadataRepository $metadataRepository
      */
-    public function injectMetadataRepository(MetadataRepository $metadataRepository)
-    {
+    public function injectMetadataRepository(MetadataRepository $metadataRepository) {
         $this->metadataRepository = $metadataRepository;
     }
 
@@ -68,8 +65,7 @@ 
      *
      * @return void
      */
-    public function mainAction()
-    {
+    public function mainAction() {
         $this->searchParams = $this->getParametersSafely('searchParameter');
 
         // extract collection(s) from collection parameter

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

@@ -73,7 +73,7 @@ 
         $this->searchParams = $this->getParametersSafely('searchParameter');
 
         // extract collection(s) from collection parameter
-        $collection = null;
+        $collection = NULL;
         if ($this->searchParams['collection']) {
             foreach(explode(',', $this->searchParams['collection']) as $collectionEntry) {
                 $collection[] = $this->collectionRepository->findByUid($collectionEntry);
@@ -87,15 +87,15 @@ 
         $GLOBALS['TSFE']->fe_user->setKey('ses', 'widgetPage', $widgetPage);
 
         // get all sortable metadata records
-        $sortableMetadata = $this->metadataRepository->findByIsSortable(true);
+        $sortableMetadata = $this->metadataRepository->findByIsSortable(TRUE);
 
         // get all metadata records to be shown in results
-        $listedMetadata = $this->metadataRepository->findByIsListed(true);
+        $listedMetadata = $this->metadataRepository->findByIsListed(TRUE);
 
         $solrResults = [];
         $numResults = 0;
         if (is_array($this->searchParams) && !empty($this->searchParams)) {
-            $solrResults = $this->documentRepository->findSolrByCollection($collection ? : null, $this->settings, $this->searchParams, $listedMetadata);
+            $solrResults = $this->documentRepository->findSolrByCollection($collection ? : NULL, $this->settings, $this->searchParams, $listedMetadata);
             $numResults = $solrResults->getNumFound();
         }