Erikmitk / kitodo-presentation

Classes/Controller/AudioPlayerController.php

Spacing +4 added lines, -4 removed lines

@@ -52,12 +52,12 @@
             $(document).ready(function() {
                 AudioPlayer = new dlfAudioPlayer({
                     audio: {
-                        mimeType: "' . $this->audio['mimetype'] . '",
-                        title: "' . $this->audio['label'] . '",
-                        url:  "' . $this->audio['url'] . '"
+                        mimeType: "' . $this->audio['mimetype'].'",
+                        title: "' . $this->audio['label'].'",
+                        url:  "' . $this->audio['url'].'"
                     },
                     parentElId: "tx-dlf-audio",
-                    swfPath: "' . PathUtility::stripPathSitePrefix(ExtensionManagementUtility::extPath('dlf')) . 'Resources/Public/JavaScript/jPlayer/jquery.jplayer.swf"
+                    swfPath: "' . PathUtility::stripPathSitePrefix(ExtensionManagementUtility::extPath('dlf')).'Resources/Public/JavaScript/jPlayer/jquery.jplayer.swf"
                 });
             });
         ';

Classes/Controller/BasketController.php

Braces +15 added lines, -30 removed lines

@@ -31,8 +31,7 @@ 
  * @subpackage dlf
  * @access public
  */
