Erikmitk / kitodo-presentation

Classes/Plugin/OaiPmh.php

Braces +18 added lines, -36 removed lines

@@ -27,8 +27,7 @@ 
  * @subpackage dlf
  * @access public
  */
-class OaiPmh extends \Kitodo\Dlf\Common\AbstractPlugin
-{
+class OaiPmh extends \Kitodo\Dlf\Common\AbstractPlugin {
     public $scriptRelPath = 'Classes/Plugin/OaiPmh.php';
 
     /**
@@ -78,8 +77,7 @@ 
      *
      * @return void
      */
-    protected function deleteExpiredTokens()
-    {
+    protected function deleteExpiredTokens() {
         // Delete expired resumption tokens.
         $queryBuilder = GeneralUtility::makeInstance(ConnectionPool::class)->getQueryBuilderForTable('tx_dlf_tokens');
 
@@ -106,8 +104,7 @@ 
      *
      * @return \DOMElement XML node to add to the OAI response
      */
-    protected function error($type)
-    {
+    protected function error($type) {
         $this->error = true;
         $error = $this->oai->createElementNS('http://www.openarchives.org/OAI/2.0/', 'error', htmlspecialchars($this->pi_getLL($type, $type), ENT_NOQUOTES, 'UTF-8'));
         $error->setAttribute('code', $type);
@@ -121,8 +118,7 @@ 
      *
      * @return void
      */
-    protected function getUrlParams()
-    {
+    protected function getUrlParams() {
         $allowedParams = [
             'verb',
             'identifier',
@@ -152,8 +148,7 @@ 
      *
      * @return \DOMElement XML node to add to the OAI response
      */
-    protected function getDcData(array $metadata)
-    {
+    protected function getDcData(array $metadata) {
         $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');
@@ -231,8 +226,7 @@ 
      *
      * @return \DOMElement XML node to add to the OAI response
      */
-    protected function getEpicurData(array $metadata)
-    {
+    protected function getEpicurData(array $metadata) {
         // Define all XML elements with or without qualified namespace.
         if (empty($this->conf['unqualified_epicur'])) {
             $epicur = $this->oai->createElementNS($this->formats['epicur']['namespace'], 'epicur:epicur');
@@ -295,8 +289,7 @@ 
      *
      * @return \DOMElement XML node to add to the OAI response
      */
-    protected function getMetsData(array $metadata)
-    {
+    protected function getMetsData(array $metadata) {
         $mets = null;
         // Load METS file.
         $xml = new \DOMDocument();
@@ -328,8 +321,7 @@ 
      *
      * @return void
      */
-    public function main($content, $conf)
-    {
+    public function main($content, $conf) {
         // Initialize plugin.
         $this->init($conf);
         // Turn cache off.
@@ -420,8 +412,7 @@ 
      *
      * @return \DOMElement XML node to add to the OAI response
      */
-    protected function resume()
-    {
+    protected function resume() {
         $queryBuilder = GeneralUtility::makeInstance(ConnectionPool::class)
             ->getQueryBuilderForTable('tx_dlf_tokens');
 
@@ -454,8 +445,7 @@ 
      *
      * @return \DOMElement XML node to add to the OAI response
      */
-    protected function verbGetRecord()
-    {
+    protected function verbGetRecord() {
         if (count($this->piVars) !== 3 || empty($this->piVars['metadataPrefix']) || empty($this->piVars['identifier'])) {
             return $this->error('badArgument');
         }
@@ -548,8 +538,7 @@ 
      *
      * @return \DOMElement XML node to add to the OAI response
      */
-    protected function verbIdentify()
-    {
+    protected function verbIdentify() {
         // Check for invalid arguments.
         if (count($this->piVars) > 1) {
             return $this->error('badArgument');
@@ -632,8 +621,7 @@ 
      *
      * @return \DOMElement XML node to add to the OAI response
      */
-    protected function verbListIdentifiers()
-    {
+    protected function verbListIdentifiers() {
         // If we have a resumption token we can continue our work
         if (!empty($this->piVars['resumptionToken'])) {
             // "resumptionToken" is an exclusive argument.
@@ -672,8 +660,7 @@ 
      *
      * @return \DOMElement XML node to add to the OAI response
      */
-    protected function verbListMetadataFormats()
-    {
+    protected function verbListMetadataFormats() {
         $resArray = [];
         // Check for invalid arguments.
         if (count($this->piVars) > 1) {
@@ -731,8 +718,7 @@ 
      *
      * @return \DOMElement XML node to add to the OAI response
      */
-    protected function verbListRecords()
-    {
+    protected function verbListRecords() {
         // Check for invalid arguments.
         if (!empty($this->piVars['resumptionToken'])) {
             // "resumptionToken" is an exclusive argument.
@@ -772,8 +758,7 @@ 
      *
      * @return \DOMElement XML node to add to the OAI response
      */
-    protected function verbListSets()
-    {
+    protected function verbListSets() {
         $queryBuilder = GeneralUtility::makeInstance(ConnectionPool::class)
             ->getQueryBuilderForTable('tx_dlf_collections');
 
@@ -829,8 +814,7 @@ 
      * @return array Array of matching records
      * @throws \Exception
      */
-    protected function fetchDocumentUIDs()
-    {
+    protected function fetchDocumentUIDs() {
         $queryBuilder = GeneralUtility::makeInstance(ConnectionPool::class)
             ->getQueryBuilderForTable('tx_dlf_collections');
 
@@ -951,8 +935,7 @@ 
      *
      * @return \DOMElement XML of enriched records
      */
-    protected function generateOutputForDocumentList(DocumentList $documentListSet)
-    {
+    protected function generateOutputForDocumentList(DocumentList $documentListSet) {
         $documentsToProcess = $documentListSet->removeRange(0, (int)$this->conf['limit']);
         $verb = $this->piVars['verb'];
 
@@ -1055,8 +1038,7 @@ 
      *
      * @return \DOMElement XML for resumption token
      */
-    protected function generateResumptionTokenForDocumentListSet(DocumentList $documentListSet)
-    {
+    protected function generateResumptionTokenForDocumentListSet(DocumentList $documentListSet) {
         if ($documentListSet->count() !== 0) {
             $token = uniqid('', false);
 

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 {
-                $this->logger->error('No METS part found in document with location "' . $metadata['location'] . '"');
+                $this->logger->error('No METS part found in document with location "'.$metadata['location'].'"');
             }
         } else {
-            $this->logger->error('Could not load XML file from "' . $metadata['location'] . '"');
+            $this->logger->error('Could not load XML file from "'.$metadata['location'].'"');
         }
         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 {
-            $this->logger->notice('No records found with PID ' . $this->conf['pages']);
+            $this->logger->notice('No records found with PID '.$this->conf['pages']);
         }
         $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 = [

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

@@ -37,7 +37,7 @@ 
      * @var bool
      * @access protected
      */
-    protected $error = false;
+    protected $error = FALSE;
 
     /**
      * This holds the OAI DOM object
@@ -108,7 +108,7 @@ 
      */
     protected function error($type)
     {
-        $this->error = true;
+        $this->error = TRUE;
         $error = $this->oai->createElementNS('http://www.openarchives.org/OAI/2.0/', 'error', htmlspecialchars($this->pi_getLL($type, $type), ENT_NOQUOTES, 'UTF-8'));
         $error->setAttribute('code', $type);
         return $error;
@@ -297,7 +297,7 @@ 
      */
     protected function getMetsData(array $metadata)
     {
-        $mets = null;
+        $mets = NULL;
         // Load METS file.
         $xml = new \DOMDocument();
         if ($xml->load($metadata['location'])) {
@@ -305,14 +305,14 @@ 
             $root = $xml->getElementsByTagNameNS($this->formats['mets']['namespace'], 'mets');
             if ($root->item(0) instanceof \DOMNode) {
                 // Import node into \DOMDocument.
-                $mets = $this->oai->importNode($root->item(0), true);
+                $mets = $this->oai->importNode($root->item(0), TRUE);
             } else {
                 $this->logger->error('No METS part found in document with location "' . $metadata['location'] . '"');
             }
         } else {
             $this->logger->error('Could not load XML file from "' . $metadata['location'] . '"');
         }
-        if ($mets === null) {
+        if ($mets === NULL) {
             $mets = $this->oai->createElementNS('http://kitodo.org/', 'kitodo:error', htmlspecialchars($this->pi_getLL('error', 'Error!'), ENT_NOQUOTES, 'UTF-8'));
         }
         return $mets;
@@ -333,7 +333,7 @@ 
         // Initialize plugin.
         $this->init($conf);
         // Turn cache off.
-        $this->setCache(false);
+        $this->setCache(FALSE);
         // Get GET and POST variables.
         $this->getUrlParams();
         // Delete expired resumption tokens.
@@ -1062,7 +1062,7 @@ 
     protected function generateResumptionTokenForDocumentListSet(DocumentList $documentListSet)
     {
         if ($documentListSet->count() !== 0) {
-            $token = uniqid('', false);
+            $token = uniqid('', FALSE);
 
             $queryBuilder = GeneralUtility::makeInstance(ConnectionPool::class)->getQueryBuilderForTable('tx_dlf_tokens');
             $affectedRows = $queryBuilder

ext_emconf.php

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

@@ -24,8 +24,8 @@
         'suggests' => []
     ],
     'state' => 'stable',
-    'uploadfolder' => false,
-    'clearCacheOnLoad' => false,
+    'uploadfolder' => FALSE,
+    'clearCacheOnLoad' => FALSE,
     'author' => 'Sebastian Meyer (Maintainer)',
     'author_email' => 'contact@kitodo.org',
     'author_company' => 'Kitodo. Key to digital objects e. V.',

Classes/ExpressionLanguage/DocumentTypeProvider.php

Braces +2 added lines, -4 removed lines

@@ -23,10 +23,8 @@
  * @subpackage dlf
  * @access public
  */
-class DocumentTypeProvider extends AbstractProvider
-{
-    public function __construct()
-    {
+class DocumentTypeProvider extends AbstractProvider {
+    public function __construct() {
         $this->expressionLanguageProviders = [
             DocumentTypeFunctionProvider::class
         ];

ext_localconf.php

Spacing +10 added lines, -10 removed lines

@@ -205,21 +205,21 @@
 );
 // Register tools for toolbox plugin.
 $GLOBALS['TYPO3_CONF_VARS']['SC_OPTIONS']['dlf/Classes/Plugin/Toolbox.php']['tools'] = [];
-$GLOBALS['TYPO3_CONF_VARS']['SC_OPTIONS']['dlf/Classes/Plugin/Toolbox.php']['tools'][\TYPO3\CMS\Core\Utility\ExtensionManagementUtility::getCN($_EXTKEY) . '_fulltexttool'] = 'LLL:EXT:dlf/Resources/Private/Language/Labels.xml:tx_dlf_toolbox.fulltexttool';
-$GLOBALS['TYPO3_CONF_VARS']['SC_OPTIONS']['dlf/Classes/Plugin/Toolbox.php']['tools'][\TYPO3\CMS\Core\Utility\ExtensionManagementUtility::getCN($_EXTKEY) . '_annotationtool'] = 'LLL:EXT:dlf/Resources/Private/Language/Labels.xml:tx_dlf_toolbox.annotationtool';
-$GLOBALS['TYPO3_CONF_VARS']['SC_OPTIONS']['dlf/Classes/Plugin/Toolbox.php']['tools'][\TYPO3\CMS\Core\Utility\ExtensionManagementUtility::getCN($_EXTKEY) . '_fulltextdownloadtool'] = 'LLL:EXT:dlf/Resources/Private/Language/Labels.xml:tx_dlf_toolbox.fulltextdownloadtool';
-$GLOBALS['TYPO3_CONF_VARS']['SC_OPTIONS']['dlf/Classes/Plugin/Toolbox.php']['tools'][\TYPO3\CMS\Core\Utility\ExtensionManagementUtility::getCN($_EXTKEY) . '_imagedownloadtool'] = 'LLL:EXT:dlf/Resources/Private/Language/Labels.xml:tx_dlf_toolbox.imagedownloadtool';
-$GLOBALS['TYPO3_CONF_VARS']['SC_OPTIONS']['dlf/Classes/Plugin/Toolbox.php']['tools'][\TYPO3\CMS\Core\Utility\ExtensionManagementUtility::getCN($_EXTKEY) . '_imagemanipulationtool'] = 'LLL:EXT:dlf/Resources/Private/Language/Labels.xml:tx_dlf_toolbox.imagemanipulationtool';
-$GLOBALS['TYPO3_CONF_VARS']['SC_OPTIONS']['dlf/Classes/Plugin/Toolbox.php']['tools'][\TYPO3\CMS\Core\Utility\ExtensionManagementUtility::getCN($_EXTKEY) . '_pdfdownloadtool'] = 'LLL:EXT:dlf/Resources/Private/Language/Labels.xml:tx_dlf_toolbox.pdfdownloadtool';
-$GLOBALS['TYPO3_CONF_VARS']['SC_OPTIONS']['dlf/Classes/Plugin/Toolbox.php']['tools'][\TYPO3\CMS\Core\Utility\ExtensionManagementUtility::getCN($_EXTKEY) . '_searchindocumenttool'] = 'LLL:EXT:dlf/Resources/Private/Language/Labels.xml:tx_dlf_toolbox.searchindocumenttool';
+$GLOBALS['TYPO3_CONF_VARS']['SC_OPTIONS']['dlf/Classes/Plugin/Toolbox.php']['tools'][\TYPO3\CMS\Core\Utility\ExtensionManagementUtility::getCN($_EXTKEY).'_fulltexttool'] = 'LLL:EXT:dlf/Resources/Private/Language/Labels.xml:tx_dlf_toolbox.fulltexttool';
+$GLOBALS['TYPO3_CONF_VARS']['SC_OPTIONS']['dlf/Classes/Plugin/Toolbox.php']['tools'][\TYPO3\CMS\Core\Utility\ExtensionManagementUtility::getCN($_EXTKEY).'_annotationtool'] = 'LLL:EXT:dlf/Resources/Private/Language/Labels.xml:tx_dlf_toolbox.annotationtool';
+$GLOBALS['TYPO3_CONF_VARS']['SC_OPTIONS']['dlf/Classes/Plugin/Toolbox.php']['tools'][\TYPO3\CMS\Core\Utility\ExtensionManagementUtility::getCN($_EXTKEY).'_fulltextdownloadtool'] = 'LLL:EXT:dlf/Resources/Private/Language/Labels.xml:tx_dlf_toolbox.fulltextdownloadtool';
+$GLOBALS['TYPO3_CONF_VARS']['SC_OPTIONS']['dlf/Classes/Plugin/Toolbox.php']['tools'][\TYPO3\CMS\Core\Utility\ExtensionManagementUtility::getCN($_EXTKEY).'_imagedownloadtool'] = 'LLL:EXT:dlf/Resources/Private/Language/Labels.xml:tx_dlf_toolbox.imagedownloadtool';
+$GLOBALS['TYPO3_CONF_VARS']['SC_OPTIONS']['dlf/Classes/Plugin/Toolbox.php']['tools'][\TYPO3\CMS\Core\Utility\ExtensionManagementUtility::getCN($_EXTKEY).'_imagemanipulationtool'] = 'LLL:EXT:dlf/Resources/Private/Language/Labels.xml:tx_dlf_toolbox.imagemanipulationtool';
+$GLOBALS['TYPO3_CONF_VARS']['SC_OPTIONS']['dlf/Classes/Plugin/Toolbox.php']['tools'][\TYPO3\CMS\Core\Utility\ExtensionManagementUtility::getCN($_EXTKEY).'_pdfdownloadtool'] = 'LLL:EXT:dlf/Resources/Private/Language/Labels.xml:tx_dlf_toolbox.pdfdownloadtool';
+$GLOBALS['TYPO3_CONF_VARS']['SC_OPTIONS']['dlf/Classes/Plugin/Toolbox.php']['tools'][\TYPO3\CMS\Core\Utility\ExtensionManagementUtility::getCN($_EXTKEY).'_searchindocumenttool'] = 'LLL:EXT:dlf/Resources/Private/Language/Labels.xml:tx_dlf_toolbox.searchindocumenttool';
 // Register hooks.
 $GLOBALS['TYPO3_CONF_VARS']['SC_OPTIONS']['t3lib/class.t3lib_tcemain.php']['processDatamapClass'][] = \Kitodo\Dlf\Hooks\DataHandler::class;
 $GLOBALS['TYPO3_CONF_VARS']['SC_OPTIONS']['t3lib/class.t3lib_tcemain.php']['processCmdmapClass'][] = \Kitodo\Dlf\Hooks\DataHandler::class;
 $GLOBALS['TYPO3_CONF_VARS']['SC_OPTIONS']['dlf/Classes/Common/MetsDocument.php']['hookClass'][] = \Kitodo\Dlf\Hooks\KitodoProductionHacks::class;
 // Register AJAX eID handlers.
-$GLOBALS['TYPO3_CONF_VARS']['FE']['eID_include']['tx_dlf_search_suggest'] = \Kitodo\Dlf\Plugin\Eid\SearchSuggest::class . '::main';
-$GLOBALS['TYPO3_CONF_VARS']['FE']['eID_include']['tx_dlf_search_in_document'] = \Kitodo\Dlf\Plugin\Eid\SearchInDocument::class . '::main';
-$GLOBALS['TYPO3_CONF_VARS']['FE']['eID_include']['tx_dlf_pageview_proxy'] = \Kitodo\Dlf\Plugin\Eid\PageViewProxy::class . '::main';
+$GLOBALS['TYPO3_CONF_VARS']['FE']['eID_include']['tx_dlf_search_suggest'] = \Kitodo\Dlf\Plugin\Eid\SearchSuggest::class.'::main';
+$GLOBALS['TYPO3_CONF_VARS']['FE']['eID_include']['tx_dlf_search_in_document'] = \Kitodo\Dlf\Plugin\Eid\SearchInDocument::class.'::main';
+$GLOBALS['TYPO3_CONF_VARS']['FE']['eID_include']['tx_dlf_pageview_proxy'] = \Kitodo\Dlf\Plugin\Eid\PageViewProxy::class.'::main';
 // Use Caching Framework for Solr queries
 if (!is_array($GLOBALS['TYPO3_CONF_VARS']['SYS']['caching']['cacheConfigurations']['tx_dlf_solr'])) {
     $GLOBALS['TYPO3_CONF_VARS']['SYS']['caching']['cacheConfigurations']['tx_dlf_solr'] = [];

Classes/Plugin/Tools/FulltextDownloadTool.php

Braces +2 added lines, -4 removed lines

@@ -22,8 +22,7 @@ 
  * @subpackage dlf
  * @access public
  */
-class FulltextDownloadTool extends \Kitodo\Dlf\Common\AbstractPlugin
-{
+class FulltextDownloadTool extends \Kitodo\Dlf\Common\AbstractPlugin {
     public $scriptRelPath = 'Classes/Plugin/Tools/FulltextDownloadTool.php';
 
     /**
@@ -36,8 +35,7 @@ 
      *
      * @return string The content that is displayed on the website
      */
-    public function main($content, $conf)
-    {
+    public function main($content, $conf) {
         $this->init($conf);
         // Merge configuration with conf array of toolbox.
         if (!empty($this->cObj->data['conf'])) {

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

@@ -47,7 +47,7 @@
         // Load current document.
         $this->loadDocument();
         if (
-            $this->doc === null
+            $this->doc === NULL
             || $this->doc->numPages < 1
             || empty($this->conf['fileGrpFulltext'])
         ) {

Spacing +2 added lines, -2 removed lines

@@ -83,9 +83,9 @@
             }
         }
         if (!empty($fullTextFile)) {
-            $markerArray['###FULLTEXT_DOWNLOAD###'] = '<a href="#" id="tx-dlf-tools-fulltextdownload" title="' . htmlspecialchars($this->pi_getLL('download-current-page', '')) . '">' . htmlspecialchars($this->pi_getLL('download-current-page', '')) . '</a>';
+            $markerArray['###FULLTEXT_DOWNLOAD###'] = '<a href="#" id="tx-dlf-tools-fulltextdownload" title="'.htmlspecialchars($this->pi_getLL('download-current-page', '')).'">'.htmlspecialchars($this->pi_getLL('download-current-page', '')).'</a>';
         } else {
-            $markerArray['###FULLTEXT_DOWNLOAD###'] = '<span class="no-fulltext">' . htmlspecialchars($this->pi_getLL('fulltext-not-available', '')) . '</span>';
+            $markerArray['###FULLTEXT_DOWNLOAD###'] = '<span class="no-fulltext">'.htmlspecialchars($this->pi_getLL('fulltext-not-available', '')).'</span>';
         }
         $content .= $this->templateService->substituteMarkerArray($this->template, $markerArray);
         return $this->pi_wrapInBaseClass($content);

Classes/Hooks/DataHandler.php

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);

Spacing +9 added lines, -9 removed lines

@@ -123,10 +123,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)
@@ -148,10 +148,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)
@@ -229,7 +229,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);
                                 }
@@ -239,7 +239,7 @@ 
                                 if ($doc->ready) {
                                     Indexer::add($doc, $resArray['core']);
                                 } else {
-                                    $this->logger->error('Failed to re-index document with UID ' . $id);
+                                    $this->logger->error('Failed to re-index document with UID '.$id);
                                 }
                             }
                         }
@@ -309,7 +309,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') {
@@ -322,7 +322,7 @@ 
                         if ($doc->ready) {
                             Indexer::add($doc, $resArray['core']);
                         } else {
-                            $this->logger->error('Failed to re-index document with UID ' . $id);
+                            $this->logger->error('Failed to re-index document with UID '.$id);
                         }
                         break;
                 }
@@ -376,7 +376,7 @@ 
                             // Nothing to do here.
                         }
                     }
-                    $this->logger->warning('Core ' . $resArray['core'] . ' could not be deleted from Apache Solr');
+                    $this->logger->warning('Core '.$resArray['core'].' could not be deleted from Apache Solr');
                 }
             }
         }

Braces +4 added lines, -8 removed lines

@@ -31,8 +31,7 @@ 
  * @subpackage dlf
  * @access public
  */
-class DataHandler implements LoggerAwareInterface
-{
+class DataHandler implements LoggerAwareInterface {
     use LoggerAwareTrait;
 
     /**
@@ -47,8 +46,7 @@ 
      *
      * @return void
      */
-    public function processDatamap_postProcessFieldArray($status, $table, $id, &$fieldArray)
-    {
+    public function processDatamap_postProcessFieldArray($status, $table, $id, &$fieldArray) {
         if ($status == 'new') {
             switch ($table) {
                     // Field post-processing for table "tx_dlf_documents".
@@ -179,8 +177,7 @@ 
      *
      * @return void
      */
-    public function processDatamap_afterDatabaseOperations($status, $table, $id, &$fieldArray)
-    {
+    public function processDatamap_afterDatabaseOperations($status, $table, $id, &$fieldArray) {
         if ($status == 'update') {
             switch ($table) {
                     // After database operations for table "tx_dlf_documents".
@@ -260,8 +257,7 @@ 
      *
      * @return void
      */
-    public function processCmdmap_postProcess($command, $table, $id)
-    {
+    public function processCmdmap_postProcess($command, $table, $id) {
         if (
             in_array($command, ['move', 'delete', 'undelete'])
             && $table == 'tx_dlf_documents'

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();

Configuration/TCA/tx_dlf_solrcores.php

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

@@ -49,7 +49,7 @@
                 'max' => 255,
                 'eval' => 'alphanum,nospace,required,unique',
                 'default' => '',
-                'readOnly' => true,
+                'readOnly' => TRUE,
                 'fieldInformation' => [
                     'solrCoreStatus' => [
                         'renderType' => 'solrCoreStatus',

Classes/Hooks/Form/FieldInformation/SolrCoreStatus.php

Spacing +1 added lines, -1 removed lines

@@ -55,7 +55,7 @@
                     $uptimeInSeconds = floor($response->getUptime() / 1000);
                     $dateTimeFrom = new \DateTime('@0');
                     $dateTimeTo = new \DateTime("@$uptimeInSeconds");
-                    $uptime = $dateTimeFrom->diff($dateTimeTo)->format('%a ' . $GLOBALS['LANG']->getLL('flash.days') . ', %H:%I:%S');
+                    $uptime = $dateTimeFrom->diff($dateTimeTo)->format('%a '.$GLOBALS['LANG']->getLL('flash.days').', %H:%I:%S');
                     $numDocuments = $response->getNumberOfDocuments();
                     $startTime = $response->getStartTime() ? strftime('%c', $response->getStartTime()->getTimestamp()) : 'N/A';
                     $lastModified = $response->getLastModified() ? strftime('%c', $response->getLastModified()->getTimestamp()) : 'N/A';

Braces +1 added lines, -2 removed lines

@@ -24,8 +24,7 @@
  * @subpackage dlf
  * @access public
  */
-class SolrCoreStatus extends AbstractNode
-{
+class SolrCoreStatus extends AbstractNode {
     /**
      * Shows Solr core status for given 'index_name'
      *