Erikmitk / kitodo-presentation

Build/Documentation/dbdocs/generate.php

Spacing +4 added lines, -4 removed lines

@@ -11,16 +11,16 @@
  * LICENSE.txt file that was distributed with this source code.
  */
 
-$classLoader = require_once __DIR__ . '/../../../vendor/autoload.php';
+$classLoader = require_once __DIR__.'/../../../vendor/autoload.php';
 
 $outputPath = $argv[1] ?? null;
 if (empty($outputPath) || !is_writable(($outputPath))) {
-    echo 'Error: Output path not specified or not writable' . "\n";
+    echo 'Error: Output path not specified or not writable'."\n";
     exit(1);
 }
 
-putenv('TYPO3_PATH_ROOT=' . __DIR__ . '/public');
-putenv('TYPO3_PATH_APP=' . __DIR__);
+putenv('TYPO3_PATH_ROOT='.__DIR__.'/public');
+putenv('TYPO3_PATH_APP='.__DIR__);
 
 // For compatibility with TYPO v9
 define('PATH_thisScript', __FILE__);

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

@@ -13,7 +13,7 @@ 
 
 $classLoader = require_once __DIR__ . '/../../../vendor/autoload.php';
 
-$outputPath = $argv[1] ?? null;
+$outputPath = $argv[1] ?? NULL;
 if (empty($outputPath) || !is_writable(($outputPath))) {
     echo 'Error: Output path not specified or not writable' . "\n";
     exit(1);
@@ -27,7 +27,7 @@ 
 
 // For request types other than "FE", the configuration manager would try to access the database.
 \TYPO3\CMS\Core\Core\SystemEnvironmentBuilder::run(1, \TYPO3\CMS\Core\Core\SystemEnvironmentBuilder::REQUESTTYPE_FE);
-\TYPO3\CMS\Core\Core\Bootstrap::init($classLoader, false);
+\TYPO3\CMS\Core\Core\Bootstrap::init($classLoader, FALSE);
 
 $generator = new \Kitodo\DbDocs\Generator();
 $tables = $generator->collectTables();

Classes/ViewHelpers/MetadataWrapVariableViewHelper.php

Braces +2 added lines, -4 removed lines

@@ -35,13 +35,11 @@
  *     {typoscript -> kitodo:metadataWrapVariable(name: 'wrapInfo')}
  *
  */
-class MetadataWrapVariableViewHelper extends AbstractViewHelper
-{
+class MetadataWrapVariableViewHelper extends AbstractViewHelper {
     /**
      * @return void
      */
-    public function initializeArguments()
-    {
+    public function initializeArguments() {
         $this->registerArgument('name', 'string', 'Name of variable to create', true);
     }
 

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

@@ -42,7 +42,7 @@
      */
     public function initializeArguments()
     {
-        $this->registerArgument('name', 'string', 'Name of variable to create', true);
+        $this->registerArgument('name', 'string', 'Name of variable to create', TRUE);
     }
 
     /**

Classes/Controller/FeedsController.php

Spacing +6 added lines, -6 removed lines

@@ -71,7 +71,7 @@ 
         if ($library) {
             $feedMeta['copyright'] = $library->getLabel();
         } else {
-            $this->logger->error('Failed to fetch label of selected library with "' . $this->settings['library'] . '"');
+            $this->logger->error('Failed to fetch label of selected library with "'.$this->settings['library'].'"');
         }
 
         if (
@@ -91,12 +91,12 @@ 
                 ) {
                     $superiorTitle = Doc::getTitle($document->getPartof(), true);
                     if (!empty($superiorTitle)) {
-                        $title .= '[' . $superiorTitle . ']';
+                        $title .= '['.$superiorTitle.']';
                     }
                 }
                 // Get title of document.
                 if (!empty($document->getTitle())) {
-                    $title .= ' ' . $document->getTitle();
+                    $title .= ' '.$document->getTitle();
                 }
                 // Set default title if empty.
                 if (empty($title)) {
@@ -104,13 +104,13 @@ 
                 }
                 // Append volume information.
                 if (!empty($document->getVolume())) {
-                    $title .= ', ' . LocalizationUtility::translate('volume', 'dlf') . ' ' . $document->getVolume();
+                    $title .= ', '.LocalizationUtility::translate('volume', 'dlf').' '.$document->getVolume();
                 }
                 // Is this document new or updated?
                 if ($document->getCrdate() == $document->getTstamp()) {
-                    $title = LocalizationUtility::translate('plugins.feeds.new', 'dlf') . ' ' . trim($title);
+                    $title = LocalizationUtility::translate('plugins.feeds.new', 'dlf').' '.trim($title);
                 } else {
-                    $title = LocalizationUtility::translate('plugins.feeds.update', 'dlf') . ' ' . trim($title);
+                    $title = LocalizationUtility::translate('plugins.feeds.update', 'dlf').' '.trim($title);
                 }
 
                 $document->setTitle($title);

Braces +4 added lines, -8 removed lines

@@ -25,8 +25,7 @@ 
  * @subpackage dlf
  * @access public
  */
-class FeedsController extends AbstractController
-{
+class FeedsController extends AbstractController {
 
     /**
      * @var LibraryRepository
@@ -36,8 +35,7 @@ 
     /**
      * @param LibraryRepository $libraryRepository
      */
-    public function injectLibraryRepository(LibraryRepository $libraryRepository)
-    {
+    public function injectLibraryRepository(LibraryRepository $libraryRepository) {
         $this->libraryRepository = $libraryRepository;
     }
 
@@ -46,8 +44,7 @@ 
      *
      * @return void
      */
-    public function initializeAction()
-    {
+    public function initializeAction() {
         $this->request->setFormat('xml');
     }
 
@@ -56,8 +53,7 @@ 
      *
      * @return void
      */
-    public function mainAction()
-    {
+    public function mainAction() {
         // access to GET parameter tx_dlf_feeds['collection']
         $requestData = $this->request->getArguments();
 

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

@@ -80,7 +80,7 @@ 
             || GeneralUtility::inList($this->settings['collections'], $requestData['collection'])
         ) {
 
-            $documents = $this->documentRepository->findAllByCollectionsLimited(GeneralUtility::intExplode(',', $requestData['collection'], true), $this->settings['limit']);
+            $documents = $this->documentRepository->findAllByCollectionsLimited(GeneralUtility::intExplode(',', $requestData['collection'], TRUE), $this->settings['limit']);
 
             foreach ($documents as $document) {
 
@@ -89,7 +89,7 @@ 
                 if ((empty($document->getTitle()) || !empty($this->settings['prependSuperiorTitle']))
                     && !empty($document->getPartof())
                 ) {
-                    $superiorTitle = Doc::getTitle($document->getPartof(), true);
+                    $superiorTitle = Doc::getTitle($document->getPartof(), TRUE);
                     if (!empty($superiorTitle)) {
                         $title .= '[' . $superiorTitle . ']';
                     }

Classes/Controller/OaiPmhController.php

Spacing +11 added lines, -11 removed lines

@@ -243,10 +243,10 @@ 
             if ($root->item(0) instanceof \DOMNode) {
                 $mets = $xml->saveXML($root->item(0));
             } else {
-                $this->logger->error('No METS part found in document with location "' . $record['location'] . '"');
+                $this->logger->error('No METS part found in document with location "'.$record['location'].'"');
             }
         } else {
-            $this->logger->error('Could not load XML file from "' . $record['location'] . '"');
+            $this->logger->error('Could not load XML file from "'.$record['location'].'"');
         }
         return $mets;
     }
@@ -412,7 +412,7 @@ 
             $pageSettings = $this->configurationManager->getConfiguration($this->configurationManager::CONFIGURATION_TYPE_FULL_TYPOSCRIPT);
             $storagePid = $pageSettings["plugin."]["tx_dlf."]["persistence."]["storagePid"];
             if ($storagePid > 0) {
-                $this->logger->notice('No records found with PID ' . $storagePid);
+                $this->logger->notice('No records found with PID '.$storagePid);
             } else {
                 $this->logger->notice('No records found');
             }
@@ -495,7 +495,7 @@ 
             if (!empty($resArray)) {
                 // check, if all required fields are available for a given identifier
                 foreach ($details['requiredFields'] as $required) {
-                    $methodName = 'get' . GeneralUtility::underscoredToUpperCamelCase($required);
+                    $methodName = 'get'.GeneralUtility::underscoredToUpperCamelCase($required);
                     if (empty($resArray->$methodName())) {
                         // Skip metadata formats whose requirements are not met.
                         continue 2;
@@ -600,9 +600,9 @@ 
 
             if ($resArray = $result->fetch()) {
                 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 {
                 $this->error = 'noSetHierarchy';
@@ -614,7 +614,7 @@ 
         }
         // Check for required fields.
         foreach ($this->formats[$this->parameters['metadataPrefix']]['requiredFields'] as $required) {
-            $solr_query .= ' NOT ' . $required . ':""';
+            $solr_query .= ' NOT '.$required.':""';
         }
         // toplevel="true" is always required
         $solr_query .= ' AND toplevel:true';
@@ -628,7 +628,7 @@ 
             ) {
                 $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 {
                 $this->error = 'badArgument';
                 return;
@@ -644,7 +644,7 @@ 
             ) {
                 $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) {
                     $this->error = 'badArgument';
                 }
@@ -661,7 +661,7 @@ 
                 $this->error = 'badArgument';
             }
         }
-        $solr_query .= ' AND timestamp:[' . $from . ' TO ' . $until . ']';
+        $solr_query .= ' AND timestamp:['.$from.' TO '.$until.']';
         $documentSet = [];
         $solr = Solr::getInstance($this->settings['solrcore']);
         if (!$solr->ready) {
@@ -780,7 +780,7 @@ 
         $resumptionTokenInfo['cursor'] = $currentCursor;
         $resumptionTokenInfo['completeListSize'] = $documentListSet['metadata']['completeListSize'];
         $expireDateTime = new \DateTime();
-        $expireDateTime->add(new \DateInterval('PT' . $this->settings['expired'] . 'S'));
+        $expireDateTime->add(new \DateInterval('PT'.$this->settings['expired'].'S'));
         $resumptionTokenInfo['expired'] = $expireDateTime;
 
         $omitResumptionToken = $currentCursor === 0 && $numShownDocuments >= $documentListSet['metadata']['completeListSize'];

Braces +19 added lines, -38 removed lines

@@ -27,8 +27,7 @@ 
  * @subpackage dlf
  * @access public
  */
-class OaiPmhController extends AbstractController
-{
+class OaiPmhController extends AbstractController {
     /**
      * @var TokenRepository
      */
@@ -37,8 +36,7 @@ 
     /**
      * @param TokenRepository $tokenRepository
      */
-    public function injectTokenRepository(TokenRepository $tokenRepository)
-    {
+    public function injectTokenRepository(TokenRepository $tokenRepository) {
         $this->tokenRepository = $tokenRepository;
     }
 
@@ -50,8 +48,7 @@ 
     /**
      * @param CollectionRepository $collectionRepository
      */
-    public function injectCollectionRepository(CollectionRepository $collectionRepository)
-    {
+    public function injectCollectionRepository(CollectionRepository $collectionRepository) {
         $this->collectionRepository = $collectionRepository;
     }
 
@@ -63,8 +60,7 @@ 
     /**
      * @param LibraryRepository $libraryRepository
      */
-    public function injectLibraryRepository(LibraryRepository $libraryRepository)
-    {
+    public function injectLibraryRepository(LibraryRepository $libraryRepository) {
         $this->libraryRepository = $libraryRepository;
     }
 
@@ -73,8 +69,7 @@ 
      *
      * @return void
      */
-    public function initializeAction()
-    {
+    public function initializeAction() {
         $this->request->setFormat('xml');
     }
 
@@ -122,8 +117,7 @@ 
      *
      * @return void
      */
-    protected function deleteExpiredTokens()
-    {
+    protected function deleteExpiredTokens() {
         // Delete expired resumption tokens.
         $this->tokenRepository->deleteExpiredTokens($this->settings['expired']);
     }
@@ -135,8 +129,7 @@ 
      *
      * @return void
      */
-    protected function getUrlParams()
-    {
+    protected function getUrlParams() {
         $allowedParams = [
             'verb',
             'identifier',
@@ -166,8 +159,7 @@ 
      *
      * @return array $metadata: The mapped metadata array
      */
-    protected function getDcData(array $record)
-    {
+    protected function getDcData(array $record) {
         $metadata = [];
 
         $metadata[] = ['dc:identifier' => $record['record_id']];
@@ -232,8 +224,7 @@ 
      *
      * @return string: The fetched METS XML
      */
-    protected function getMetsData(array $record)
-    {
+    protected function getMetsData(array $record) {
         $mets = null;
         // Load METS file.
         $xml = new \DOMDocument();
@@ -256,8 +247,7 @@ 
      *
      * @return void
      */
-    public function mainAction()
-    {
+    public function mainAction() {
         // Get allowed GET and POST variables.
         $this->getUrlParams();
 
@@ -324,8 +314,7 @@ 
      *
      * @return void
      */
-    protected function verbGetRecord()
-    {
+    protected function verbGetRecord() {
         if (count($this->parameters) !== 3 || empty($this->parameters['metadataPrefix']) || empty($this->parameters['identifier'])) {
             $this->error = 'badArgument';
             return;
@@ -377,8 +366,7 @@ 
      *
      * @return void
      */
-    protected function verbIdentify()
-    {
+    protected function verbIdentify() {
         $library = $this->libraryRepository->findByUid($this->settings['library']);
 
         $oaiIdentifyInfo = [];
@@ -427,8 +415,7 @@ 
      *
      * @return void
      */
-    protected function verbListIdentifiers()
-    {
+    protected function verbListIdentifiers() {
         // If we have a resumption token we can continue our work
         if (!empty($this->parameters['resumptionToken'])) {
             // "resumptionToken" is an exclusive argument.
@@ -482,8 +469,7 @@ 
      *
      * @return void
      */
-    protected function verbListMetadataFormats()
-    {
+    protected function verbListMetadataFormats() {
         $resArray = [];
         // check for the optional "identifier" parameter
         if (isset($this->parameters['identifier'])) {
@@ -515,8 +501,7 @@ 
      *
      * @return void
      */
-    protected function verbListRecords()
-    {
+    protected function verbListRecords() {
         // Check for invalid arguments.
         if (!empty($this->parameters['resumptionToken'])) {
             // "resumptionToken" is an exclusive argument.
@@ -571,8 +556,7 @@ 
      *
      * @return void
      */
-    protected function verbListSets()
-    {
+    protected function verbListSets() {
         // It is required to set a oai_name inside the collection record to be shown in oai-pmh plugin.
         $this->settings['hideEmptyOaiNames'] = true;
 
@@ -588,8 +572,7 @@ 
      *
      * @return array|null Array of matching records
      */
-    protected function fetchDocumentUIDs()
-    {
+    protected function fetchDocumentUIDs() {
         $solr_query = '';
         // Check "set" for valid value.
         if (!empty($this->parameters['set'])) {
@@ -698,8 +681,7 @@ 
      *
      * @return array of enriched records
      */
-    protected function generateOutputForDocumentList(array $documentListSet)
-    {
+    protected function generateOutputForDocumentList(array $documentListSet) {
         $documentsToProcess = array_splice($documentListSet['elements'], 0, (int) $this->settings['limit']);
         if (empty($documentsToProcess)) {
             $this->error = 'noRecordsMatch';
@@ -752,8 +734,7 @@ 
      *
      * @return void
      */
-    protected function generateResumptionTokenForDocumentListSet(array $documentListSet, int $numShownDocuments)
-    {
+    protected function generateResumptionTokenForDocumentListSet(array $documentListSet, int $numShownDocuments) {
         // The cursor specifies how many elements have already been returned in previous requests
         // See http://www.openarchives.org/OAI/openarchivesprotocol.html#FlowControl
         $currentCursor = $documentListSet['metadata']['cursor'];

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

@@ -234,7 +234,7 @@ 
      */
     protected function getMetsData(array $record)
     {
-        $mets = null;
+        $mets = NULL;
         // Load METS file.
         $xml = new \DOMDocument();
         if ($xml->load($record['location'])) {
@@ -313,7 +313,7 @@ 
         } else {
             // No resumption token found or resumption token expired.
             $this->error = 'badResumptionToken';
-            return null;
+            return NULL;
         }
     }
 
@@ -574,7 +574,7 @@ 
     protected function verbListSets()
     {
         // It is required to set a oai_name inside the collection record to be shown in oai-pmh plugin.
-        $this->settings['hideEmptyOaiNames'] = true;
+        $this->settings['hideEmptyOaiNames'] = TRUE;
 
         $oaiSets = $this->collectionRepository->findCollectionsBySettings($this->settings);
 
@@ -606,7 +606,7 @@ 
                 }
             } else {
                 $this->error = 'noSetHierarchy';
-                return null;
+                return NULL;
             }
         } else {
             // If no set is specified we have to query for all collections
@@ -759,7 +759,7 @@ 
         $currentCursor = $documentListSet['metadata']['cursor'];
 
         if (count($documentListSet['elements']) !== 0) {
-            $resumptionToken = uniqid('', false);
+            $resumptionToken = uniqid('', FALSE);
 
             $documentListSet['metadata']['cursor'] += $numShownDocuments;
 

Classes/Controller/AbstractController.php

Spacing +4 added lines, -4 removed lines

@@ -125,7 +125,7 @@ 
                 if ($this->document) {
                     $doc = Doc::getInstance($this->document->getLocation(), $this->settings, true);
                 } else {
-                    $this->logger->error('Invalid UID "' . $requestData['id'] . '" or PID "' . $this->settings['storagePid'] . '" for document loading');
+                    $this->logger->error('Invalid UID "'.$requestData['id'].'" or PID "'.$this->settings['storagePid'].'" for document loading');
                 }
             } else if (GeneralUtility::isValidUrl($requestData['id'])) {
 
@@ -143,7 +143,7 @@ 
 
                     $this->document->setLocation($requestData['id']);
                 } else {
-                    $this->logger->error('Invalid location given "' . $requestData['id'] . '" for document loading');
+                    $this->logger->error('Invalid location given "'.$requestData['id'].'" for document loading');
                 }
             }
 
@@ -160,11 +160,11 @@ 
                 if ($this->document !== null && $doc !== null) {
                     $this->document->setDoc($doc);
                 } else {
-                    $this->logger->error('Failed to load document with record ID "' . $requestData['recordId'] . '"');
+                    $this->logger->error('Failed to load document with record ID "'.$requestData['recordId'].'"');
                 }
             }
         } else {
-            $this->logger->error('Invalid ID "' . $requestData['id'] . '" or PID "' . $this->settings['storagePid'] . '" for document loading');
+            $this->logger->error('Invalid ID "'.$requestData['id'].'" or PID "'.$this->settings['storagePid'].'" for document loading');
         }
     }
 

Braces +7 added lines, -14 removed lines

@@ -44,8 +44,7 @@ 
     /**
      * @param DocumentRepository $documentRepository
      */
-    public function injectDocumentRepository(DocumentRepository $documentRepository)
-    {
+    public function injectDocumentRepository(DocumentRepository $documentRepository) {
         $this->documentRepository = $documentRepository;
     }
 
@@ -85,8 +84,7 @@ 
      * @access protected
      * @return void
      */
-    protected function initialize()
-    {
+    protected function initialize() {
         $this->requestData = GeneralUtility::_GPmerged('tx_dlf');
         if (empty($this->requestData['page'])) {
             $this->requestData['page'] = 1;
@@ -112,8 +110,7 @@ 
      *
      * @return void
      */
-    protected function loadDocument($requestData)
-    {
+    protected function loadDocument($requestData) {
         // Try to get document format from database
         if (!empty($requestData['id'])) {
 
@@ -178,8 +175,7 @@ 
      *
      * @return boolean
      */
-    protected function isDocMissingOrEmpty()
-    {
+    protected function isDocMissingOrEmpty() {
         return $this->isDocMissing() || $this->document->getDoc()->numPages < 1;
     }
 
@@ -188,8 +184,7 @@ 
      *
      * @return boolean
      */
-    protected function isDocMissing()
-    {
+    protected function isDocMissing() {
         return $this->document === null || $this->document->getDoc() === null;
     }
 
@@ -211,8 +206,7 @@ 
      *
      * @return null|string|array
      */
-    protected function getParametersSafely($parameterName)
-    {
+    protected function getParametersSafely($parameterName) {
         if ($this->request->hasArgument($parameterName)) {
             return $this->request->getArgument($parameterName);
         }
@@ -226,8 +220,7 @@ 
      *
      * @return void
      */
-    public function __construct()
-    {
+    public function __construct() {
         $this->initialize();
     }
 }

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

@@ -117,26 +117,26 @@ 
         // Try to get document format from database
         if (!empty($requestData['id'])) {
 
-            $doc = null;
+            $doc = NULL;
 
             if (MathUtility::canBeInterpretedAsInteger($requestData['id'])) {
                 // find document from repository by uid
                 $this->document = $this->documentRepository->findOneByIdAndSettings((int) $requestData['id']);
                 if ($this->document) {
-                    $doc = Doc::getInstance($this->document->getLocation(), $this->settings, true);
+                    $doc = Doc::getInstance($this->document->getLocation(), $this->settings, TRUE);
                 } else {
                     $this->logger->error('Invalid UID "' . $requestData['id'] . '" or PID "' . $this->settings['storagePid'] . '" for document loading');
                 }
             } else if (GeneralUtility::isValidUrl($requestData['id'])) {
 
-                $doc = Doc::getInstance($requestData['id'], $this->settings, true);
+                $doc = Doc::getInstance($requestData['id'], $this->settings, TRUE);
 
-                if ($doc !== null) {
+                if ($doc !== NULL) {
                     if ($doc->recordId) {
                         $this->document = $this->documentRepository->findOneByRecordId($doc->recordId);
                     }
 
-                    if ($this->document === null) {
+                    if ($this->document === NULL) {
                         // create new dummy Document object
                         $this->document = GeneralUtility::makeInstance(Document::class);
                     }
@@ -152,7 +152,7 @@ 
                 }
             }
 
-            if ($this->document !== null && $doc !== null) {
+            if ($this->document !== NULL && $doc !== NULL) {
                 $this->document->setDoc($doc);
             }
 
@@ -160,9 +160,9 @@ 
 
             $this->document = $this->documentRepository->findOneByRecordId($requestData['recordId']);
 
-            if ($this->document !== null) {
-                $doc = Doc::getInstance($this->document->getLocation(), $this->settings, true);
-                if ($this->document !== null && $doc !== null) {
+            if ($this->document !== NULL) {
+                $doc = Doc::getInstance($this->document->getLocation(), $this->settings, TRUE);
+                if ($this->document !== NULL && $doc !== NULL) {
                     $this->document->setDoc($doc);
                 } else {
                     $this->logger->error('Failed to load document with record ID "' . $requestData['recordId'] . '"');
@@ -190,7 +190,7 @@ 
      */
     protected function isDocMissing()
     {
-        return $this->document === null || $this->document->getDoc() === null;
+        return $this->document === NULL || $this->document->getDoc() === NULL;
     }
 
     /**
@@ -216,7 +216,7 @@ 
         if ($this->request->hasArgument($parameterName)) {
             return $this->request->getArgument($parameterName);
         }
-        return null;
+        return NULL;
     }
 
     /**

Classes/Controller/CollectionController.php

Braces +6 added lines, -12 removed lines

@@ -29,8 +29,7 @@ 
  * @subpackage dlf
  * @access public
  */
-class CollectionController extends AbstractController
-{
+class CollectionController extends AbstractController {
     /**
      * @var CollectionRepository
      */
@@ -39,8 +38,7 @@ 
     /**
      * @param CollectionRepository $collectionRepository
      */
-    public function injectCollectionRepository(CollectionRepository $collectionRepository)
-    {
+    public function injectCollectionRepository(CollectionRepository $collectionRepository) {
         $this->collectionRepository = $collectionRepository;
     }
 
@@ -52,8 +50,7 @@ 
     /**
      * @param MetadataRepository $metadataRepository
      */
-    public function injectMetadataRepository(MetadataRepository $metadataRepository)
-    {
+    public function injectMetadataRepository(MetadataRepository $metadataRepository) {
         $this->metadataRepository = $metadataRepository;
     }
 
@@ -62,8 +59,7 @@ 
      *
      * @return void
      */
-    public function listAction()
-    {
+    public function listAction() {
         $solr = Solr::getInstance($this->settings['solrcore']);
 
         if (!$solr->ready) {
@@ -146,8 +142,7 @@ 
      *
      * @return void
      */
-    public function showAction(\Kitodo\Dlf\Domain\Model\Collection $collection)
-    {
+    public function showAction(\Kitodo\Dlf\Domain\Model\Collection $collection) {
         $searchParams = $this->getParametersSafely('searchParameter');
 
         // Instaniate the Solr. Without Solr present, we can't do anything.
@@ -199,8 +194,7 @@ 
      *
      * @return void
      */
-    public function showSortedAction()
-    {
+    public function showSortedAction() {
         // if search was triggered, get search parameters from POST variables
         $searchParams = $this->getParametersSafely('searchParameter');
 

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

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

Spacing +4 added lines, -4 removed lines

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

Classes/Controller/ToolboxController.php

Spacing +3 added lines, -3 removed lines

@@ -253,7 +253,7 @@ 
                 $image['mimetypeLabel'] = $mimetypeLabel;
                 break;
             } else {
-                $this->logger->warning('File not found in fileGrp "' . $fileGrp . '"');
+                $this->logger->warning('File not found in fileGrp "'.$fileGrp.'"');
             }
         }
         return $image;
@@ -344,7 +344,7 @@ 
             empty($page1Link)
             && empty($page2Link)
         ) {
-            $this->logger->warning('File not found in fileGrps "' . $this->extConf['fileGrpDownload'] . '"');
+            $this->logger->warning('File not found in fileGrps "'.$this->extConf['fileGrpDownload'].'"');
         }
 
         if (!empty($page1Link)) {
@@ -383,7 +383,7 @@ 
         if (!empty($workLink)) {
             $workLink = $workLink;
         } else {
-            $this->logger->warning('File not found in fileGrps "' . $this->extConf['fileGrpDownload'] . '"');
+            $this->logger->warning('File not found in fileGrps "'.$this->extConf['fileGrpDownload'].'"');
         }
         return $workLink;
     }

Braces +14 added lines, -28 removed lines

@@ -23,15 +23,13 @@ 
  * @subpackage dlf
  * @access public
  */
-class ToolboxController extends AbstractController
-{
+class ToolboxController extends AbstractController {
     /**
      * The main method of the plugin
      *
      * @return void
      */
-    public function mainAction()
-    {
+    public function mainAction() {
         // Load current document.
         $this->loadDocument($this->requestData);
 
@@ -52,8 +50,7 @@ 
      *
      * @return void
      */
-    public function annotationtool()
-    {
+    public function annotationtool() {
         if ($this->isDocMissingOrEmpty()) {
             // Quit without doing anything if required variables are not set.
             return '';
@@ -91,8 +88,7 @@ 
      *
      * @return void
      */
-    public function fulltextdownloadtool()
-    {
+    public function fulltextdownloadtool() {
         if (
             $this->isDocMissingOrEmpty()
             || empty($this->extConf['fileGrpFulltext'])
@@ -136,8 +132,7 @@ 
      *
      * @return void
      */
-    public function fulltexttool()
-    {
+    public function fulltexttool() {
         if (
             $this->isDocMissingOrEmpty()
             || empty($this->extConf['fileGrpFulltext'])
@@ -181,8 +176,7 @@ 
      *
      * @return void
      */
-    public function imagedownloadtool()
-    {
+    public function imagedownloadtool() {
         if (
             $this->isDocMissingOrEmpty()
             || empty($this->settings['fileGrpsImageDownload'])
@@ -224,8 +218,7 @@ 
      *
      * @return array Array of image links and image format information
      */
-    protected function getImage($page)
-    {
+    protected function getImage($page) {
         $image = [];
         // Get @USE value of METS fileGrp.
         $fileGrps = \TYPO3\CMS\Core\Utility\GeneralUtility::trimExplode(',', $this->settings['fileGrpsImageDownload']);
@@ -258,8 +251,7 @@ 
      *
      * @return void
      */
-    public function imagemanipulationtool()
-    {
+    public function imagemanipulationtool() {
         // Set parent element for initialization.
         $parentContainer = !empty($this->settings['parentContainer']) ? $this->settings['parentContainer'] : '.tx-dlf-imagemanipulationtool';
 
@@ -272,8 +264,7 @@ 
      *
      * @return void
      */
-    public function pdfdownloadtool()
-    {
+    public function pdfdownloadtool() {
         if (
             $this->isDocMissingOrEmpty()
             || empty($this->extConf['fileGrpDownload'])
@@ -310,8 +301,7 @@ 
      *
      * @return array Link to downloadable page
      */
-    protected function getPageLink()
-    {
+    protected function getPageLink() {
         $page1Link = '';
         $page2Link = '';
         $pageLinkArray = [];
@@ -355,8 +345,7 @@ 
      *
      * @return string Link to downloadable work
      */
-    protected function getWorkLink()
-    {
+    protected function getWorkLink() {
         $workLink = '';
         $fileGrpsDownload = GeneralUtility::trimExplode(',', $this->extConf['fileGrpDownload']);
         // Get work link.
@@ -385,8 +374,7 @@ 
      *
      * @return void
      */
-    public function searchindocumenttool()
-    {
+    public function searchindocumenttool() {
         if (
             $this->isDocMissingOrEmpty()
             || empty($this->extConf['fileGrpFulltext'])
@@ -448,8 +436,7 @@ 
      *
      * @return string with current document id
      */
-    protected function getCurrentDocumentId()
-    {
+    protected function getCurrentDocumentId() {
         $id = $this->document->getUid();
 
         if ($id !== null && $id > 0) {
@@ -484,8 +471,7 @@ 
      *
      * @return string with encrypted core name
      */
-    protected function getEncryptedCoreName()
-    {
+    protected function getEncryptedCoreName() {
         // Get core name.
         $name = Helper::getIndexNameFromUid($this->settings['solrcore'], 'tx_dlf_solrcores');
         // Encrypt core name.

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

@@ -43,7 +43,7 @@ 
         foreach ($tools as $tool) {
             $tool = trim(str_replace('tx_dlf_', '', $tool));
             $this->$tool();
-            $this->view->assign($tool, true);
+            $this->view->assign($tool, TRUE);
         }
     }
 
@@ -77,12 +77,12 @@ 
 
         $annotationContainers = $this->document->getDoc()->physicalStructureInfo[$this->document->getDoc()->physicalStructure[$this->requestData['page']]]['annotationContainers'];
         if (
-            $annotationContainers != null
+            $annotationContainers != NULL
             && sizeof($annotationContainers) > 0
         ) {
-            $this->view->assign('annotationTool', true);
+            $this->view->assign('annotationTool', TRUE);
         } else {
-            $this->view->assign('annotationTool', false);
+            $this->view->assign('annotationTool', FALSE);
         }
     }
 
@@ -125,9 +125,9 @@ 
             }
         }
         if (!empty($fullTextFile)) {
-            $this->view->assign('fulltextDownload', true);
+            $this->view->assign('fulltextDownload', TRUE);
         } else {
-            $this->view->assign('fulltextDownload', false);
+            $this->view->assign('fulltextDownload', FALSE);
         }
     }
 
@@ -169,10 +169,10 @@ 
             }
         }
         if (!empty($fullTextFile)) {
-            $this->view->assign('fulltext', true);
+            $this->view->assign('fulltext', TRUE);
             $this->view->assign('activateFullTextInitially', MathUtility::forceIntegerInRange($this->settings['activateFullTextInitially'], 0, 1, 0));
         } else {
-            $this->view->assign('fulltext', false);
+            $this->view->assign('fulltext', FALSE);
         }
     }
 
@@ -263,7 +263,7 @@ 
         // Set parent element for initialization.
         $parentContainer = !empty($this->settings['parentContainer']) ? $this->settings['parentContainer'] : '.tx-dlf-imagemanipulationtool';
 
-        $this->view->assign('imageManipulation', true);
+        $this->view->assign('imageManipulation', TRUE);
         $this->view->assign('parentContainer', $parentContainer);
     }
 
@@ -452,7 +452,7 @@ 
     {
         $id = $this->document->getUid();
 
-        if ($id !== null && $id > 0) {
+        if ($id !== NULL && $id > 0) {
             // we found the document uid
             return (string) $id;
         } else {

Classes/Controller/NavigationController.php

Spacing +1 added lines, -1 removed lines

@@ -74,7 +74,7 @@
 
         $pageOptions = [];
         for ($i = 1; $i <= $this->document->getDoc()->numPages; $i++) {
-            $pageOptions[$i] = '[' . $i . ']' . ($this->document->getDoc()->physicalStructureInfo[$this->document->getDoc()->physicalStructure[$i]]['orderlabel'] ? ' - ' . htmlspecialchars($this->document->getDoc()->physicalStructureInfo[$this->document->getDoc()->physicalStructure[$i]]['orderlabel']) : '');
+            $pageOptions[$i] = '['.$i.']'.($this->document->getDoc()->physicalStructureInfo[$this->document->getDoc()->physicalStructure[$i]]['orderlabel'] ? ' - '.htmlspecialchars($this->document->getDoc()->physicalStructureInfo[$this->document->getDoc()->physicalStructure[$i]]['orderlabel']) : '');
         }
         $this->view->assign('pageOptions', $pageOptions);
 

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 ($this->isDocMissing()) {

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

@@ -121,7 +121,7 @@
         // prepare feature array for fluid
         $features = [];
         foreach (explode(',', $this->settings['features']) as $feature) {
-            $features[$feature] = true;
+            $features[$feature] = TRUE;
         }
         $this->view->assign('features', $features);
     }

Classes/Controller/TableOfContentsController.php

Spacing +1 added lines, -1 removed lines

@@ -140,7 +140,7 @@
                 }
             }
             // Append "IFSUB" to "ITEM_STATE" if this entry has sub-entries.
-            $entryArray['ITEM_STATE'] = ($entryArray['ITEM_STATE'] == 'NO' ? 'IFSUB' : $entryArray['ITEM_STATE'] . 'IFSUB');
+            $entryArray['ITEM_STATE'] = ($entryArray['ITEM_STATE'] == 'NO' ? 'IFSUB' : $entryArray['ITEM_STATE'].'IFSUB');
         }
         return $entryArray;
     }

Braces +5 added lines, -10 removed lines

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

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

@@ -99,12 +99,12 @@ 
             }
             // Go through table of contents and create all menu entries.
             foreach ($this->document->getDoc()->tableOfContents as $entry) {
-                $menuArray[] = $this->getMenuEntry($entry, true);
+                $menuArray[] = $this->getMenuEntry($entry, TRUE);
             }
         } else {
             // Go through table of contents and create top-level menu entries.
             foreach ($this->document->getDoc()->tableOfContents as $entry) {
-                $menuArray[] = $this->getMenuEntry($entry, false);
+                $menuArray[] = $this->getMenuEntry($entry, FALSE);
             }
             // Build table of contents from database.
             $result = $this->documentRepository->getTableOfContentsFromDb($this->document->getUid(), $this->document->getPid(), $this->settings);
@@ -123,7 +123,7 @@ 
                         'pagination' => '',
                         'targetUid' => $resArray['uid']
                     ];
-                    $menuArray[0]['_SUB_MENU'][] = $this->getMenuEntry($entry, false);
+                    $menuArray[0]['_SUB_MENU'][] = $this->getMenuEntry($entry, FALSE);
                 }
             }
         }
@@ -140,7 +140,7 @@ 
      *
      * @return array HMENU array for menu entry
      */
-    protected function getMenuEntry(array $entry, $recursive = false)
+    protected function getMenuEntry(array $entry, $recursive = FALSE)
     {
         $entry = $this->resolveMenuEntry($entry);
 
@@ -198,7 +198,7 @@ 
         }
         // Build sub-menu if available and called recursively.
         if (
-            $recursive === true
+            $recursive === TRUE
             && !empty($entry['children'])
         ) {
             // Build sub-menu only if one of the following conditions apply:
@@ -216,7 +216,7 @@ 
                     if (in_array($child['id'], $this->activeEntries)) {
                         $entryArray['ITEM_STATE'] = 'ACT';
                     }
-                    $entryArray['_SUB_MENU'][] = $this->getMenuEntry($child, true);
+                    $entryArray['_SUB_MENU'][] = $this->getMenuEntry($child, TRUE);
                 }
             }
             // Append "IFSUB" to "ITEM_STATE" if this entry has sub-entries.