Erikmitk / kitodo-presentation

Classes/Hooks/ConfigurationForm.php

Braces +4 added lines, -8 removed lines

@@ -27,8 +27,7 @@ 
  * @subpackage dlf
  * @access public
  */
-class ConfigurationForm
-{
+class ConfigurationForm {
     /**
      * This holds the current configuration
      *
@@ -44,8 +43,7 @@ 
      *
      * @return string Message informing the user of success or failure
      */
-    public function checkSolrConnection()
-    {
+    public function checkSolrConnection() {
         $solr = Solr::getInstance();
         if ($solr->ready) {
             Helper::addMessage(
@@ -70,8 +68,7 @@ 
      *
      * @return string Message informing the user of success or failure
      */
-    public function checkMetadataFormats()
-    {
+    public function checkMetadataFormats() {
         // We need to do some bootstrapping manually as of TYPO3 9.
         if (version_compare(\TYPO3\CMS\Core\Utility\VersionNumberUtility::getNumericTypo3Version(), '9.0.0', '>=')) {
             // Load table configuration array into $GLOBALS['TCA'].
@@ -202,8 +199,7 @@ 
      *
      * @return void
      */
-    public function __construct()
-    {
+    public function __construct() {
         // Load localization file.
         $GLOBALS['LANG']->includeLLFile('EXT:dlf/Resources/Private/Language/FlashMessages.xml');
         // Get current configuration.

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

@@ -75,9 +75,9 @@ 
         // We need to do some bootstrapping manually as of TYPO3 9.
         if (version_compare(\TYPO3\CMS\Core\Utility\VersionNumberUtility::getNumericTypo3Version(), '9.0.0', '>=')) {
             // Load table configuration array into $GLOBALS['TCA'].
-            ExtensionManagementUtility::loadBaseTca(false);
+            ExtensionManagementUtility::loadBaseTca(FALSE);
             // Get extension configuration from dlf/ext_localconf.php.
-            ExtensionManagementUtility::loadExtLocalconf(false);
+            ExtensionManagementUtility::loadExtLocalconf(FALSE);
             // Initialize backend user into $GLOBALS['BE_USER'].
             Bootstrap::initializeBackendUser();
             // Initialize backend and ensure authenticated access.
@@ -85,12 +85,12 @@ 
         }
 
         $nsDefined = [
-            'MODS' => false,
-            'TEIHDR' => false,
-            'ALTO' => false,
-            'IIIF1' => false,
-            'IIIF2' => false,
-            'IIIF3' => false
+            'MODS' => FALSE,
+            'TEIHDR' => FALSE,
+            'ALTO' => FALSE,
+            'IIIF1' => FALSE,
+            'IIIF2' => FALSE,
+            'IIIF3' => FALSE
         ];
         $queryBuilder = GeneralUtility::makeInstance(ConnectionPool::class)
             ->getQueryBuilderForTable('tx_dlf_formats');
@@ -105,7 +105,7 @@ 
             ->execute();
 
         while ($resArray = $result->fetch()) {
-            $nsDefined[$resArray['type']] = true;
+            $nsDefined[$resArray['type']] = TRUE;
         }
         // Build data array.
         $data = [];

Classes/Hooks/DataHandler.php

Spacing +12 added lines, -12 removed lines

@@ -118,10 +118,10 @@ 
                     ) {
                         // Get current configuration.
                         $result = $queryBuilder
-                            ->select($table . '.is_listed AS is_listed')
+                            ->select($table.'.is_listed AS is_listed')
                             ->from($table)
                             ->where(
-                                $queryBuilder->expr()->eq($table . '.uid', intval($id)),
+                                $queryBuilder->expr()->eq($table.'.uid', intval($id)),
                                 Helper::whereExpression($table)
                             )
                             ->setMaxResults(1)
@@ -143,10 +143,10 @@ 
                     ) {
                         // Get current configuration.
                         $result = $queryBuilder
-                            ->select($table . '.index_autocomplete AS index_autocomplete')
+                            ->select($table.'.index_autocomplete AS index_autocomplete')
                             ->from($table)
                             ->where(
-                                $queryBuilder->expr()->eq($table . '.uid', intval($id)),
+                                $queryBuilder->expr()->eq($table.'.uid', intval($id)),
                                 Helper::whereExpression($table)
                             )
                             ->setMaxResults(1)
@@ -167,10 +167,10 @@ 
                         } else {
                             // Get current index name.
                             $result = $queryBuilder
-                                ->select($table . '.index_autocomplete AS index_autocomplete')
+                                ->select($table.'.index_autocomplete AS index_autocomplete')
                                 ->from($table)
                                 ->where(
-                                    $queryBuilder->expr()->eq($table . '.uid', intval($id)),
+                                    $queryBuilder->expr()->eq($table.'.uid', intval($id)),
                                     Helper::whereExpression($table)
                                 )
                                 ->setMaxResults(1)
@@ -181,7 +181,7 @@ 
                                 $fieldArray['index_indexed'] = $resArray['index_autocomplete'];
                             }
                         }
-                        Helper::devLog('Prevented change of index_name for UID ' . $id . ' in table "' . $table . '"', DEVLOG_SEVERITY_NOTICE);
+                        Helper::devLog('Prevented change of index_name for UID '.$id.' in table "'.$table.'"', DEVLOG_SEVERITY_NOTICE);
                     }
                     break;
             }
@@ -250,7 +250,7 @@ 
                                 if ($solr->ready) {
                                     // Delete Solr document.
                                     $updateQuery = $solr->service->createUpdate();
-                                    $updateQuery->addDeleteQuery('uid:' . $id);
+                                    $updateQuery->addDeleteQuery('uid:'.$id);
                                     $updateQuery->addCommit();
                                     $solr->service->update($updateQuery);
                                 }
@@ -260,7 +260,7 @@ 
                                 if ($doc->ready) {
                                     Indexer::add($doc, $resArray['core']);
                                 } else {
-                                    Helper::devLog('Failed to re-index document with UID ' . $id, DEVLOG_SEVERITY_ERROR);
+                                    Helper::devLog('Failed to re-index document with UID '.$id, DEVLOG_SEVERITY_ERROR);
                                 }
                             }
                         }
@@ -330,7 +330,7 @@ 
                         if ($solr->ready) {
                             // Delete Solr document.
                             $updateQuery = $solr->service->createUpdate();
-                            $updateQuery->addDeleteQuery('uid:' . $id);
+                            $updateQuery->addDeleteQuery('uid:'.$id);
                             $updateQuery->addCommit();
                             $solr->service->update($updateQuery);
                             if ($command == 'delete') {
@@ -343,7 +343,7 @@ 
                         if ($doc->ready) {
                             Indexer::add($doc, $resArray['core']);
                         } else {
-                            Helper::devLog('Failed to re-index document with UID ' . $id, DEVLOG_SEVERITY_ERROR);
+                            Helper::devLog('Failed to re-index document with UID '.$id, DEVLOG_SEVERITY_ERROR);
                         }
                         break;
                 }
@@ -397,7 +397,7 @@ 
                             // Nothing to do here.
                         }
                     }
-                    Helper::devLog('Core ' . $resArray['core'] . ' could not be deleted from Apache Solr', DEVLOG_SEVERITY_WARNING);
+                    Helper::devLog('Core '.$resArray['core'].' could not be deleted from Apache Solr', DEVLOG_SEVERITY_WARNING);
                 }
             }
         }

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

@@ -384,9 +384,9 @@
                         $query = $solr->service->createCoreAdmin();
                         $action = $query->createUnload();
                         $action->setCore($resArray['core']);
-                        $action->setDeleteDataDir(true);
-                        $action->setDeleteIndex(true);
-                        $action->setDeleteInstanceDir(true);
+                        $action->setDeleteDataDir(TRUE);
+                        $action->setDeleteIndex(TRUE);
+                        $action->setDeleteInstanceDir(TRUE);
                         $query->setAction($action);
                         try {
                             $response = $solr->service->coreAdmin($query);

Classes/Common/Solr.php

Spacing +12 added lines, -12 removed lines

@@ -128,7 +128,7 @@ 
     {
         // Get next available core name if none given.
         if (empty($core)) {
-            $core = 'dlfCore' . self::getNextCoreNumber();
+            $core = 'dlfCore'.self::getNextCoreNumber();
         }
         // Get Solr service instance.
         $solr = self::getInstance($core);
@@ -224,13 +224,13 @@ 
                 ->execute();
 
             while ($resArray = $result->fetch()) {
-                $fields[] = $resArray['index_name'] . '_' . ($resArray['index_tokenized'] ? 't' : 'u') . ($resArray['index_stored'] ? 's' : 'u') . 'i';
+                $fields[] = $resArray['index_name'].'_'.($resArray['index_tokenized'] ? 't' : 'u').($resArray['index_stored'] ? 's' : 'u').'i';
             }
 
             // Check if queried field is valid.
             $splitQuery = explode(':', $query, 2);
             if (in_array($splitQuery[0], $fields)) {
-                $query = $splitQuery[0] . ':(' . self::escapeQuery(trim($splitQuery[1], '()')) . ')';
+                $query = $splitQuery[0].':('.self::escapeQuery(trim($splitQuery[1], '()')).')';
             } else {
                 $query = self::escapeQuery($query);
             }
@@ -294,7 +294,7 @@ 
     {
         $number = max(intval($number), 0);
         // Check if core already exists.
-        $solr = self::getInstance('dlfCore' . $number);
+        $solr = self::getInstance('dlfCore'.$number);
         if (!$solr->ready) {
             return $number;
         } else {
@@ -330,7 +330,7 @@ 
                 $config['path'] .= '/';
             }
             // Set connection timeout lower than PHP's max_execution_time.
-            $max_execution_time = intval(ini_get('max_execution_time')) ?: 30;
+            $max_execution_time = intval(ini_get('max_execution_time')) ? : 30;
             $config['timeout'] = MathUtility::forceIntegerInRange($conf['solrTimeout'], 1, $max_execution_time, 10);
             $this->config = $config;
         }
@@ -364,13 +364,13 @@ 
         // Extend filter query to get all documents with the same uids.
         foreach ($params['filterquery'] as $key => $value) {
             if (isset($value['query'])) {
-                $params['filterquery'][$key]['query'] = '{!join from=uid to=uid}' . $value['query'];
+                $params['filterquery'][$key]['query'] = '{!join from=uid to=uid}'.$value['query'];
             }
         }
         // Set filter query to just get toplevel documents.
         $params['filterquery'][] = ['query' => 'toplevel:true'];
         // Set join query to get all documents with the same uids.
-        $params['query'] = '{!join from=uid to=uid}' . $params['query'];
+        $params['query'] = '{!join from=uid to=uid}'.$params['query'];
         // Perform search to determine the total number of toplevel hits and fetch the required rows.
         $selectQuery = $this->service->createSelect($params);
         $results = $this->service->select($selectQuery);
@@ -560,12 +560,12 @@ 
      */
     public function __get($var)
     {
-        $method = '_get' . ucfirst($var);
+        $method = '_get'.ucfirst($var);
         if (
             !property_exists($this, $var)
             || !method_exists($this, $method)
         ) {
-            Helper::devLog('There is no getter function for property "' . $var . '"', DEVLOG_SEVERITY_WARNING);
+            Helper::devLog('There is no getter function for property "'.$var.'"', DEVLOG_SEVERITY_WARNING);
             return;
         } else {
             return $this->$method();
@@ -598,12 +598,12 @@ 
      */
     public function __set($var, $value)
     {
-        $method = '_set' . ucfirst($var);
+        $method = '_set'.ucfirst($var);
         if (
             !property_exists($this, $var)
             || !method_exists($this, $method)
         ) {
-            Helper::devLog('There is no setter function for property "' . $var . '"', DEVLOG_SEVERITY_WARNING);
+            Helper::devLog('There is no setter function for property "'.$var.'"', DEVLOG_SEVERITY_WARNING);
         } else {
             $this->$method($value);
         }
@@ -638,7 +638,7 @@ 
                     'scheme' => $this->config['scheme'],
                     'host' => $this->config['host'],
                     'port' => $this->config['port'],
-                    'path' => '/' . $this->config['path'],
+                    'path' => '/'.$this->config['path'],
                     'core' => $core,
                     'username' => $this->config['username'],
                     'password' => $this->config['password']

Braces +21 added lines, -42 removed lines

@@ -33,8 +33,7 @@ 
  * @property-read bool $ready Is the Solr service instantiated successfully?
  * @property-read \Solarium\Client $service This holds the Solr service object
  */
-class Solr
-{
+class Solr {
     /**
      * This holds the Solr configuration
      *
@@ -124,8 +123,7 @@ 
      *
      * @return string The name of the new core
      */
-    public static function createCore($core = '')
-    {
+    public static function createCore($core = '') {
         // Get next available core name if none given.
         if (empty($core)) {
             $core = 'dlfCore' . self::getNextCoreNumber();
@@ -172,8 +170,7 @@ 
      *
      * @return string The escaped query string
      */
-    public static function escapeQuery($query)
-    {
+    public static function escapeQuery($query) {
         $helper = GeneralUtility::makeInstance(\Solarium\Core\Query\Helper::class);
         // Escape query phrase or term.
         if (preg_match('/^".*"$/', $query)) {
@@ -196,8 +193,7 @@ 
      *
      * @return string The escaped query string
      */
-    public static function escapeQueryKeepField($query, $pid)
-    {
+    public static function escapeQueryKeepField($query, $pid) {
         // Is there a field query?
         if (preg_match('/^[[:alnum:]]+_[tu][su]i:\(?.*\)?$/', $query)) {
             $queryBuilder = GeneralUtility::makeInstance(ConnectionPool::class)
@@ -249,8 +245,7 @@ 
      *
      * @return \Kitodo\Dlf\Common\Solr Instance of this class
      */
-    public static function getInstance($core = null)
-    {
+    public static function getInstance($core = null) {
         // Get core name if UID is given.
         if (MathUtility::canBeInterpretedAsInteger($core)) {
             $core = Helper::getIndexNameFromUid($core, 'tx_dlf_solrcores');
@@ -290,8 +285,7 @@ 
      *
      * @return int First unused core number found
      */
-    public static function getNextCoreNumber($number = 0)
-    {
+    public static function getNextCoreNumber($number = 0) {
         $number = max(intval($number), 0);
         // Check if core already exists.
         $solr = self::getInstance('dlfCore' . $number);
@@ -309,8 +303,7 @@ 
      *
      * @return void
      */
-    protected function loadSolrConnectionInfo()
-    {
+    protected function loadSolrConnectionInfo() {
         if (empty($this->config)) {
             $config = [];
             // Extract extension configuration.
@@ -343,8 +336,7 @@ 
      *
      * @return \Kitodo\Dlf\Common\DocumentList The result list
      */
-    public function search()
-    {
+    public function search() {
         $toplevel = [];
         // Take over query parameters.
         $params = $this->params;
@@ -419,8 +411,7 @@ 
      *
      * @return array The Apache Solr Documents that were fetched
      */
-    public function search_raw($query = '', $parameters = [])
-    {
+    public function search_raw($query = '', $parameters = []) {
         // Set additional query parameters.
         $parameters['start'] = 0;
         $parameters['rows'] = $this->limit;
@@ -454,8 +445,7 @@ 
      *
      * @return string|null The core name of the current query endpoint or null if core admin endpoint
      */
-    protected function _getCore()
-    {
+    protected function _getCore() {
         return $this->core;
     }
 
@@ -466,8 +456,7 @@ 
      *
      * @return int The max number of results
      */
-    protected function _getLimit()
-    {
+    protected function _getLimit() {
         return $this->limit;
     }
 
@@ -478,8 +467,7 @@ 
      *
      * @return int Total number of hits for last search
      */
-    protected function _getNumberOfHits()
-    {
+    protected function _getNumberOfHits() {
         return $this->numberOfHits;
     }
 
@@ -490,8 +478,7 @@ 
      *
      * @return bool Is the search instantiated successfully?
      */
-    protected function _getReady()
-    {
+    protected function _getReady() {
         return $this->ready;
     }
 
@@ -502,8 +489,7 @@ 
      *
      * @return \Solarium\Client Apache Solr service object
      */
-    protected function _getService()
-    {
+    protected function _getService() {
         return $this->service;
     }
 
@@ -516,8 +502,7 @@ 
      *
      * @return void
      */
-    protected function _setCPid($value)
-    {
+    protected function _setCPid($value) {
         $this->cPid = max(intval($value), 0);
     }
 
@@ -530,8 +515,7 @@ 
      *
      * @return void
      */
-    protected function _setLimit($value)
-    {
+    protected function _setLimit($value) {
         $this->limit = max(intval($value), 0);
     }
 
@@ -544,8 +528,7 @@ 
      *
      * @return void
      */
-    protected function _setParams(array $value)
-    {
+    protected function _setParams(array $value) {
         $this->params = $value;
     }
 
@@ -558,8 +541,7 @@ 
      *
      * @return mixed Value of $this->$var
      */
-    public function __get($var)
-    {
+    public function __get($var) {
         $method = '_get' . ucfirst($var);
         if (
             !property_exists($this, $var)
@@ -581,8 +563,7 @@ 
      *
      * @return bool true if variable is set and not empty, false otherwise
      */
-    public function __isset($var)
-    {
+    public function __isset($var) {
         return !empty($this->__get($var));
     }
 
@@ -596,8 +577,7 @@ 
      *
      * @return void
      */
-    public function __set($var, $value)
-    {
+    public function __set($var, $value) {
         $method = '_set' . ucfirst($var);
         if (
             !property_exists($this, $var)
@@ -618,8 +598,7 @@ 
      *
      * @return void
      */
-    protected function __construct($core)
-    {
+    protected function __construct($core) {
         // Get Solr connection parameters from configuration.
         $this->loadSolrConnectionInfo();
         // Configure connection adapter.

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

@@ -49,7 +49,7 @@ 
      * @var string|null
      * @access protected
      */
-    protected $core = null;
+    protected $core = NULL;
 
     /**
      * This holds the PID for the configuration
@@ -97,7 +97,7 @@ 
      * @var bool
      * @access protected
      */
-    protected $ready = false;
+    protected $ready = FALSE;
 
     /**
      * This holds the singleton search objects with their core as array key
@@ -249,7 +249,7 @@ 
      *
      * @return \Kitodo\Dlf\Common\Solr Instance of this class
      */
-    public static function getInstance($core = null)
+    public static function getInstance($core = NULL)
     {
         // Get core name if UID is given.
         if (MathUtility::canBeInterpretedAsInteger($core)) {
@@ -258,7 +258,7 @@ 
         // Check if core is set or null.
         if (
             empty($core)
-            && $core !== null
+            && $core !== NULL
         ) {
             Helper::devLog('Invalid core UID or name given for Apache Solr', DEVLOG_SEVERITY_ERROR);
         }
@@ -401,7 +401,7 @@ 
                 'core' => $this->core,
                 'pid' => $this->cPid,
                 'order' => 'score',
-                'order.asc' => true,
+                'order.asc' => TRUE,
                 'numberOfHits' => $this->numberOfHits,
                 'numberOfToplevelHits' => $numberOfToplevelHits
             ]
@@ -432,7 +432,7 @@ 
         $cache = GeneralUtility::makeInstance(CacheManager::class)->getCache('tx_dlf_solr');
 
         $resultSet = [];
-        if (($entry = $cache->get($cacheIdentifier)) === false) {
+        if (($entry = $cache->get($cacheIdentifier)) === FALSE) {
             $selectQuery = $this->service->createSelect(array_merge($this->params, $parameters));
             $result = $this->service->select($selectQuery);
             foreach ($result as $doc) {
@@ -630,7 +630,7 @@ 
             // we have to provide an PSR-14 Event Dispatcher instead of
             // "null".
             // $eventDispatcher = GeneralUtility::makeInstance(\TYPO3\CMS\Core\EventDispatcher\EventDispatcher::class);
-        $eventDispatcher = null;
+        $eventDispatcher = NULL;
         // Configure endpoint.
         $config = [
             'endpoint' => [
@@ -650,7 +650,7 @@ 
         // Check if connection is established.
         $query = $this->service->createCoreAdmin();
         $action = $query->createStatus();
-        if ($core !== null) {
+        if ($core !== NULL) {
             $action->setCore($core);
         }
         $query->setAction($action);
@@ -658,7 +658,7 @@ 
             $response = $this->service->coreAdmin($query);
             if ($response->getWasSuccessful()) {
                 // Solr is reachable, but is the core as well?
-                if ($core !== null) {
+                if ($core !== NULL) {
                     $result = $response->getStatusResult();
                     if (
                         $result instanceof \Solarium\QueryType\Server\CoreAdmin\Result\StatusResult
@@ -672,7 +672,7 @@ 
                     }
                 }
                 // Instantiation successful!
-                $this->ready = true;
+                $this->ready = TRUE;
             }
         } catch (\Exception $e) {
             // Nothing to do here.

Classes/Plugin/OaiPmh.php

Spacing +40 added lines, -40 removed lines

@@ -87,7 +87,7 @@ 
             ->delete('tx_dlf_tokens')
             ->where(
                 $queryBuilder->expr()->eq('tx_dlf_tokens.ident', $queryBuilder->createNamedParameter('oai')),
-                $queryBuilder->expr()->lt('tx_dlf_tokens.tstamp', $queryBuilder->createNamedParameter((int)($GLOBALS['EXEC_TIME'] - $this->conf['expired'])))
+                $queryBuilder->expr()->lt('tx_dlf_tokens.tstamp', $queryBuilder->createNamedParameter((int) ($GLOBALS['EXEC_TIME'] - $this->conf['expired'])))
             )
             ->execute();
 
@@ -157,13 +157,13 @@ 
         $oai_dc = $this->oai->createElementNS($this->formats['oai_dc']['namespace'], 'oai_dc:dc');
         $oai_dc->setAttributeNS('http://www.w3.org/2000/xmlns/', 'xmlns:dc', 'http://purl.org/dc/elements/1.1/');
         $oai_dc->setAttributeNS('http://www.w3.org/2000/xmlns/', 'xmlns:xsi', 'http://www.w3.org/2001/XMLSchema-instance');
-        $oai_dc->setAttributeNS('http://www.w3.org/2001/XMLSchema-instance', 'xsi:schemaLocation', $this->formats['oai_dc']['namespace'] . ' ' . $this->formats['oai_dc']['schema']);
+        $oai_dc->setAttributeNS('http://www.w3.org/2001/XMLSchema-instance', 'xsi:schemaLocation', $this->formats['oai_dc']['namespace'].' '.$this->formats['oai_dc']['schema']);
         $oai_dc->appendChild($this->oai->createElementNS('http://purl.org/dc/elements/1.1/', 'dc:identifier', htmlspecialchars($metadata['record_id'], ENT_NOQUOTES, 'UTF-8')));
         if (!empty($metadata['purl'])) {
             $oai_dc->appendChild($this->oai->createElementNS('http://purl.org/dc/elements/1.1/', 'dc:identifier', htmlspecialchars($metadata['purl'], ENT_NOQUOTES, 'UTF-8')));
         }
         if (!empty($metadata['prod_id'])) {
-            $oai_dc->appendChild($this->oai->createElementNS('http://purl.org/dc/elements/1.1/', 'dc:identifier', 'kitodo:production:' . htmlspecialchars($metadata['prod_id'], ENT_NOQUOTES, 'UTF-8')));
+            $oai_dc->appendChild($this->oai->createElementNS('http://purl.org/dc/elements/1.1/', 'dc:identifier', 'kitodo:production:'.htmlspecialchars($metadata['prod_id'], ENT_NOQUOTES, 'UTF-8')));
         }
         if (!empty($metadata['urn'])) {
             $oai_dc->appendChild($this->oai->createElementNS('http://purl.org/dc/elements/1.1/', 'dc:identifier', htmlspecialchars($metadata['urn'], ENT_NOQUOTES, 'UTF-8')));
@@ -260,7 +260,7 @@ 
         }
         // Add attributes and build XML tree.
         $epicur->setAttributeNS('http://www.w3.org/2000/xmlns/', 'xmlns:xsi', 'http://www.w3.org/2001/XMLSchema-instance');
-        $epicur->setAttributeNS('http://www.w3.org/2001/XMLSchema-instance', 'xsi:schemaLocation', $this->formats['epicur']['namespace'] . ' ' . $this->formats['epicur']['schema']);
+        $epicur->setAttributeNS('http://www.w3.org/2001/XMLSchema-instance', 'xsi:schemaLocation', $this->formats['epicur']['namespace'].' '.$this->formats['epicur']['schema']);
         // Do we update an URN or register a new one?
         if ($metadata['tstamp'] == $metadata['crdate']) {
             $update->setAttribute('type', 'urn_new');
@@ -307,10 +307,10 @@ 
                 // Import node into \DOMDocument.
                 $mets = $this->oai->importNode($root->item(0), true);
             } else {
-                Helper::devLog('No METS part found in document with location "' . $metadata['location'] . '"', DEVLOG_SEVERITY_ERROR);
+                Helper::devLog('No METS part found in document with location "'.$metadata['location'].'"', DEVLOG_SEVERITY_ERROR);
             }
         } else {
-            Helper::devLog('Could not load XML file from "' . $metadata['location'] . '"', DEVLOG_SEVERITY_ERROR);
+            Helper::devLog('Could not load XML file from "'.$metadata['location'].'"', DEVLOG_SEVERITY_ERROR);
         }
         if ($mets === null) {
             $mets = $this->oai->createElementNS('http://kitodo.org/', 'kitodo:error', htmlspecialchars($this->pi_getLL('error', 'Error!'), ENT_NOQUOTES, 'UTF-8'));
@@ -346,15 +346,15 @@ 
             if (strpos($this->conf['stylesheet'], 'EXT:') === 0) {
                 [$extKey, $filePath] = explode('/', substr($this->conf['stylesheet'], 4), 2);
                 if (\TYPO3\CMS\Core\Utility\ExtensionManagementUtility::isLoaded($extKey)) {
-                    $this->conf['stylesheet'] = \TYPO3\CMS\Core\Utility\PathUtility::stripPathSitePrefix(\TYPO3\CMS\Core\Utility\ExtensionManagementUtility::extPath($extKey)) . $filePath;
+                    $this->conf['stylesheet'] = \TYPO3\CMS\Core\Utility\PathUtility::stripPathSitePrefix(\TYPO3\CMS\Core\Utility\ExtensionManagementUtility::extPath($extKey)).$filePath;
                 }
             }
             $stylesheet = \TYPO3\CMS\Core\Utility\GeneralUtility::locationHeaderUrl($this->conf['stylesheet']);
         } else {
             // Use default stylesheet if no custom stylesheet is given.
-            $stylesheet = \TYPO3\CMS\Core\Utility\GeneralUtility::locationHeaderUrl(\TYPO3\CMS\Core\Utility\PathUtility::stripPathSitePrefix(\TYPO3\CMS\Core\Utility\ExtensionManagementUtility::extPath($this->extKey)) . 'Resources/Public/Stylesheets/OaiPmh.xsl');
+            $stylesheet = \TYPO3\CMS\Core\Utility\GeneralUtility::locationHeaderUrl(\TYPO3\CMS\Core\Utility\PathUtility::stripPathSitePrefix(\TYPO3\CMS\Core\Utility\ExtensionManagementUtility::extPath($this->extKey)).'Resources/Public/Stylesheets/OaiPmh.xsl');
         }
-        $this->oai->appendChild($this->oai->createProcessingInstruction('xml-stylesheet', 'type="text/xsl" href="' . htmlspecialchars($stylesheet, ENT_NOQUOTES, 'UTF-8') . '"'));
+        $this->oai->appendChild($this->oai->createProcessingInstruction('xml-stylesheet', 'type="text/xsl" href="'.htmlspecialchars($stylesheet, ENT_NOQUOTES, 'UTF-8').'"'));
         // Create root element.
         $root = $this->oai->createElementNS('http://www.openarchives.org/OAI/2.0/', 'OAI-PMH');
         $root->setAttributeNS('http://www.w3.org/2000/xmlns/', 'xmlns:xsi', 'http://www.w3.org/2001/XMLSchema-instance');
@@ -405,10 +405,10 @@ 
         // Send headers.
         header('HTTP/1.1 200 OK');
         header('Cache-Control: no-cache');
-        header('Content-Length: ' . strlen($content));
+        header('Content-Length: '.strlen($content));
         header('Content-Type: text/xml; charset=utf-8');
-        header('Date: ' . date('r', $GLOBALS['EXEC_TIME']));
-        header('Expires: ' . date('r', $GLOBALS['EXEC_TIME'] + $this->conf['expired']));
+        header('Date: '.date('r', $GLOBALS['EXEC_TIME']));
+        header('Expires: '.date('r', $GLOBALS['EXEC_TIME'] + $this->conf['expired']));
         echo $content;
         exit;
     }
@@ -469,16 +469,16 @@ 
 
         $connection = GeneralUtility::makeInstance(ConnectionPool::class)->getConnectionForTable('tx_dlf_documents');
 
-        $sql = 'SELECT `tx_dlf_documents`.*, GROUP_CONCAT(DISTINCT `tx_dlf_collections`.`oai_name` ORDER BY `tx_dlf_collections`.`oai_name` SEPARATOR " ") AS `collections` ' .
-            'FROM `tx_dlf_documents` ' .
-            'INNER JOIN `tx_dlf_relations` ON `tx_dlf_relations`.`uid_local` = `tx_dlf_documents`.`uid` ' .
-            'INNER JOIN `tx_dlf_collections` ON `tx_dlf_collections`.`uid` = `tx_dlf_relations`.`uid_foreign` ' .
-            'WHERE `tx_dlf_documents`.`record_id` = ? ' .
-            'AND `tx_dlf_documents`.`pid` = ? ' .
-            'AND `tx_dlf_collections`.`pid` = ? ' .
-            'AND `tx_dlf_relations`.`ident`="docs_colls" ' .
-            $where .
-            'AND ' . Helper::whereExpression('tx_dlf_collections');
+        $sql = 'SELECT `tx_dlf_documents`.*, GROUP_CONCAT(DISTINCT `tx_dlf_collections`.`oai_name` ORDER BY `tx_dlf_collections`.`oai_name` SEPARATOR " ") AS `collections` '.
+            'FROM `tx_dlf_documents` '.
+            'INNER JOIN `tx_dlf_relations` ON `tx_dlf_relations`.`uid_local` = `tx_dlf_documents`.`uid` '.
+            'INNER JOIN `tx_dlf_collections` ON `tx_dlf_collections`.`uid` = `tx_dlf_relations`.`uid_foreign` '.
+            'WHERE `tx_dlf_documents`.`record_id` = ? '.
+            'AND `tx_dlf_documents`.`pid` = ? '.
+            'AND `tx_dlf_collections`.`pid` = ? '.
+            'AND `tx_dlf_relations`.`ident`="docs_colls" '.
+            $where.
+            'AND '.Helper::whereExpression('tx_dlf_collections');
 
         $values = [
             $this->piVars['identifier'],
@@ -605,7 +605,7 @@ 
             $timestamp = $resArray['tstamp'];
             $earliestDatestamp = gmdate('Y-m-d\TH:i:s\Z', $timestamp);
         } else {
-            Helper::devLog('No records found with PID ' . $this->conf['pages'], DEVLOG_SEVERITY_NOTICE);
+            Helper::devLog('No records found with PID '.$this->conf['pages'], DEVLOG_SEVERITY_NOTICE);
         }
         $linkConf = [
             'parameter' => $GLOBALS['TSFE']->id,
@@ -866,9 +866,9 @@ 
             }
             $resArray = $allResults[0];
             if ($resArray['index_query'] != "") {
-                $solr_query .= '(' . $resArray['index_query'] . ')';
+                $solr_query .= '('.$resArray['index_query'].')';
             } else {
-                $solr_query .= 'collection:' . '"' . $resArray['index_name'] . '"';
+                $solr_query .= 'collection:'.'"'.$resArray['index_name'].'"';
             }
         } else {
             // If no set is specified we have to query for all collections
@@ -876,7 +876,7 @@ 
         }
         // Check for required fields.
         foreach ($this->formats[$this->piVars['metadataPrefix']]['requiredFields'] as $required) {
-            $solr_query .= ' NOT ' . $required . ':""';
+            $solr_query .= ' NOT '.$required.':""';
         }
         // toplevel="true" is always required
         $solr_query .= ' AND toplevel:true';
@@ -889,7 +889,7 @@ 
                 || is_array($date_array = strptime($this->piVars['from'], '%Y-%m-%d'))
             ) {
                 $timestamp = gmmktime($date_array['tm_hour'], $date_array['tm_min'], $date_array['tm_sec'], $date_array['tm_mon'] + 1, $date_array['tm_mday'], $date_array['tm_year'] + 1900);
-                $from = date("Y-m-d", $timestamp) . 'T' . date("H:i:s", $timestamp) . '.000Z';
+                $from = date("Y-m-d", $timestamp).'T'.date("H:i:s", $timestamp).'.000Z';
             } else {
                 throw new \Exception('badArgument');
             }
@@ -903,7 +903,7 @@ 
                 || is_array($date_array = strptime($this->piVars['until'], '%Y-%m-%d'))
             ) {
                 $timestamp = gmmktime($date_array['tm_hour'], $date_array['tm_min'], $date_array['tm_sec'], $date_array['tm_mon'] + 1, $date_array['tm_mday'], $date_array['tm_year'] + 1900);
-                $until = date("Y-m-d", $timestamp) . 'T' . date("H:i:s", $timestamp) . '.999Z';
+                $until = date("Y-m-d", $timestamp).'T'.date("H:i:s", $timestamp).'.999Z';
                 if ($from != "*" && $from > $until) {
                     throw new \Exception('badArgument');
                 }
@@ -920,7 +920,7 @@ 
                 throw new \Exception('badArgument');
             }
         }
-        $solr_query .= ' AND timestamp:[' . $from . ' TO ' . $until . ']';
+        $solr_query .= ' AND timestamp:['.$from.' TO '.$until.']';
         $documentSet = [];
         $solr = Solr::getInstance($this->conf['solrcore']);
         if (!$solr->ready) {
@@ -957,22 +957,22 @@ 
      */
     protected function generateOutputForDocumentList(DocumentList $documentListSet)
     {
-        $documentsToProcess = $documentListSet->removeRange(0, (int)$this->conf['limit']);
+        $documentsToProcess = $documentListSet->removeRange(0, (int) $this->conf['limit']);
         $verb = $this->piVars['verb'];
 
         $connection = GeneralUtility::makeInstance(ConnectionPool::class)
             ->getConnectionForTable('tx_dlf_documents');
 
-        $sql = 'SELECT `tx_dlf_documents`.*, GROUP_CONCAT(DISTINCT `tx_dlf_collections`.`oai_name` ORDER BY `tx_dlf_collections`.`oai_name` SEPARATOR " ") AS `collections` ' .
-            'FROM `tx_dlf_documents` ' .
-            'INNER JOIN `tx_dlf_relations` ON `tx_dlf_relations`.`uid_local` = `tx_dlf_documents`.`uid` ' .
-            'INNER JOIN `tx_dlf_collections` ON `tx_dlf_collections`.`uid` = `tx_dlf_relations`.`uid_foreign` ' .
-            'WHERE `tx_dlf_documents`.`uid` IN ( ? ) ' .
-            'AND `tx_dlf_documents`.`pid` = ? ' .
-            'AND `tx_dlf_collections`.`pid` = ? ' .
-            'AND `tx_dlf_relations`.`ident`="docs_colls" ' .
-            'AND ' . Helper::whereExpression('tx_dlf_collections') . ' ' .
-            'GROUP BY `tx_dlf_documents`.`uid` ' .
+        $sql = 'SELECT `tx_dlf_documents`.*, GROUP_CONCAT(DISTINCT `tx_dlf_collections`.`oai_name` ORDER BY `tx_dlf_collections`.`oai_name` SEPARATOR " ") AS `collections` '.
+            'FROM `tx_dlf_documents` '.
+            'INNER JOIN `tx_dlf_relations` ON `tx_dlf_relations`.`uid_local` = `tx_dlf_documents`.`uid` '.
+            'INNER JOIN `tx_dlf_collections` ON `tx_dlf_collections`.`uid` = `tx_dlf_relations`.`uid_foreign` '.
+            'WHERE `tx_dlf_documents`.`uid` IN ( ? ) '.
+            'AND `tx_dlf_documents`.`pid` = ? '.
+            'AND `tx_dlf_collections`.`pid` = ? '.
+            'AND `tx_dlf_relations`.`ident`="docs_colls" '.
+            'AND '.Helper::whereExpression('tx_dlf_collections').' '.
+            'GROUP BY `tx_dlf_documents`.`uid` '.
             'LIMIT ?';
 
         $values = [

Classes/Plugin/Eid/SearchSuggest.php

Braces +2 added lines, -4 removed lines

@@ -28,16 +28,14 @@
  * @subpackage dlf
  * @access public
  */
-class SearchSuggest
-{
+class SearchSuggest {
     /**
      * The main method of the eID script
      *
     *  @param ServerRequestInterface $request
      * @return ResponseInterface XML response of search suggestions
      */
-    public function main(ServerRequestInterface $request)
-    {
+    public function main(ServerRequestInterface $request) {
         $output = [];
         // Get input parameters and decrypt core name.
         $parameters = $request->getParsedBody();

Classes/Plugin/Eid/SearchInDocument.php

Spacing +1 added lines, -1 removed lines

@@ -55,7 +55,7 @@
         if ($solr->ready) {
             $query = $solr->service->createSelect();
             $query->setFields(['id', 'uid', 'page']);
-            $query->setQuery('fulltext:(' . Solr::escapeQuery((string) $parameters['q']) . ') AND uid:' . intval($parameters['uid']));
+            $query->setQuery('fulltext:('.Solr::escapeQuery((string) $parameters['q']).') AND uid:'.intval($parameters['uid']));
             $query->setStart($count)->setRows(20);
             $hl = $query->getHighlighting();
             $hl->setFields(['fulltext']);

Braces +2 added lines, -4 removed lines

@@ -27,16 +27,14 @@
  * @subpackage dlf
  * @access public
  */
-class SearchInDocument
-{
+class SearchInDocument {
     /**
      * The main method of the eID script
      *
      * @param ServerRequestInterface $request
      * @return ResponseInterface JSON response of search suggestions
      */
-    public function main(ServerRequestInterface $request)
-    {
+    public function main(ServerRequestInterface $request) {
         $output = [
             'documents' => [],
             'numFound' => 0

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

@@ -59,7 +59,7 @@
             $query->setStart($count)->setRows(20);
             $hl = $query->getHighlighting();
             $hl->setFields(['fulltext']);
-            $hl->setUseFastVectorHighlighter(true);
+            $hl->setUseFastVectorHighlighter(TRUE);
             $results = $solr->service->select($query);
             $output['numFound'] = $results->getNumFound();
             $highlighting = $results->getHighlighting();

class.ext_update.php

Spacing +2 added lines, -2 removed lines

@@ -116,7 +116,7 @@ 
         }
         foreach ($rows as $row) {
             if ($row['format'] === 0 && $row['xpath']) {
-                $uids[] = (int)$row['uid'];
+                $uids[] = (int) $row['uid'];
             }
         }
         return $uids;
@@ -224,7 +224,7 @@ 
         $result = $queryBuilder
             ->select('COLUMN_NAME')
             ->from('INFORMATION_SCHEMA.COLUMNS')
-            ->where('TABLE_NAME="tx_dlf_documents" AND TABLE_SCHEMA="' . $database . '" AND COLUMN_NAME="document_format"')
+            ->where('TABLE_NAME="tx_dlf_documents" AND TABLE_SCHEMA="'.$database.'" AND COLUMN_NAME="document_format"')
             ->execute();
         while ($resArray = $result->fetch()) {
             if ($resArray['COLUMN_NAME'] === 'document_format') {

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

@@ -43,21 +43,21 @@ 
     public function access(): bool
     {
         if (count($this->getMetadataConfig())) {
-            return true;
+            return TRUE;
         }
         if ($this->oldIndexRelatedTableNames()) {
-            return true;
+            return TRUE;
         }
         if ($this->solariumSolrUpdateRequired()) {
-            return true;
+            return TRUE;
         }
         if (count($this->oldFormatClasses())) {
-            return true;
+            return TRUE;
         }
         if ($this->hasNoFormatForDocument()) {
-            return true;
+            return TRUE;
         }
-        return false;
+        return FALSE;
     }
 
     /**
@@ -142,10 +142,10 @@ 
             // Instantiate search object.
             $solr = Solr::getInstance($resArray['index_name']);
             if (!$solr->ready) {
-                return true;
+                return TRUE;
             }
         }
-        return false;
+        return FALSE;
     }
 
     /**
@@ -201,10 +201,10 @@ 
                 || $resArray['column_name'] === 'boost'
                 || $resArray['column_name'] === 'autocomplete'
             ) {
-                return true;
+                return TRUE;
             }
         }
-        return false;
+        return FALSE;
     }
 
     /**
@@ -214,7 +214,7 @@ 
      * @param bool $checkStructureOnly
      * @return bool
      */
-    protected function hasNoFormatForDocument($checkStructureOnly = false): bool
+    protected function hasNoFormatForDocument($checkStructureOnly = FALSE): bool
     {
         // Check if column "document_format" exists.
         $database = $GLOBALS['TYPO3_CONF_VARS']['DB']['Connections']['Default']['dbname'];
@@ -229,7 +229,7 @@ 
         while ($resArray = $result->fetch()) {
             if ($resArray['COLUMN_NAME'] === 'document_format') {
                 if ($checkStructureOnly) {
-                    return false;
+                    return FALSE;
                 }
                 // Check if column has empty fields.
                 $queryBuilder = GeneralUtility::makeInstance(ConnectionPool::class)->getQueryBuilderForTable('INFORMATION_SCHEMA.COLUMNS');
@@ -241,11 +241,11 @@ 
                     ->fetchColumn(0);
 
                 if ($count === 0) {
-                    return false;
+                    return FALSE;
                 }
             }
         }
-        return true;
+        return TRUE;
     }
 
     /**
@@ -395,7 +395,7 @@ 
      */
     protected function doSolariumSolrUpdate(): void
     {
-        $error = false;
+        $error = FALSE;
         // Get all Solr cores that were not deleted.
         $queryBuilder = GeneralUtility::makeInstance(ConnectionPool::class)->getQueryBuilderForTable('tx_dlf_solrcores');
         $result = $queryBuilder
@@ -412,7 +412,7 @@ 
                     \TYPO3\CMS\Core\Messaging\FlashMessage::ERROR
                 );
                 $this->content .= Helper::renderFlashMessages();
-                $error = true;
+                $error = TRUE;
             }
         }
         if (!$error) {
@@ -439,7 +439,7 @@ 
             ->update('tx_dlf_documents')
             ->where(
                 $queryBuilder->expr()->orX(
-                    $queryBuilder->expr()->eq('document_format', $queryBuilder->createNamedParameter(null)),
+                    $queryBuilder->expr()->eq('document_format', $queryBuilder->createNamedParameter(NULL)),
                     $queryBuilder->expr()->eq('document_format', $queryBuilder->createNamedParameter(''))
                 )
             )