Erikmitk / kitodo-presentation

Classes/Controller/CollectionController.php

Braces +1 added lines, -2 removed lines

@@ -28,8 +28,7 @@
  *
  * @access public
  */
-class CollectionController extends AbstractController
-{
+class CollectionController extends AbstractController {
     /**
      * @access protected
      * @var CollectionRepository

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

@@ -98,7 +98,7 @@ 
         }
 
         if (count($collections) == 1 && empty($this->settings['dont_show_single']) && is_array($collections)) {
-            $this->forward('show', null, null, ['collection' => array_pop($collections)]);
+            $this->forward('show', NULL, NULL, ['collection' => array_pop($collections)]);
         }
 
         $processedCollections = $this->processCollections($collections, $solr);
@@ -140,7 +140,7 @@ 
         $searchParams['collection'] = $collection;
         // If a targetPid is given, the results will be shown by ListView on the target page.
         if (!empty($this->settings['targetPid'])) {
-            $this->redirect('main', 'ListView', null,
+            $this->redirect('main', 'ListView', NULL,
                 [
                     'searchParameter' => $searchParams,
                     'page' => $currentPage
@@ -149,16 +149,16 @@ 
         }
 
         // get all metadata records to be shown in results
-        $listedMetadata = $this->metadataRepository->findByIsListed(true);
+        $listedMetadata = $this->metadataRepository->findByIsListed(TRUE);
 
         // get all indexed metadata fields
-        $indexedMetadata = $this->metadataRepository->findByIndexIndexed(true);
+        $indexedMetadata = $this->metadataRepository->findByIndexIndexed(TRUE);
 
         // get all sortable metadata records
-        $sortableMetadata = $this->metadataRepository->findByIsSortable(true);
+        $sortableMetadata = $this->metadataRepository->findByIsSortable(TRUE);
 
         // get all documents of given collection
-        $solrResults = null;
+        $solrResults = NULL;
         if (is_array($searchParams) && !empty($searchParams)) {
             $solrResults = $this->documentRepository->findSolrByCollection($collection, $this->settings, $searchParams, $listedMetadata, $indexedMetadata);
 
@@ -194,13 +194,13 @@ 
         // if search was triggered, get search parameters from POST variables
         $searchParams = $this->getParametersSafely('searchParameter');
 
-        $collection = null;
+        $collection = NULL;
         if ($searchParams['collection']['__identity'] && MathUtility::canBeInterpretedAsInteger($searchParams['collection']['__identity'])) {
             $collection = $this->collectionRepository->findByUid($searchParams['collection']['__identity']);
         }
 
         // output is done by show action
-        $this->forward('show', null, null, ['searchParameter' => $searchParams, 'collection' => $collection]);
+        $this->forward('show', NULL, NULL, ['searchParameter' => $searchParams, 'collection' => $collection]);
 
     }
 

Spacing +5 added lines, -5 removed lines

@@ -168,7 +168,7 @@ 
             $simplePagination = new SimplePagination($solrPaginator);
 
             $pagination = $this->buildSimplePagination($simplePagination, $solrPaginator);
-            $this->view->assignMultiple([ 'pagination' => $pagination, 'paginator' => $solrPaginator ]);
+            $this->view->assignMultiple(['pagination' => $pagination, 'paginator' => $solrPaginator]);
         }
 
         $this->view->assign('viewData', $this->viewData);
@@ -220,9 +220,9 @@ 
         foreach ($collections as $collection) {
             $solrQuery = '';
             if ($collection->getIndexSearch() != '') {
-                $solrQuery .= '(' . $collection->getIndexSearch() . ')';
+                $solrQuery .= '('.$collection->getIndexSearch().')';
             } else {
-                $solrQuery .= 'collection:("' . Solr::escapeQuery($collection->getIndexName()) . '")';
+                $solrQuery .= 'collection:("'.Solr::escapeQuery($collection->getIndexName()).'")';
             }
 
             // We only care about the UID and partOf in the results and want them sorted
@@ -236,11 +236,11 @@ 
             if ($collection->getIndexSearch()) {
                 $params['query'] = $solrQuery;
             } else {
-                $params['query'] = $solrQuery . ' AND partof:0 AND toplevel:true';
+                $params['query'] = $solrQuery.' AND partof:0 AND toplevel:true';
             }
             $partOfNothing = $solr->searchRaw($params);
 
-            $params['query'] = $solrQuery . ' AND NOT partof:0 AND toplevel:true';
+            $params['query'] = $solrQuery.' AND NOT partof:0 AND toplevel:true';
             $partOfSomething = $solr->searchRaw($params);
 
             $collectionInfo = [];

Classes/Controller/Backend/NewTenantController.php

Braces +1 added lines, -2 removed lines

@@ -42,8 +42,7 @@
  *
  * @access public
  */
-class NewTenantController extends AbstractController
-{
+class NewTenantController extends AbstractController {
     /**
      * @access protected
      * @var int

Spacing +7 added lines, -7 removed lines

@@ -250,7 +250,7 @@ 
 
             $data['tx_dlf_metadata'][uniqid('NEW')] = [
                 'pid' => $this->pid,
-                'label' => $this->getLLL('metadata.' . $indexName, $this->siteLanguages[0]->getTypo3Language(), $metadataLabels),
+                'label' => $this->getLLL('metadata.'.$indexName, $this->siteLanguages[0]->getTypo3Language(), $metadataLabels),
                 'index_name' => $indexName,
                 'format' => implode(',', $formatIds),
                 'default_value' => $values['default_value'],
@@ -289,7 +289,7 @@ 
                     'pid' => $this->pid,
                     'sys_language_uid' => $siteLanguage->getLanguageId(),
                     'l18n_parent' => $id,
-                    'label' => $this->getLLL('metadata.' . $indexName, $siteLanguage->getTypo3Language(), $metadataLabels),
+                    'label' => $this->getLLL('metadata.'.$indexName, $siteLanguage->getTypo3Language(), $metadataLabels),
                 ];
             }
 
@@ -315,7 +315,7 @@ 
 
         if ($this->solrCoreRepository->findOneByPid($this->pid) === null) {
             $newRecord = GeneralUtility::makeInstance(SolrCore::class);
-            $newRecord->setLabel($this->getLLL('flexform.solrcore', $this->siteLanguages[0]->getTypo3Language(), $beLabels). ' (PID ' . $this->pid . ')');
+            $newRecord->setLabel($this->getLLL('flexform.solrcore', $this->siteLanguages[0]->getTypo3Language(), $beLabels).' (PID '.$this->pid.')');
             $indexName = Solr::createCore('');
             if (!empty($indexName)) {
                 $newRecord->setIndexName($indexName);
@@ -355,7 +355,7 @@ 
             $data['tx_dlf_structures'][uniqid('NEW')] = [
                 'pid' => $this->pid,
                 'toplevel' => $values['toplevel'],
-                'label' => $this->getLLL('structure.' . $indexName, $this->siteLanguages[0]->getTypo3Language(), $structureLabels),
+                'label' => $this->getLLL('structure.'.$indexName, $this->siteLanguages[0]->getTypo3Language(), $structureLabels),
                 'index_name' => $indexName,
                 'oai_name' => $values['oai_name'],
                 'thumbnail' => 0,
@@ -380,7 +380,7 @@ 
                     'pid' => $this->pid,
                     'sys_language_uid' => $siteLanguage->getLanguageId(),
                     'l18n_parent' => $id,
-                    'label' => $this->getLLL('structure.' . $indexName, $siteLanguage->getTypo3Language(), $structureLabels),
+                    'label' => $this->getLLL('structure.'.$indexName, $siteLanguage->getTypo3Language(), $structureLabels),
                 ];
             }
 
@@ -475,7 +475,7 @@ 
         } elseif (isset($langArray['default'][$index][0]['target'])) {
             return $langArray['default'][$index][0]['target'];
         } else {
-            return 'Missing translation for ' . $index;
+            return 'Missing translation for '.$index;
         }
     }
 
@@ -490,7 +490,7 @@ 
      */
     private function getRecords(string $recordType): array
     {
-        $filePath = Environment::getPublicPath() . '/typo3conf/ext/dlf/Resources/Private/Data/' . $recordType . 'Defaults.json';
+        $filePath = Environment::getPublicPath().'/typo3conf/ext/dlf/Resources/Private/Data/'.$recordType.'Defaults.json';
 
         $resourceFactory = GeneralUtility::makeInstance(ResourceFactory::class);
         $fileObject = $resourceFactory->getFileObjectFromCombinedIdentifier($filePath);

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

@@ -187,11 +187,11 @@ 
         $frameworkConfiguration['persistence']['storagePid'] = 0;
         $this->configurationManager->setConfiguration($frameworkConfiguration);
 
-        $doPersist = false;
+        $doPersist = FALSE;
 
         foreach ($formatsDefaults as $type => $values) {
             // if default format record is not found, add it to the repository
-            if ($this->formatRepository->findOneByType($type) === null) {
+            if ($this->formatRepository->findOneByType($type) === NULL) {
                 $newRecord = GeneralUtility::makeInstance(Format::class);
                 $newRecord->setType($type);
                 $newRecord->setRoot($values['root']);
@@ -199,12 +199,12 @@ 
                 $newRecord->setClass($values['class']);
                 $this->formatRepository->add($newRecord);
 
-                $doPersist = true;
+                $doPersist = TRUE;
             }
         }
 
         // We must persist here, if we changed anything.
-        if ($doPersist === true) {
+        if ($doPersist === TRUE) {
             $persistenceManager = GeneralUtility::makeInstance(PersistenceManager::class);
             $persistenceManager->persistAll();
         }
@@ -266,13 +266,13 @@ 
             ];
         }
 
-        $metadataIds = Helper::processDatabaseAsAdmin($data, [], true);
+        $metadataIds = Helper::processDatabaseAsAdmin($data, [], TRUE);
 
         $insertedMetadata = [];
         foreach ($metadataIds as $id => $uid) {
             $metadata = $this->metadataRepository->findByUid($uid);
             // id array contains also ids of formats
-            if ($metadata != null) {
+            if ($metadata != NULL) {
                 $insertedMetadata[$uid] = $metadata->getIndexName();
             }
         }
@@ -308,12 +308,12 @@ 
      */
     public function addSolrCoreAction(): void
     {
-        $doPersist = false;
+        $doPersist = FALSE;
 
         // load language file in own array
         $beLabels = $this->languageFactory->getParsedData('EXT:dlf/Resources/Private/Language/locallang_be.xlf', $this->siteLanguages[0]->getTypo3Language());
 
-        if ($this->solrCoreRepository->findOneByPid($this->pid) === null) {
+        if ($this->solrCoreRepository->findOneByPid($this->pid) === NULL) {
             $newRecord = GeneralUtility::makeInstance(SolrCore::class);
             $newRecord->setLabel($this->getLLL('flexform.solrcore', $this->siteLanguages[0]->getTypo3Language(), $beLabels). ' (PID ' . $this->pid . ')');
             $indexName = Solr::createCore('');
@@ -322,12 +322,12 @@ 
 
                 $this->solrCoreRepository->add($newRecord);
 
-                $doPersist = true;
+                $doPersist = TRUE;
             }
         }
 
         // We must persist here, if we changed anything.
-        if ($doPersist === true) {
+        if ($doPersist === TRUE) {
             $persistenceManager = GeneralUtility::makeInstance(PersistenceManager::class);
             $persistenceManager->persistAll();
         }
@@ -361,7 +361,7 @@ 
                 'thumbnail' => 0,
             ];
         }
-        $structureIds = Helper::processDatabaseAsAdmin($data, [], true);
+        $structureIds = Helper::processDatabaseAsAdmin($data, [], TRUE);
 
         $insertedStructures = [];
         foreach ($structureIds as $id => $uid) {
@@ -495,9 +495,9 @@ 
         $resourceFactory = GeneralUtility::makeInstance(ResourceFactory::class);
         $fileObject = $resourceFactory->getFileObjectFromCombinedIdentifier($filePath);
 
-        if ($fileObject !== null) {
+        if ($fileObject !== NULL) {
             $fileContents = $fileObject->getContents();
-            $records = json_decode($fileContents, true);
+            $records = json_decode($fileContents, TRUE);
 
             if (json_last_error() === JSON_ERROR_NONE) {
                 return $records;

Classes/Controller/SearchController.php

Braces +1 added lines, -2 removed lines

@@ -33,8 +33,7 @@
  *
  * @access public
  */
-class SearchController extends AbstractController
-{
+class SearchController extends AbstractController {
     /**
      * @access protected
      * @var CollectionRepository

Spacing +16 added lines, -16 removed lines

@@ -122,7 +122,7 @@ 
         }
 
         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);
         }
@@ -183,7 +183,7 @@ 
                 $simplePagination = new SimplePagination($solrPaginator);
 
                 $pagination = $this->buildSimplePagination($simplePagination, $solrPaginator);
-                $this->view->assignMultiple([ 'pagination' => $pagination, 'paginator' => $solrPaginator ]);
+                $this->view->assignMultiple(['pagination' => $pagination, 'paginator' => $solrPaginator]);
             }
 
             $this->view->assign('documents', !empty($solrResults) ? $solrResults : []);
@@ -208,7 +208,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);
@@ -229,7 +229,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));
@@ -265,13 +265,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($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.
@@ -288,7 +288,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.
@@ -306,9 +306,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]).')';
                     }
                 }
             }
@@ -397,24 +397,24 @@ 
             foreach ($collections as $collectionEntry) {
                 // check for virtual collections query string
                 if ($collectionEntry->getIndexSearch()) {
-                    $virtualCollectionsQueryString .= empty($virtualCollectionsQueryString) ? '(' . $collectionEntry->getIndexSearch() . ')' : ' OR (' . $collectionEntry->getIndexSearch() . ')';
+                    $virtualCollectionsQueryString .= empty($virtualCollectionsQueryString) ? '('.$collectionEntry->getIndexSearch().')' : ' OR ('.$collectionEntry->getIndexSearch().')';
                 } else {
-                    $collectionsQueryString .= empty($collectionsQueryString) ? '"' . $collectionEntry->getIndexName() . '"' : ' OR "' . $collectionEntry->getIndexName() . '"';
+                    $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)';
+                    $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 separately
             if (!empty($virtualCollectionsQueryString)) {
-                $virtualCollectionsQueryString = '(' . $virtualCollectionsQueryString . ')';
+                $virtualCollectionsQueryString = '('.$virtualCollectionsQueryString.')';
             }
 
             // combine both querystrings into a single filterquery via OR if both are given, otherwise pass either of those
@@ -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;

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

@@ -90,7 +90,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]);
     }
 
     /**
@@ -104,7 +104,7 @@ 
      */
     public function mainAction(): void
     {
-        $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');
@@ -123,7 +123,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);
         }
 
@@ -155,7 +155,7 @@ 
             $this->redirect(
                 'main',
                 'ListView',
-                null,
+                NULL,
                 [
                     'searchParameter' => $this->searchParams,
                     'page' => $currentPage
@@ -167,15 +167,15 @@ 
         // 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);
 
             // get all indexed metadata fields
-            $indexedMetadata = $this->metadataRepository->findByIndexIndexed(true);
+            $indexedMetadata = $this->metadataRepository->findByIndexIndexed(TRUE);
 
-            $solrResults = null;
+            $solrResults = NULL;
             $numResults = 0;
             // Do not execute the Solr search if used together with ListView plugin.
             if (!$listViewSearch) {
@@ -235,7 +235,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']);
         }
 
@@ -392,7 +392,7 @@ 
     {
         // if collections are given, we prepare the collections query string
         // extract collections from collection parameter
-        $collections = null;
+        $collections = NULL;
         if (array_key_exists('collection', $this->searchParams)) {
             foreach (explode(',', $this->searchParams['collection']) as $collectionEntry) {
                 $collections[] = $this->collectionRepository->findByUid((int) $collectionEntry);
@@ -452,7 +452,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);
@@ -460,7 +460,7 @@ 
             $state = 'ACTIFSUB';
             // Reset facets
             if ($this->settings['resetFacets']) {
-                $entryArray['resetFacet'] = true;
+                $entryArray['resetFacet'] = TRUE;
                 $entryArray['queryColumn'] = $queryColumn;
             }
         } else {
@@ -571,7 +571,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/Format/AudioVideoMD.php

Spacing +1 added lines, -1 removed lines

@@ -53,7 +53,7 @@
             $metadata['video_duration'] = [$videoDuration];
         }
 
-        $metadata['duration'] = $metadata['video_duration'] ?: $metadata['audio_duration'] ?: [];
+        $metadata['duration'] = $metadata['video_duration'] ? : $metadata['audio_duration'] ? : [];
 
         if ($useExternalApis) {
             // TODO?

Braces +1 added lines, -2 removed lines

@@ -25,8 +25,7 @@
  *
  * @access public
  */
-class AudioVideoMD implements MetadataInterface
-{
+class AudioVideoMD implements MetadataInterface {
     /**
      * Extract some essential AudioMD/VideoMD metadata.
      *

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

@@ -38,7 +38,7 @@
      *
      * @return void
      */
-    public function extractMetadata(\SimpleXMLElement $xml, array &$metadata, bool $useExternalApis = false): void
+    public function extractMetadata(\SimpleXMLElement $xml, array &$metadata, bool $useExternalApis = FALSE): void
     {
         $xml->registerXPathNamespace('audiomd', 'http://www.loc.gov/audioMD/');
         $xml->registerXPathNamespace('videomd', 'http://www.loc.gov/videoMD/');

Classes/Format/Alto.php

Spacing +2 added lines, -2 removed lines

@@ -123,7 +123,7 @@ 
             }
             return ' ';
         }
-        return htmlspecialchars((string) $attributes['CONTENT']) . ' ';
+        return htmlspecialchars((string) $attributes['CONTENT']).' ';
     }
 
     /**
@@ -137,7 +137,7 @@ 
      */
     private function getCoordinates(\SimpleXMLElement $attributes): string
     {
-        return (string) $attributes['HPOS'] . ' ' . (string) $attributes['VPOS'] . ' ' . (string) $attributes['WIDTH'] . ' ' . (string) $attributes['HEIGHT'];
+        return (string) $attributes['HPOS'].' '.(string) $attributes['VPOS'].' '.(string) $attributes['WIDTH'].' '.(string) $attributes['HEIGHT'];
     }
 
     /**

Braces +1 added lines, -2 removed lines

@@ -147,8 +147,7 @@
      *
      * @param \SimpleXMLElement &$xml: The XML to register the namespace for
      */
-    private function registerAltoNamespace(\SimpleXMLElement &$xml)
-    {
+    private function registerAltoNamespace(\SimpleXMLElement &$xml) {
         $namespace = $xml->getDocNamespaces();
 
         if (in_array('http://www.loc.gov/standards/alto/ns-v2#', $namespace, true)) {

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

@@ -151,11 +151,11 @@
     {
         $namespace = $xml->getDocNamespaces();
 
-        if (in_array('http://www.loc.gov/standards/alto/ns-v2#', $namespace, true)) {
+        if (in_array('http://www.loc.gov/standards/alto/ns-v2#', $namespace, TRUE)) {
             $xml->registerXPathNamespace('alto', 'http://www.loc.gov/standards/alto/ns-v2#');
-        } elseif (in_array('http://www.loc.gov/standards/alto/ns-v3#', $namespace, true)) {
+        } elseif (in_array('http://www.loc.gov/standards/alto/ns-v3#', $namespace, TRUE)) {
             $xml->registerXPathNamespace('alto', 'http://www.loc.gov/standards/alto/ns-v3#');
-        } elseif (in_array('http://www.loc.gov/standards/alto/ns-v4#', $namespace, true)) {
+        } elseif (in_array('http://www.loc.gov/standards/alto/ns-v4#', $namespace, TRUE)) {
             $xml->registerXPathNamespace('alto', 'http://www.loc.gov/standards/alto/ns-v4#');
         }
     }

Classes/Format/Mods.php

Braces +1 added lines, -2 removed lines

@@ -24,8 +24,7 @@
  *
  * @access public
  */
-class Mods implements MetadataInterface
-{
+class Mods implements MetadataInterface {
     /**
      * @access private
      * @var \SimpleXMLElement The metadata XML

Spacing +4 added lines, -4 removed lines

@@ -124,7 +124,7 @@ 
         if (!empty($name)) {
             $this->metadata['author'][$i] = [
                 'name' => $name,
-                'url' => 'https://orcid.org/' . $orcidId
+                'url' => 'https://orcid.org/'.$orcidId
             ];
         } else {
             //fallback into display form
@@ -181,7 +181,7 @@ 
         }
         // Append "valueURI" to name using Unicode unit separator.
         if (!empty($authors[$i]->getValueURI())) {
-            $this->metadata['author'][$i] .= pack('C', 31) . $authors[$i]->getValueURI();
+            $this->metadata['author'][$i] .= pack('C', 31).$authors[$i]->getValueURI();
         }
     }
 
@@ -244,7 +244,7 @@ 
         if (!empty($name)) {
             $this->metadata['holder'][$i] = [
                 'name' => $name,
-                'url' => 'http://viaf.org/viaf/' . $viafId
+                'url' => 'http://viaf.org/viaf/'.$viafId
             ];
         } else {
             //fallback into display form
@@ -267,7 +267,7 @@ 
         $this->getHolderFromXmlDisplayForm($holders, $i);
         // Append "valueURI" to name using Unicode unit separator.
         if (!empty($holders[$i]->getValueURI())) {
-            $this->metadata['holder'][$i] .= pack('C', 31) . $holders[$i]->getValueURI();
+            $this->metadata['holder'][$i] .= pack('C', 31).$holders[$i]->getValueURI();
         }
     }
 

Classes/Format/TeiHeader.php

Braces +1 added lines, -2 removed lines

@@ -22,8 +22,7 @@
  *
  * @access public
  */
-class TeiHeader implements MetadataInterface
-{
+class TeiHeader implements MetadataInterface {
     /**
      * This extracts the essential TEIHDR metadata from XML
      *

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

@@ -35,7 +35,7 @@
      *
      * @return void
      */
-    public function extractMetadata(\SimpleXMLElement $xml, array &$metadata, bool $useExternalApis = false): void
+    public function extractMetadata(\SimpleXMLElement $xml, array &$metadata, bool $useExternalApis = FALSE): void
     {
         $xml->registerXPathNamespace('teihdr', 'http://www.tei-c.org/ns/1.0');
     }

Classes/Api/Viaf/Client.php

Spacing +3 added lines, -3 removed lines

@@ -65,7 +65,7 @@ 
     public function __construct(string $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;
     }
 
@@ -95,7 +95,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();
@@ -110,6 +110,6 @@ 
      **/
     private function getApiEndpoint(): string
     {
-        return $this->viafUrl . '/' . $this->endpoint;
+        return $this->viafUrl.'/'.$this->endpoint;
     }
 }

Braces +3 added lines, -6 removed lines

@@ -26,8 +26,7 @@ 
  *
  * @access public
  **/
-class Client
-{
+class Client {
     /**
      * @access protected
      * @var Logger This holds the logger
@@ -62,8 +61,7 @@ 
      *
      * @return void
      **/
-    public function __construct(string $viaf, RequestFactory $requestFactory)
-    {
+    public function __construct(string $viaf, RequestFactory $requestFactory) {
         $this->logger = GeneralUtility::makeInstance(LogManager::class)->getLogger(static::class);
         $this->viafUrl = 'http://viaf.org/viaf/' . $viaf;
         $this->requestFactory = $requestFactory;
@@ -89,8 +87,7 @@ 
      *
      * @return object|bool
      **/
-    public function getData()
-    {
+    public function getData() {
         $url = $this->getApiEndpoint();
         try {
             $response = $this->requestFactory->request($url);

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

@@ -96,7 +96,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 +5 added lines, -10 removed lines

@@ -26,8 +26,7 @@ 
  *
  * @access public
  **/
-class Profile
-{
+class Profile {
     /**
      * @access private
      * @var Logger This holds the logger
@@ -55,8 +54,7 @@ 
      *
      * @return void
      **/
-    public function __construct(string $viaf)
-    {
+    public function __construct(string $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 ($this->raw !== false && !empty($this->raw)) {
             $data = [];
@@ -89,8 +86,7 @@ 
      *
      * @return string|false
      **/
-    public function getAddress()
-    {
+    public function getAddress() {
         $this->getRaw();
         if ($this->raw !== false && !empty($this->raw->asXML())) {
             return (string) $this->raw->xpath('./ns1:nationalityOfEntity/ns1:data/ns1:text')[0];
@@ -107,8 +103,7 @@ 
      *
      * @return string|false
      **/
-    public function getFullName()
-    {
+    public function getFullName() {
         $this->getRaw();
         if ($this->raw !== false && !empty($this->raw->asXML())) {
             $rawName = $this->raw->xpath('./ns1:mainHeadings/ns1:data/ns1:text');

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

@@ -44,7 +44,7 @@ 
      * @access private
      * @var \SimpleXmlElement|false The raw VIAF profile or false if not found
      **/
-    private $raw = false;
+    private $raw = FALSE;
 
     /**
      * Constructs client instance
@@ -71,14 +71,14 @@ 
     public function getData()
     {
         $this->getRaw();
-        if ($this->raw !== false && !empty($this->raw)) {
+        if ($this->raw !== FALSE && !empty($this->raw)) {
             $data = [];
             $data['address'] = $this->getAddress();
             $data['fullName'] = $this->getFullName();
             return $data;
         } else {
             $this->logger->warning('No data found for given VIAF URL');
-            return false;
+            return FALSE;
         }
     }
 
@@ -92,11 +92,11 @@ 
     public function getAddress()
     {
         $this->getRaw();
-        if ($this->raw !== false && !empty($this->raw->asXML())) {
+        if ($this->raw !== FALSE && !empty($this->raw->asXML())) {
             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;
         }
     }
 
@@ -110,14 +110,14 @@ 
     public function getFullName()
     {
         $this->getRaw();
-        if ($this->raw !== false && !empty($this->raw->asXML())) {
+        if ($this->raw !== FALSE && !empty($this->raw->asXML())) {
             $rawName = $this->raw->xpath('./ns1:mainHeadings/ns1:data/ns1:text');
             $name = (string) $rawName[0];
             $name = trim(trim(trim($name), ','), '.');
             return $name;
         } else {
             $this->logger->warning('No name found for given VIAF URL');
-            return false;
+            return FALSE;
         }
     }
 
@@ -131,9 +131,9 @@ 
     private function getRaw(): void
     {
         $data = $this->client->getData();
-        if ($data != false) {
+        if ($data != FALSE) {
             $this->raw = Helper::getXmlFileAsString($data);
-            if ($this->raw != false && !empty($this->raw->asXML())) {
+            if ($this->raw != FALSE && !empty($this->raw->asXML())) {
                 $this->raw->registerXPathNamespace('ns1', 'http://viaf.org/viaf/terms#');
             }
         }