-class BasketController extends AbstractController
-{
+class BasketController extends AbstractController {
     /**
      * @var BasketRepository
      */
@@ -41,8 +40,7 @@ 
     /**
      * @param BasketRepository $basketRepository
      */
-    public function injectBasketRepository(BasketRepository $basketRepository)
-    {
+    public function injectBasketRepository(BasketRepository $basketRepository) {
         $this->basketRepository = $basketRepository;
     }
 
@@ -54,8 +52,7 @@ 
     /**
      * @param MailRepository $mailRepository
      */
-    public function injectMailRepository(MailRepository $mailRepository)
-    {
+    public function injectMailRepository(MailRepository $mailRepository) {
         $this->mailRepository = $mailRepository;
     }
 
@@ -67,8 +64,7 @@ 
     /**
      * @param PrinterRepository $printerRepository
      */
-    public function injectPrinterRepository(PrinterRepository $printerRepository)
-    {
+    public function injectPrinterRepository(PrinterRepository $printerRepository) {
         $this->printerRepository = $printerRepository;
     }
 
@@ -80,8 +76,7 @@ 
     /**
      * @param ActionLogRepository $actionLogRepository
      */
-    public function injectActionLogRepository(ActionLogRepository $actionLogRepository)
-    {
+    public function injectActionLogRepository(ActionLogRepository $actionLogRepository) {
         $this->actionLogRepository = $actionLogRepository;
     }
 
@@ -90,8 +85,7 @@ 
      *
      * @return void
      */
-    public function basketAction()
-    {
+    public function basketAction() {
         $basket = $this->getBasketData();
 
         // action remove from basket
@@ -137,8 +131,7 @@ 
      *
      * @return void
      */
-    public function addAction()
-    {
+    public function addAction() {
         $basket = $this->getBasketData();
 
         if (
@@ -156,8 +149,7 @@ 
      *
      * @return void
      */
-    public function mainAction()
-    {
+    public function mainAction() {
         $basket = $this->getBasketData();
 
         $countDocs = 0;
@@ -203,8 +195,7 @@ 
      *
      * @return Basket The found data from user session.
      */
-    protected function getBasketData()
-    {
+    protected function getBasketData() {
         // get user session
         $sessionId = $GLOBALS['TSFE']->fe_user->id;
 
@@ -238,8 +229,7 @@ 
      *
      * @return string One basket entry
      */
-    protected function getEntry($data)
-    {
+    protected function getEntry($data) {
         if (is_object($data)) {
             $data = get_object_vars($data);
         }
@@ -291,8 +281,7 @@ 
      *
      * @return mixed download url or false
      */
-    protected function getDocumentData($id, $data)
-    {
+    protected function getDocumentData($id, $data) {
         // get document instance to load further information
         $this->loadDocument(['id' => $id]);
         if ($this->document) {
@@ -360,8 +349,7 @@ 
      *
      * @return array Basket data and JavaScript output
      */
-    protected function addToBasket($_piVars, $basket)
-    {
+    protected function addToBasket($_piVars, $basket) {
         $output = '';
 
         if (!$_piVars['startpage']) {
@@ -468,8 +456,7 @@ 
      *
      * @return Basket basket
      */
-    protected function removeFromBasket($_piVars, $basket)
-    {
+    protected function removeFromBasket($_piVars, $basket) {
         if (!empty($basket->getDocIds())) {
             $items = json_decode($basket->getDocIds());
             $items = get_object_vars($items);
@@ -507,8 +494,7 @@ 
      *
      * @return void
      */
-    protected function sendMail()
-    {
+    protected function sendMail() {
         // send mail
         $mailId = $this->requestData['mail_action'];
 
@@ -585,8 +571,7 @@ 
      *
      * @return void
      */
-    protected function printDocument($basket)
-    {
+    protected function printDocument($basket) {
         $pdfUrl = $this->settings['pdfprint'];
         $numberOfPages = 0;
         foreach ($this->requestData['selected'] as $docId => $docValue) {

Configuration/TCA/Overrides/tt_content.php

Spacing +16 added lines, -16 removed lines

@@ -16,67 +16,67 @@
 // Plugin "audioplayer".
 $GLOBALS['TCA']['tt_content']['types']['list']['subtypes_excludelist']['dlf_audioplayer'] = 'layout,select_key,pages,recursive';
 $GLOBALS['TCA']['tt_content']['types']['list']['subtypes_addlist']['dlf_audioplayer'] = 'pi_flexform';
-\TYPO3\CMS\Core\Utility\ExtensionManagementUtility::addPiFlexFormValue('dlf_audioplayer', 'FILE:EXT:' . 'dlf/Configuration/FlexForms/AudioPlayer.xml');
+\TYPO3\CMS\Core\Utility\ExtensionManagementUtility::addPiFlexFormValue('dlf_audioplayer', 'FILE:EXT:'.'dlf/Configuration/FlexForms/AudioPlayer.xml');
 // Plugin "basket".
 $GLOBALS['TCA']['tt_content']['types']['list']['subtypes_excludelist']['dlf_basket'] = 'layout,select_key,pages,recursive';
 $GLOBALS['TCA']['tt_content']['types']['list']['subtypes_addlist']['dlf_basket'] = 'pi_flexform';
-\TYPO3\CMS\Core\Utility\ExtensionManagementUtility::addPiFlexFormValue('dlf_basket', 'FILE:EXT:' . 'dlf/Configuration/FlexForms/Basket.xml');
+\TYPO3\CMS\Core\Utility\ExtensionManagementUtility::addPiFlexFormValue('dlf_basket', 'FILE:EXT:'.'dlf/Configuration/FlexForms/Basket.xml');
 // Plugin "calendar".
 $GLOBALS['TCA']['tt_content']['types']['list']['subtypes_excludelist']['dlf_calendar'] = 'layout,select_key,pages,recursive';
 $GLOBALS['TCA']['tt_content']['types']['list']['subtypes_addlist']['dlf_calendar'] = 'pi_flexform';
-\TYPO3\CMS\Core\Utility\ExtensionManagementUtility::addPiFlexFormValue('dlf_calendar', 'FILE:EXT:' . 'dlf/Configuration/FlexForms/Calendar.xml');
+\TYPO3\CMS\Core\Utility\ExtensionManagementUtility::addPiFlexFormValue('dlf_calendar', 'FILE:EXT:'.'dlf/Configuration/FlexForms/Calendar.xml');
 // Plugin "collection".
 $GLOBALS['TCA']['tt_content']['types']['list']['subtypes_excludelist']['dlf_collection'] = 'layout,select_key,pages,recursive';
 $GLOBALS['TCA']['tt_content']['types']['list']['subtypes_addlist']['dlf_collection'] = 'pi_flexform';
-\TYPO3\CMS\Core\Utility\ExtensionManagementUtility::addPiFlexFormValue('dlf_collection', 'FILE:EXT:' . 'dlf/Configuration/FlexForms/Collection.xml');
+\TYPO3\CMS\Core\Utility\ExtensionManagementUtility::addPiFlexFormValue('dlf_collection', 'FILE:EXT:'.'dlf/Configuration/FlexForms/Collection.xml');
 // Plugin "feeds".
 $GLOBALS['TCA']['tt_content']['types']['list']['subtypes_excludelist']['dlf_feeds'] = 'layout,select_key,pages,recursive';
 $GLOBALS['TCA']['tt_content']['types']['list']['subtypes_addlist']['dlf_feeds'] = 'pi_flexform';
-\TYPO3\CMS\Core\Utility\ExtensionManagementUtility::addPiFlexFormValue('dlf_feeds', 'FILE:EXT:' . 'dlf/Configuration/FlexForms/Feeds.xml');
+\TYPO3\CMS\Core\Utility\ExtensionManagementUtility::addPiFlexFormValue('dlf_feeds', 'FILE:EXT:'.'dlf/Configuration/FlexForms/Feeds.xml');
 // Plugin "listview".
 $GLOBALS['TCA']['tt_content']['types']['list']['subtypes_excludelist']['dlf_listview'] = 'layout,select_key,pages,recursive';
 $GLOBALS['TCA']['tt_content']['types']['list']['subtypes_addlist']['dlf_listview'] = 'pi_flexform';
-\TYPO3\CMS\Core\Utility\ExtensionManagementUtility::addPiFlexFormValue('dlf_listview', 'FILE:EXT:' . 'dlf/Configuration/FlexForms/ListView.xml');
+\TYPO3\CMS\Core\Utility\ExtensionManagementUtility::addPiFlexFormValue('dlf_listview', 'FILE:EXT:'.'dlf/Configuration/FlexForms/ListView.xml');
 // Plugin "metadata".
 $GLOBALS['TCA']['tt_content']['types']['list']['subtypes_excludelist']['dlf_metadata'] = 'layout,select_key,pages,recursive';
 $GLOBALS['TCA']['tt_content']['types']['list']['subtypes_addlist']['dlf_metadata'] = 'pi_flexform';
-\TYPO3\CMS\Core\Utility\ExtensionManagementUtility::addPiFlexFormValue('dlf_metadata', 'FILE:EXT:' . 'dlf/Configuration/FlexForms/Metadata.xml');
+\TYPO3\CMS\Core\Utility\ExtensionManagementUtility::addPiFlexFormValue('dlf_metadata', 'FILE:EXT:'.'dlf/Configuration/FlexForms/Metadata.xml');
 // Plugin "navigation".
 $GLOBALS['TCA']['tt_content']['types']['list']['subtypes_excludelist']['dlf_navigation'] = 'layout,select_key,pages,recursive';
 $GLOBALS['TCA']['tt_content']['types']['list']['subtypes_addlist']['dlf_navigation'] = 'pi_flexform';
-\TYPO3\CMS\Core\Utility\ExtensionManagementUtility::addPiFlexFormValue('dlf_navigation', 'FILE:EXT:' . 'dlf/Configuration/FlexForms/Navigation.xml');
+\TYPO3\CMS\Core\Utility\ExtensionManagementUtility::addPiFlexFormValue('dlf_navigation', 'FILE:EXT:'.'dlf/Configuration/FlexForms/Navigation.xml');
 // Plugin "oaipmh".
 $GLOBALS['TCA']['tt_content']['types']['list']['subtypes_excludelist']['dlf_oaipmh'] = 'layout,select_key,pages,recursive';
 $GLOBALS['TCA']['tt_content']['types']['list']['subtypes_addlist']['dlf_oaipmh'] = 'pi_flexform';
-\TYPO3\CMS\Core\Utility\ExtensionManagementUtility::addPiFlexFormValue('dlf_oaipmh', 'FILE:EXT:' . 'dlf/Configuration/FlexForms/OaiPmh.xml');
+\TYPO3\CMS\Core\Utility\ExtensionManagementUtility::addPiFlexFormValue('dlf_oaipmh', 'FILE:EXT:'.'dlf/Configuration/FlexForms/OaiPmh.xml');
 // Plugin "pagegrid".
 $GLOBALS['TCA']['tt_content']['types']['list']['subtypes_excludelist']['dlf_pagegrid'] = 'layout,select_key,pages,recursive';
 $GLOBALS['TCA']['tt_content']['types']['list']['subtypes_addlist']['dlf_pagegrid'] = 'pi_flexform';
-\TYPO3\CMS\Core\Utility\ExtensionManagementUtility::addPiFlexFormValue('dlf_pagegrid', 'FILE:EXT:' . 'dlf/Configuration/FlexForms/PageGrid.xml');
+\TYPO3\CMS\Core\Utility\ExtensionManagementUtility::addPiFlexFormValue('dlf_pagegrid', 'FILE:EXT:'.'dlf/Configuration/FlexForms/PageGrid.xml');
 // Plugin "pageview".
 $GLOBALS['TCA']['tt_content']['types']['list']['subtypes_excludelist']['dlf_pageview'] = 'layout,select_key,pages,recursive';
 $GLOBALS['TCA']['tt_content']['types']['list']['subtypes_addlist']['dlf_pageview'] = 'pi_flexform';
-\TYPO3\CMS\Core\Utility\ExtensionManagementUtility::addPiFlexFormValue('dlf_pageview', 'FILE:EXT:' . 'dlf/Configuration/FlexForms/PageView.xml');
+\TYPO3\CMS\Core\Utility\ExtensionManagementUtility::addPiFlexFormValue('dlf_pageview', 'FILE:EXT:'.'dlf/Configuration/FlexForms/PageView.xml');
 // Plugin "search".
 $GLOBALS['TCA']['tt_content']['types']['list']['subtypes_excludelist']['dlf_search'] = 'layout,select_key,pages,recursive';
 $GLOBALS['TCA']['tt_content']['types']['list']['subtypes_addlist']['dlf_search'] = 'pi_flexform';
-\TYPO3\CMS\Core\Utility\ExtensionManagementUtility::addPiFlexFormValue('dlf_search', 'FILE:EXT:' . 'dlf/Configuration/FlexForms/Search.xml');
+\TYPO3\CMS\Core\Utility\ExtensionManagementUtility::addPiFlexFormValue('dlf_search', 'FILE:EXT:'.'dlf/Configuration/FlexForms/Search.xml');
 // Plugin "statistics".
 $GLOBALS['TCA']['tt_content']['types']['list']['subtypes_excludelist']['dlf_statistics'] = 'layout,select_key,pages,recursive';
 $GLOBALS['TCA']['tt_content']['types']['list']['subtypes_addlist']['dlf_statistics'] = 'pi_flexform';
-\TYPO3\CMS\Core\Utility\ExtensionManagementUtility::addPiFlexFormValue('dlf_statistics', 'FILE:EXT:' . 'dlf/Configuration/FlexForms/Statistics.xml');
+\TYPO3\CMS\Core\Utility\ExtensionManagementUtility::addPiFlexFormValue('dlf_statistics', 'FILE:EXT:'.'dlf/Configuration/FlexForms/Statistics.xml');
 // Plugin "tableofcontents".
 $GLOBALS['TCA']['tt_content']['types']['list']['subtypes_excludelist']['dlf_tableofcontents'] = 'layout,select_key,pages,recursive';
 $GLOBALS['TCA']['tt_content']['types']['list']['subtypes_addlist']['dlf_tableofcontents'] = 'pi_flexform';
-\TYPO3\CMS\Core\Utility\ExtensionManagementUtility::addPiFlexFormValue('dlf_tableofcontents', 'FILE:EXT:' . 'dlf/Configuration/FlexForms/TableOfContents.xml');
+\TYPO3\CMS\Core\Utility\ExtensionManagementUtility::addPiFlexFormValue('dlf_tableofcontents', 'FILE:EXT:'.'dlf/Configuration/FlexForms/TableOfContents.xml');
 // Plugin "toolbox".
 $GLOBALS['TCA']['tt_content']['types']['list']['subtypes_excludelist']['dlf_toolbox'] = 'layout,select_key,pages,recursive';
 $GLOBALS['TCA']['tt_content']['types']['list']['subtypes_addlist']['dlf_toolbox'] = 'pi_flexform';
-\TYPO3\CMS\Core\Utility\ExtensionManagementUtility::addPiFlexFormValue('dlf_toolbox', 'FILE:EXT:' . 'dlf/Configuration/FlexForms/Toolbox.xml');
+\TYPO3\CMS\Core\Utility\ExtensionManagementUtility::addPiFlexFormValue('dlf_toolbox', 'FILE:EXT:'.'dlf/Configuration/FlexForms/Toolbox.xml');
 // Plugin "view3d".
 $GLOBALS['TCA']['tt_content']['types']['list']['subtypes_excludelist']['dlf_view3d'] = 'layout,select_key,pages,recursive';
 $GLOBALS['TCA']['tt_content']['types']['list']['subtypes_addlist']['dlf_view3d'] = 'pi_flexform';
-\TYPO3\CMS\Core\Utility\ExtensionManagementUtility::addPiFlexFormValue('dlf_view3d', 'FILE:EXT:' . 'dlf/Configuration/FlexForms/View3D.xml');
+\TYPO3\CMS\Core\Utility\ExtensionManagementUtility::addPiFlexFormValue('dlf_view3d', 'FILE:EXT:'.'dlf/Configuration/FlexForms/View3D.xml');
 
 \TYPO3\CMS\Extbase\Utility\ExtensionUtility::registerPlugin(
     'Kitodo.Dlf',

Classes/Format/Mods.php

Braces +1 added lines, -2 removed lines

@@ -46,8 +46,7 @@
      *
      * @return void
      */
-    public function extractMetadata(\SimpleXMLElement $xml, array &$metadata)
-    {
+    public function extractMetadata(\SimpleXMLElement $xml, array &$metadata) {
         $this->xml = $xml;
         $this->metadata = $metadata;
 

Spacing +4 added lines, -4 removed lines

@@ -99,7 +99,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
@@ -146,7 +146,7 @@ 
         }
         // Append "valueURI" to name using Unicode unit separator.
         if (isset($authors[$i]['valueURI'])) {
-            $this->metadata['author'][$i] .= chr(31) . (string) $authors[$i]['valueURI'];
+            $this->metadata['author'][$i] .= chr(31).(string) $authors[$i]['valueURI'];
         }
     }
 
@@ -187,7 +187,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
@@ -199,7 +199,7 @@ 
         $this->getHolderFromXmlDisplayForm($holders, $i);
         // Append "valueURI" to name using Unicode unit separator.
         if (isset($holders[$i]['valueURI'])) {
-            $this->metadata['holder'][$i] .= chr(31) . (string) $holders[$i]['valueURI'];
+            $this->metadata['holder'][$i] .= chr(31).(string) $holders[$i]['valueURI'];
         }
     }
 

Classes/Api/Orcid/Profile.php

Spacing +1 added lines, -1 removed lines

@@ -129,7 +129,7 @@
             $this->raw->registerXPathNamespace('personal-details', 'http://www.orcid.org/ns/personal-details');
             $givenNames = $this->raw->xpath('./personal-details:name/personal-details:given-names');
             $familyName = $this->raw->xpath('./personal-details:name/personal-details:family-name');
-            return (string) $givenNames[0] . ' ' . (string) $familyName[0];
+            return (string) $givenNames[0].' '.(string) $familyName[0];
         } else {
             $this->logger->warning('No name found for given ORCID');
             return false;

Braces +7 added lines, -14 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($orcid)
-    {
+    public function __construct($orcid) {
         $this->logger = GeneralUtility::makeInstance(LogManager::class)->getLogger(static::class);
         $this->client = new Client($orcid, GeneralUtility::makeInstance(RequestFactory::class));
     }
@@ -68,8 +66,7 @@ 
      *
      * @return array|false
      **/
-    public function getData()
-    {
+    public function getData() {
         $this->getRaw('person');
         if (!empty($this->raw)) {
             $data = [];
@@ -88,8 +85,7 @@ 
      *
      * @return string|false
      **/
-    public function getAddress()
-    {
+    public function getAddress() {
         $this->getRaw('address');
         if (!empty($this->raw)) {
             $this->raw->registerXPathNamespace('address', 'http://www.orcid.org/ns/address');
@@ -105,8 +101,7 @@ 
      *
      * @return string|false
      **/
-    public function getEmail()
-    {
+    public function getEmail() {
         $this->getRaw('email');
         if (!empty($this->raw)) {
             $this->raw->registerXPathNamespace('email', 'http://www.orcid.org/ns/email');
@@ -122,8 +117,7 @@ 
      *
      * @return string|false
      **/
-    public function getFullName()
-    {
+    public function getFullName() {
         $this->getRaw('personal-details');
         if (!empty($this->raw)) {
             $this->raw->registerXPathNamespace('personal-details', 'http://www.orcid.org/ns/personal-details');
@@ -143,8 +137,7 @@ 
      *
      * @return void
      **/
-    protected function getRaw($endpoint)
-    {
+    protected function getRaw($endpoint) {
         $this->client->setEndpoint($endpoint);
         $data = $this->client->getData();
         if (!isset($this->raw) && $data != false) {

Classes/Controller/SearchController.php

Spacing +12 added lines, -12 removed lines

@@ -107,13 +107,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;
@@ -174,7 +174,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);
@@ -197,7 +197,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));
@@ -239,13 +239,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.
@@ -257,7 +257,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.
@@ -275,9 +275,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]).')';
                     }
                 }
             }
@@ -403,7 +403,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]);
@@ -417,7 +417,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;

Classes/Controller/NavigationController.php

Braces +2 added lines, -4 removed lines

@@ -23,8 +23,7 @@ 
  * @subpackage dlf
  * @access public
  */
-class NavigationController extends AbstractController
-{
+class NavigationController extends AbstractController {
     /**
      * Method to get the page select values and use them with chash
      * @param \Kitodo\Dlf\Domain\Model\PageSelectForm|NULL $pageSelectForm
@@ -53,8 +52,7 @@ 
      *
      * @return void
      */
-    public function mainAction()
-    {
+    public function mainAction() {
         // Load current document.
         $this->loadDocument($this->requestData);
         if (

Classes/Common/Helper.php

Spacing +36 added lines, -36 removed lines

@@ -143,7 +143,7 @@ 
                 if (!preg_match('/\d{8}-\d{1}/i', $id)) {
                     return false;
                 } elseif ($checksum == 10) {
-                    return self::checkIdentifier(($digits + 1) . substr($id, -2, 2), 'SWD');
+                    return self::checkIdentifier(($digits + 1).substr($id, -2, 2), 'SWD');
                 } elseif (substr($id, -1, 1) != $checksum) {
                     return false;
                 }
@@ -315,7 +315,7 @@ 
         $encrypted = openssl_encrypt($string, self::$cipherAlgorithm, $key, OPENSSL_RAW_DATA, $iv);
         // Merge initialisation vector and encrypted data.
         if ($encrypted !== false) {
-            $encrypted = base64_encode($iv . $encrypted);
+            $encrypted = base64_encode($iv.$encrypted);
         }
         return $encrypted;
     }
@@ -369,8 +369,8 @@ 
     public static function getHookObjects($scriptRelPath)
     {
         $hookObjects = [];
-        if (is_array($GLOBALS['TYPO3_CONF_VARS']['SC_OPTIONS'][self::$extKey . '/' . $scriptRelPath]['hookClass'])) {
-            foreach ($GLOBALS['TYPO3_CONF_VARS']['SC_OPTIONS'][self::$extKey . '/' . $scriptRelPath]['hookClass'] as $classRef) {
+        if (is_array($GLOBALS['TYPO3_CONF_VARS']['SC_OPTIONS'][self::$extKey.'/'.$scriptRelPath]['hookClass'])) {
+            foreach ($GLOBALS['TYPO3_CONF_VARS']['SC_OPTIONS'][self::$extKey.'/'.$scriptRelPath]['hookClass'] as $classRef) {
                 $hookObjects[] = GeneralUtility::makeInstance($classRef);
             }
         }
@@ -397,12 +397,12 @@ 
             // NOTE: Only use tables that don't have too many entries!
             || !in_array($table, ['tx_dlf_collections', 'tx_dlf_libraries', 'tx_dlf_metadata', 'tx_dlf_structures', 'tx_dlf_solrcores'])
         ) {
-            self::log('Invalid UID "' . $uid . '" or table "' . $table . '"', LOG_SEVERITY_ERROR);
+            self::log('Invalid UID "'.$uid.'" or table "'.$table.'"', LOG_SEVERITY_ERROR);
             return '';
         }
 
-        $makeCacheKey = function ($pid, $uid) {
-            return $pid . '.' . $uid;
+        $makeCacheKey = function($pid, $uid) {
+            return $pid.'.'.$uid;
         };
 
         static $cache = [];
@@ -412,9 +412,9 @@ 
 
             $result = $queryBuilder
                 ->select(
-                    $table . '.index_name AS index_name',
-                    $table . '.uid AS uid',
-                    $table . '.pid AS pid',
+                    $table.'.index_name AS index_name',
+                    $table.'.uid AS uid',
+                    $table.'.pid AS pid',
                 )
                 ->from($table)
                 ->execute();
@@ -432,7 +432,7 @@ 
         $result = $cache[$table][$cacheKey] ?? '';
 
         if ($result === '') {
-            self::log('No "index_name" with UID ' . $uid . ' and PID ' . $pid . ' found in table "' . $table . '"', LOG_SEVERITY_WARNING);
+            self::log('No "index_name" with UID '.$uid.' and PID '.$pid.' found in table "'.$table.'"', LOG_SEVERITY_WARNING);
         }
 
         return $result;
@@ -459,11 +459,11 @@ 
             // No ISO code, return unchanged.
             return $code;
         }
-        $lang = LocalizationUtility::translate('LLL:' . $file . ':' . $code);
+        $lang = LocalizationUtility::translate('LLL:'.$file.':'.$code);
         if (!empty($lang)) {
             return $lang;
         } else {
-            self::log('Language code "' . $code . '" not found in ISO-639 table', LOG_SEVERITY_NOTICE);
+            self::log('Language code "'.$code.'" not found in ISO-639 table', LOG_SEVERITY_NOTICE);
             return $code;
         }
     }
@@ -560,7 +560,7 @@ 
             '-' => 39,
             ':' => 17,
         ];
-        $urn = strtolower($base . $id);
+        $urn = strtolower($base.$id);
         if (preg_match('/[^a-z\d:-]/', $urn)) {
             self::log('Invalid chars in given parameters', LOG_SEVERITY_WARNING);
             return '';
@@ -574,7 +574,7 @@ 
             $checksum += ($i + 1) * intval(substr($digits, $i, 1));
         }
         $checksum = substr(intval($checksum / intval(substr($digits, -1, 1))), -1, 1);
-        return $base . $id . $checksum;
+        return $base.$id.$checksum;
     }
 
     /**
@@ -668,7 +668,7 @@ 
         // Sanitize input.
         $pid = max(intval($pid), 0);
         if (!$pid) {
-            self::log('Invalid PID ' . $pid . ' for translation', LOG_SEVERITY_WARNING);
+            self::log('Invalid PID '.$pid.' for translation', LOG_SEVERITY_WARNING);
             return $index_name;
         }
         /** @var \TYPO3\CMS\Frontend\Page\PageRepository $pageRepository */
@@ -690,13 +690,13 @@ 
         // First fetch the uid of the received index_name
         $result = $queryBuilder
             ->select(
-                $table . '.uid AS uid',
-                $table . '.l18n_parent AS l18n_parent'
+                $table.'.uid AS uid',
+                $table.'.l18n_parent AS l18n_parent'
             )
             ->from($table)
             ->where(
-                $queryBuilder->expr()->eq($table . '.pid', $pid),
-                $queryBuilder->expr()->eq($table . '.index_name', $queryBuilder->expr()->literal($index_name)),
+                $queryBuilder->expr()->eq($table.'.pid', $pid),
+                $queryBuilder->expr()->eq($table.'.index_name', $queryBuilder->expr()->literal($index_name)),
                 self::whereExpression($table, true)
             )
             ->setMaxResults(1)
@@ -709,12 +709,12 @@ 
             $resArray = $allResults[0];
 
             $result = $queryBuilder
-                ->select($table . '.index_name AS index_name')
+                ->select($table.'.index_name AS index_name')
                 ->from($table)
                 ->where(
-                    $queryBuilder->expr()->eq($table . '.pid', $pid),
-                    $queryBuilder->expr()->eq($table . '.uid', $resArray['l18n_parent']),
-                    $queryBuilder->expr()->eq($table . '.sys_language_uid', intval($languageAspect->getContentId())),
+                    $queryBuilder->expr()->eq($table.'.pid', $pid),
+                    $queryBuilder->expr()->eq($table.'.uid', $resArray['l18n_parent']),
+                    $queryBuilder->expr()->eq($table.'.sys_language_uid', intval($languageAspect->getContentId())),
                     self::whereExpression($table, true)
                 )
                 ->setMaxResults(1)
@@ -732,14 +732,14 @@ 
         if (empty($labels[$table][$pid][$languageAspect->getContentId()][$index_name])) {
             // Check if this table is allowed for translation.
             if (in_array($table, ['tx_dlf_collections', 'tx_dlf_libraries', 'tx_dlf_metadata', 'tx_dlf_structures'])) {
-                $additionalWhere = $queryBuilder->expr()->in($table . '.sys_language_uid', [-1, 0]);
+                $additionalWhere = $queryBuilder->expr()->in($table.'.sys_language_uid', [-1, 0]);
                 if ($languageAspect->getContentId() > 0) {
                     $additionalWhere = $queryBuilder->expr()->andX(
                         $queryBuilder->expr()->orX(
-                            $queryBuilder->expr()->in($table . '.sys_language_uid', [-1, 0]),
-                            $queryBuilder->expr()->eq($table . '.sys_language_uid', intval($languageAspect->getContentId()))
+                            $queryBuilder->expr()->in($table.'.sys_language_uid', [-1, 0]),
+                            $queryBuilder->expr()->eq($table.'.sys_language_uid', intval($languageAspect->getContentId()))
                         ),
-                        $queryBuilder->expr()->eq($table . '.l18n_parent', 0)
+                        $queryBuilder->expr()->eq($table.'.l18n_parent', 0)
                     );
                 }
 
@@ -748,7 +748,7 @@ 
                     ->select('*')
                     ->from($table)
                     ->where(
-                        $queryBuilder->expr()->eq($table . '.pid', $pid),
+                        $queryBuilder->expr()->eq($table.'.pid', $pid),
                         $additionalWhere,
                         self::whereExpression($table, true)
                     )
@@ -766,10 +766,10 @@ 
                         }
                     }
                 } else {
-                    self::log('No translation with PID ' . $pid . ' available in table "' . $table . '" or translation not accessible', LOG_SEVERITY_NOTICE);
+                    self::log('No translation with PID '.$pid.' available in table "'.$table.'" or translation not accessible', LOG_SEVERITY_NOTICE);
                 }
             } else {
-                self::log('No translations available for table "' . $table . '"', LOG_SEVERITY_WARNING);
+                self::log('No translations available for table "'.$table.'"', LOG_SEVERITY_WARNING);
             }
         }
 
@@ -811,9 +811,9 @@ 
             return GeneralUtility::makeInstance(ConnectionPool::class)
                 ->getQueryBuilderForTable($table)
                 ->expr()
-                ->eq($table . '.' . $GLOBALS['TCA'][$table]['ctrl']['delete'], 0);
+                ->eq($table.'.'.$GLOBALS['TCA'][$table]['ctrl']['delete'], 0);
         } else {
-            self::log('Unexpected TYPO3_MODE "' . \TYPO3_MODE . '"', LOG_SEVERITY_ERROR);
+            self::log('Unexpected TYPO3_MODE "'.\TYPO3_MODE.'"', LOG_SEVERITY_ERROR);
             return '1=-1';
         }
     }
@@ -852,7 +852,7 @@ 
      */
     public static function polyfillExtbaseClassesForTYPO3v9()
     {
-        $classes = require __DIR__ . '/../../Configuration/Extbase/Persistence/Classes.php';
+        $classes = require __DIR__.'/../../Configuration/Extbase/Persistence/Classes.php';
 
         $objectManager = GeneralUtility::makeInstance(ObjectManager::class);
         $configurationManager = $objectManager->get(ConfigurationManager::class);
@@ -908,10 +908,10 @@ 
         try {
             $response = $requestFactory->request($url, 'GET', $configuration);
         } catch (\Exception $e) {
-            self::log('Could not fetch data from URL "' . $url . '". Error: ' . $e->getMessage() . '.', LOG_SEVERITY_WARNING);
+            self::log('Could not fetch data from URL "'.$url.'". Error: '.$e->getMessage().'.', LOG_SEVERITY_WARNING);
             return false;
         }
-        $content  = $response->getBody()->getContents();
+        $content = $response->getBody()->getContents();
 
         return $content;
     }

Classes/Common/Indexer.php

Braces +9 added lines, -17 removed lines

@@ -32,8 +32,7 @@ 
  * @subpackage dlf
  * @access public
  */
-class Indexer
-{
+class Indexer {
     /**
      * The extension key
      *
@@ -93,8 +92,7 @@ 
      *
      * @return bool true on success or false on failure
      */
-    public static function add(Document $document)
-    {
+    public static function add(Document $document) {
         if (in_array($document->getUid(), self::$processedDocs)) {
             return true;
         } elseif (self::solrConnect($document->getSolrcore(), $document->getPid())) {
@@ -209,8 +207,7 @@ 
      *
      * @return string The field's dynamic index name
      */
-    public static function getIndexFieldName($index_name, $pid = 0)
-    {
+    public static function getIndexFieldName($index_name, $pid = 0) {
         // Sanitize input.
         $pid = max(intval($pid), 0);
         if (!$pid) {
@@ -236,8 +233,7 @@ 
      *
      * @return void
      */
-    protected static function loadIndexConf($pid)
-    {
+    protected static function loadIndexConf($pid) {
         if (!self::$fieldsLoaded) {
             $queryBuilder = GeneralUtility::makeInstance(ConnectionPool::class)
                 ->getQueryBuilderForTable('tx_dlf_metadata');
@@ -307,8 +303,7 @@ 
      *
      * @return bool true on success or false on failure
      */
-    protected static function processLogical(Document $document, array $logicalUnit)
-    {
+    protected static function processLogical(Document $document, array $logicalUnit) {
         $success = true;
         $doc = $document->getDoc();
         $doc->cPid = $document->getPid();
@@ -346,7 +341,7 @@ 
                 ) {
                     $solrDoc->setField('date', $metadata['date'][0]);
                 // change date YYYYMMDD to YYYY-MM-DD
-                } elseif (preg_match("/^[\d]{8}$/", $metadata['date'][0])){
+                } elseif (preg_match("/^[\d]{8}$/", $metadata['date'][0])) {
                     $solrDoc->setField('date', date("Y-m-d", strtotime($metadata['date'][0])));
                 // convert any datetime to proper ISO extended datetime format and timezone for SOLR
                 } else {
@@ -439,8 +434,7 @@ 
      *
      * @return bool true on success or false on failure
      */
-    protected static function processPhysical(Document $document, $page, array $physicalUnit)
-    {
+    protected static function processPhysical(Document $document, $page, array $physicalUnit) {
         $doc = $document->getDoc();
         $doc->cPid = $document->getPid();
         if ($doc->hasFulltext && $fullText = $doc->getFullText($physicalUnit['id'])) {
@@ -518,8 +512,7 @@ 
      *
      * @return bool true on success or false on failure
      */
-    protected static function solrConnect($core, $pid = 0)
-    {
+    protected static function solrConnect($core, $pid = 0) {
         // Get Solr instance.
         if (!self::$solr) {
             // Connect to Solr server.
@@ -588,8 +581,7 @@ 
      *
      * @access private
      */
-    private function __construct()
-    {
+    private function __construct() {
         // This is a static class, thus no instances should be created.
     }
 }

Spacing +17 added lines, -17 removed lines

@@ -115,7 +115,7 @@ 
                         $parent->setDoc($doc);
                         $success = self::add($parent);
                     } else {
-                        Helper::log('Could not load parent document with UID ' . $document->getDoc()->parentId, LOG_SEVERITY_ERROR);
+                        Helper::log('Could not load parent document with UID '.$document->getDoc()->parentId, LOG_SEVERITY_ERROR);
                         return false;
                     }
                 }
@@ -125,7 +125,7 @@ 
                 self::$processedDocs[] = $document->getUid();
                 // Delete old Solr documents.
                 $updateQuery = self::$solr->service->createUpdate();
-                $updateQuery->addDeleteQuery('uid:' . $document->getUid());
+                $updateQuery->addDeleteQuery('uid:'.$document->getUid());
                 self::$solr->service->update($updateQuery);
 
                 // Index every logical unit as separate Solr document.
@@ -174,14 +174,14 @@ 
             } catch (\Exception $e) {
                 if (!(\TYPO3_REQUESTTYPE & \TYPO3_REQUESTTYPE_CLI)) {
                     Helper::addMessage(
-                        Helper::getLanguageService()->getLL('flash.solrException') . ' ' . htmlspecialchars($e->getMessage()),
+                        Helper::getLanguageService()->getLL('flash.solrException').' '.htmlspecialchars($e->getMessage()),
                         Helper::getLanguageService()->getLL('flash.error'),
                         FlashMessage::ERROR,
                         true,
                         'core.template.flashMessages'
                     );
                 }
-                Helper::log('Apache Solr threw exception: "' . $e->getMessage() . '"', LOG_SEVERITY_ERROR);
+                Helper::log('Apache Solr threw exception: "'.$e->getMessage().'"', LOG_SEVERITY_ERROR);
                 return false;
             }
         } else {
@@ -214,7 +214,7 @@ 
         // Sanitize input.
         $pid = max(intval($pid), 0);
         if (!$pid) {
-            Helper::log('Invalid PID ' . $pid . ' for metadata configuration', LOG_SEVERITY_ERROR);
+            Helper::log('Invalid PID '.$pid.' for metadata configuration', LOG_SEVERITY_ERROR);
             return '';
         }
         // Load metadata configuration.
@@ -223,7 +223,7 @@ 
         $suffix = (in_array($index_name, self::$fields['tokenized']) ? 't' : 'u');
         $suffix .= (in_array($index_name, self::$fields['stored']) ? 's' : 'u');
         $suffix .= (in_array($index_name, self::$fields['indexed']) ? 'i' : 'u');
-        $index_name .= '_' . $suffix;
+        $index_name .= '_'.$suffix;
         return $index_name;
     }
 
@@ -337,7 +337,7 @@ 
             $solrDoc->setField('title', $metadata['title'][0], self::$fields['fieldboost']['title']);
             $solrDoc->setField('volume', $metadata['volume'][0], self::$fields['fieldboost']['volume']);
             // verify date formatting
-            if(strtotime($metadata['date'][0])) {
+            if (strtotime($metadata['date'][0])) {
                 // do not alter dates YYYY or YYYY-MM or YYYY-MM-DD
                 if (
                     preg_match("/^[\d]{4}$/", $metadata['date'][0])
@@ -346,7 +346,7 @@ 
                 ) {
                     $solrDoc->setField('date', $metadata['date'][0]);
                 // change date YYYYMMDD to YYYY-MM-DD
-                } elseif (preg_match("/^[\d]{8}$/", $metadata['date'][0])){
+                } elseif (preg_match("/^[\d]{8}$/", $metadata['date'][0])) {
                     $solrDoc->setField('date', date("Y-m-d", strtotime($metadata['date'][0])));
                 // convert any datetime to proper ISO extended datetime format and timezone for SOLR
                 } else {
@@ -374,11 +374,11 @@ 
                     $solrDoc->setField(self::getIndexFieldName($index_name, $document->getPid()), $data, self::$fields['fieldboost'][$index_name]);
                     if (in_array($index_name, self::$fields['sortables'])) {
                         // Add sortable fields to index.
-                        $solrDoc->setField($index_name . '_sorting', $metadata[$index_name . '_sorting'][0]);
+                        $solrDoc->setField($index_name.'_sorting', $metadata[$index_name.'_sorting'][0]);
                     }
                     if (in_array($index_name, self::$fields['facets'])) {
                         // Add facets to index.
-                        $solrDoc->setField($index_name . '_faceting', $data);
+                        $solrDoc->setField($index_name.'_faceting', $data);
                     }
                     if (in_array($index_name, self::$fields['autocomplete'])) {
                         $autocomplete = array_merge($autocomplete, $data);
@@ -403,14 +403,14 @@ 
             } catch (\Exception $e) {
                 if (!(\TYPO3_REQUESTTYPE & \TYPO3_REQUESTTYPE_CLI)) {
                     Helper::addMessage(
-                        Helper::getLanguageService()->getLL('flash.solrException') . '<br />' . htmlspecialchars($e->getMessage()),
+                        Helper::getLanguageService()->getLL('flash.solrException').'<br />'.htmlspecialchars($e->getMessage()),
                         Helper::getLanguageService()->getLL('flash.error'),
                         FlashMessage::ERROR,
                         true,
                         'core.template.flashMessages'
                     );
                 }
-                Helper::log('Apache Solr threw exception: "' . $e->getMessage() . '"', LOG_SEVERITY_ERROR);
+                Helper::log('Apache Solr threw exception: "'.$e->getMessage().'"', LOG_SEVERITY_ERROR);
                 return false;
             }
         }
@@ -476,7 +476,7 @@ 
                                 $data = self::removeAppendsFromAuthor($data);
                             }
                             // Add facets to index.
-                            $solrDoc->setField($index_name . '_faceting', $data);
+                            $solrDoc->setField($index_name.'_faceting', $data);
                         }
                     }
                     // Add sorting information to physical sub-elements if applicable.
@@ -484,7 +484,7 @@ 
                         !empty($data)
                         && substr($index_name, -8) == '_sorting'
                     ) {
-                        $solrDoc->setField($index_name , $doc->metadataArray[$doc->toplevelId][$index_name]);
+                        $solrDoc->setField($index_name, $doc->metadataArray[$doc->toplevelId][$index_name]);
                     }
                 }
             }
@@ -501,14 +501,14 @@ 
             } catch (\Exception $e) {
                 if (!(\TYPO3_REQUESTTYPE & \TYPO3_REQUESTTYPE_CLI)) {
                     Helper::addMessage(
-                        Helper::getLanguageService()->getLL('flash.solrException') . '<br />' . htmlspecialchars($e->getMessage()),
+                        Helper::getLanguageService()->getLL('flash.solrException').'<br />'.htmlspecialchars($e->getMessage()),
                         Helper::getLanguageService()->getLL('flash.error'),
                         FlashMessage::ERROR,
                         true,
                         'core.template.flashMessages'
                     );
                 }
-                Helper::log('Apache Solr threw exception: "' . $e->getMessage() . '"', LOG_SEVERITY_ERROR);
+                Helper::log('Apache Solr threw exception: "'.$e->getMessage().'"', LOG_SEVERITY_ERROR);
                 return false;
             }
         }
@@ -559,7 +559,7 @@ 
     private static function getSolrDocument($updateQuery, $document, $unit, $fullText = '') {
         $solrDoc = $updateQuery->createDocument();
         // Create unique identifier from document's UID and unit's XML ID.
-        $solrDoc->setField('id', $document->getUid() . $unit['id']);
+        $solrDoc->setField('id', $document->getUid().$unit['id']);
         $solrDoc->setField('uid', $document->getUid());
         $solrDoc->setField('pid', $document->getPid());
         $solrDoc->setField('partof', $document->getPartof());