Erikmitk / kitodo-presentation

Classes/Hooks/ItemsProcFunc.php

Braces +1 added lines, -2 removed lines

@@ -29,8 +29,7 @@
  *
  * @access public
  */
-class ItemsProcFunc implements LoggerAwareInterface
-{
+class ItemsProcFunc implements LoggerAwareInterface {
     use LoggerAwareTrait;
 
     /**

Classes/Hooks/ThumbnailCustomElement.php

Braces +1 added lines, -2 removed lines

@@ -22,8 +22,7 @@
  *
  * @access public
  */
-class ThumbnailCustomElement extends AbstractFormElement
-{
+class ThumbnailCustomElement extends AbstractFormElement {
 
     /**
      * Renders thumbnail custom element.

Classes/Updates/MigrateSettings.php

Braces +1 added lines, -2 removed lines

@@ -26,8 +26,7 @@
  *
  * @internal
  */
-class MigrateSettings implements UpgradeWizardInterface
-{
+class MigrateSettings implements UpgradeWizardInterface {
 
     /**
      * Return the identifier for this wizard

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

@@ -108,11 +108,11 @@ 
 
             // exit if at least one update statement is not successful
             if (!((bool) $updateResult)) {
-                return false;
+                return FALSE;
             }
         }
 
-        return true;
+        return TRUE;
     }
 
     /**
@@ -126,7 +126,7 @@ 
      */
     public function updateNecessary(): bool
     {
-        $oldSettingsFound = false;
+        $oldSettingsFound = FALSE;
 
         $connection = GeneralUtility::makeInstance(ConnectionPool::class)->getConnectionForTable('tt_content');
 
@@ -144,7 +144,7 @@ 
         // Update the found record sets
         while ($record = $statement->fetchAssociative()) {
             $oldSettingsFound = $this->checkForOldSettings($record['pi_flexform']);
-            if ($oldSettingsFound === true) {
+            if ($oldSettingsFound === TRUE) {
                 // We found at least one field to be updated --> break here
                 break;
             }
@@ -187,7 +187,7 @@ 
 
         foreach ($fields as $field) {
             // change the index attribute if it doesn't start with 'settings.' yet
-            if (strpos($field['index'], 'settings.') === false) {
+            if (strpos($field['index'], 'settings.') === FALSE) {
                 $field['index'] = 'settings.' . $field['index'];
             }
         }

Classes/Updates/FileLocationUpdater.php

Spacing +4 added lines, -4 removed lines

@@ -190,9 +190,9 @@ 
                             $queryBuilder->createNamedParameter('', \PDO::PARAM_STR)
                         ),
                         $queryBuilder->expr()->comparison(
-                            'CAST(CAST(' . $queryBuilder->quoteIdentifier($this->fieldsToMigrate[$table]) . ' AS DECIMAL) AS CHAR)',
+                            'CAST(CAST('.$queryBuilder->quoteIdentifier($this->fieldsToMigrate[$table]).' AS DECIMAL) AS CHAR)',
                             ExpressionBuilder::NEQ,
-                            'CAST(' . $queryBuilder->quoteIdentifier($this->fieldsToMigrate[$table]) . ' AS CHAR)'
+                            'CAST('.$queryBuilder->quoteIdentifier($this->fieldsToMigrate[$table]).' AS CHAR)'
                         )
                     )
                     ->orderBy('uid')
@@ -205,7 +205,7 @@ 
                 }
             } catch (Exception $e) {
                 throw new \RuntimeException(
-                    'Database query failed. Error was: ' . $e->getPrevious()->getMessage(),
+                    'Database query failed. Error was: '.$e->getPrevious()->getMessage(),
                     1511950673
                 );
             }
@@ -271,7 +271,7 @@ 
         $connectionPool = GeneralUtility::makeInstance(ConnectionPool::class);
 
         $fileUid = null;
-        $sourcePath = Environment::getPublicPath() . '/' . $fieldItem;
+        $sourcePath = Environment::getPublicPath().'/'.$fieldItem;
 
         // maybe the file was already moved, so check if the original file still exists
         if (file_exists($sourcePath)) {

Braces +1 added lines, -2 removed lines

@@ -171,8 +171,7 @@
      *
      * @throws \RuntimeException
      */
-    protected function getRecordsFromTable(bool $countOnly = false)
-    {
+    protected function getRecordsFromTable(bool $countOnly = false) {
         $connectionPool = GeneralUtility::makeInstance(ConnectionPool::class);
         $allResults = [];
         $numResults = 0;

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

@@ -105,11 +105,11 @@ 
     public function updateNecessary(): bool
     {
         /** @var int */
-        $numRecords = $this->getRecordsFromTable(true);
+        $numRecords = $this->getRecordsFromTable(TRUE);
         if ($numRecords > 0) {
-            return true;
+            return TRUE;
         }
-        return false;
+        return FALSE;
     }
 
     /**
@@ -145,16 +145,16 @@ 
      */
     public function executeUpdate(): bool
     {
-        $result = true;
+        $result = TRUE;
         try {
             /** @var int */
-            $numRecords = $this->getRecordsFromTable(true);
+            $numRecords = $this->getRecordsFromTable(TRUE);
             if ($numRecords > 0) {
                 $this->performUpdate();
             }
         } catch (\Exception $e) {
             // If something goes wrong, migrateField() logs an error
-            $result = false;
+            $result = FALSE;
         }
         return $result;
     }
@@ -171,7 +171,7 @@ 
      *
      * @throws \RuntimeException
      */
-    protected function getRecordsFromTable(bool $countOnly = false)
+    protected function getRecordsFromTable(bool $countOnly = FALSE)
     {
         $connectionPool = GeneralUtility::makeInstance(ConnectionPool::class);
         $allResults = [];
@@ -198,7 +198,7 @@ 
                     ->orderBy('uid')
                     ->execute()
                     ->fetchAllAssociative();
-                if ($countOnly === true) {
+                if ($countOnly === TRUE) {
                     $numResults += count($result);
                 } else {
                     $allResults[$table] = $result;
@@ -211,7 +211,7 @@ 
             }
         }
 
-        if ($countOnly === true) {
+        if ($countOnly === TRUE) {
             return $numResults;
         } else {
             return $allResults;
@@ -228,7 +228,7 @@ 
      */
     protected function performUpdate(): bool
     {
-        $result = true;
+        $result = TRUE;
 
         try {
             $storages = GeneralUtility::makeInstance(StorageRepository::class)->findAll();
@@ -241,7 +241,7 @@ 
                 }
             }
         } catch (\Exception $e) {
-            $result = false;
+            $result = FALSE;
         }
 
         return $result;
@@ -270,7 +270,7 @@ 
         $storageUid = (int) $this->storage->getUid();
         $connectionPool = GeneralUtility::makeInstance(ConnectionPool::class);
 
-        $fileUid = null;
+        $fileUid = NULL;
         $sourcePath = Environment::getPublicPath() . '/' . $fieldItem;
 
         // maybe the file was already moved, so check if the original file still exists

Classes/ExpressionLanguage/DocumentTypeProvider.php

Braces +2 added lines, -4 removed lines

@@ -22,8 +22,7 @@ 
  *
  * @access public
  */
-class DocumentTypeProvider extends AbstractProvider
-{
+class DocumentTypeProvider extends AbstractProvider {
     /**
      * Construct the instance
      *
@@ -31,8 +30,7 @@ 
      *
      * @return void
      */
-    public function __construct()
-    {
+    public function __construct() {
         $this->expressionLanguageProviders = [
             DocumentTypeFunctionProvider::class
         ];

Classes/ExpressionLanguage/DocumentTypeFunctionProvider.php

Spacing +4 added lines, -4 removed lines

@@ -181,7 +181,7 @@ 
                 if ($this->document) {
                     $doc = AbstractDocument::getInstance($this->document->getLocation(), ['storagePid' => $pid], true);
                 } else {
-                    $this->logger->error('Invalid UID "' . $requestData['id'] . '" or PID "' . $pid . '" for document loading');
+                    $this->logger->error('Invalid UID "'.$requestData['id'].'" or PID "'.$pid.'" for document loading');
                 }
             } else if (GeneralUtility::isValidUrl($requestData['id'])) {
 
@@ -199,7 +199,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');
                 }
             }
 
@@ -216,11 +216,11 @@ 
                 if ($doc !== null) {
                     $this->document->setCurrentDocument($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('Empty UID or invalid PID "' . $pid . '" for document loading');
+            $this->logger->error('Empty UID or invalid PID "'.$pid.'" for document loading');
         }
     }
 }

Braces +2 added lines, -4 removed lines

@@ -116,12 +116,10 @@
     {
         return new ExpressionFunction(
             'getDocumentType',
-            function()
-            {
+            function() {
                 // Not implemented, we only use the evaluator
             },
-            function($arguments, $cPid)
-            {
+            function($arguments, $cPid) {
                 /** @var RequestWrapper $requestWrapper */
                 $requestWrapper = $arguments['request'];
                 $queryParams = $requestWrapper->getQueryParams();

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

@@ -136,7 +136,7 @@ 
 
                 // Load document with current plugin parameters.
                 $this->loadDocument($queryParams['tx_dlf'], $cPid);
-                if ($this->document === null || $this->document->getCurrentDocument() === null) {
+                if ($this->document === NULL || $this->document->getCurrentDocument() === NULL) {
                     return $type;
                 }
                 // Set PID for metadata definitions.
@@ -147,7 +147,7 @@ 
                     // Calendar plugin does not support IIIF (yet). Abort for all newspaper related types.
                     if (
                         $this->document->getCurrentDocument() instanceof IiifManifest
-                        && array_search($metadata['type'][0], ['newspaper', 'ephemera', 'year', 'issue']) !== false
+                        && array_search($metadata['type'][0], ['newspaper', 'ephemera', 'year', 'issue']) !== FALSE
                     ) {
                         return $type;
                     }
@@ -174,25 +174,25 @@ 
 
             $this->initializeRepositories($pid);
 
-            $doc = null;
+            $doc = NULL;
             if (MathUtility::canBeInterpretedAsInteger($requestData['id'])) {
                 // find document from repository by uid
                 $this->document = $this->documentRepository->findOneByIdAndSettings((int) $requestData['id'], ['storagePid' => $pid]);
                 if ($this->document) {
-                    $doc = AbstractDocument::getInstance($this->document->getLocation(), ['storagePid' => $pid], true);
+                    $doc = AbstractDocument::getInstance($this->document->getLocation(), ['storagePid' => $pid], TRUE);
                 } else {
                     $this->logger->error('Invalid UID "' . $requestData['id'] . '" or PID "' . $pid . '" for document loading');
                 }
             } else if (GeneralUtility::isValidUrl($requestData['id'])) {
 
-                $doc = AbstractDocument::getInstance($requestData['id'], ['storagePid' => $pid], true);
+                $doc = AbstractDocument::getInstance($requestData['id'], ['storagePid' => $pid], 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);
                     }
@@ -203,7 +203,7 @@ 
                 }
             }
 
-            if ($this->document !== null && $doc !== null) {
+            if ($this->document !== NULL && $doc !== NULL) {
                 $this->document->setCurrentDocument($doc);
             }
 
@@ -211,9 +211,9 @@ 
 
             $this->document = $this->documentRepository->findOneByRecordId($requestData['recordId']);
 
-            if ($this->document !== null) {
-                $doc = AbstractDocument::getInstance($this->document->getLocation(), ['storagePid' => $pid], true);
-                if ($doc !== null) {
+            if ($this->document !== NULL) {
+                $doc = AbstractDocument::getInstance($this->document->getLocation(), ['storagePid' => $pid], TRUE);
+                if ($doc !== NULL) {
                     $this->document->setCurrentDocument($doc);
                 } else {
                     $this->logger->error('Failed to load document with record ID "' . $requestData['recordId'] . '"');

Classes/Pagination/PageGridPagination.php

Braces +2 added lines, -4 removed lines

@@ -18,15 +18,13 @@
 use TYPO3\CMS\Core\Pagination\PaginatorInterface;
 
 
-final class PageGridPagination implements PaginationInterface
-{
+final class PageGridPagination implements PaginationInterface {
     /**
      * @var PageGridPaginator
      */
     protected $paginator;
 
-    public function __construct(PaginatorInterface $paginator)
-    {
+    public function __construct(PaginatorInterface $paginator) {
         // @phpstan-ignore-next-line
         $this->paginator = $paginator;
     }

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

@@ -36,12 +36,12 @@ 
         $previousPage = (int) (($this->paginator->getCurrentPageNumber() - 1) * $this->paginator->getPublicItemsPerPage()) - ($this->paginator->getPublicItemsPerPage() - 1);
 
         if ($previousPage > $this->paginator->getNumberOfPages()) {
-            return null;
+            return NULL;
         }
 
         return $previousPage >= $this->getFirstPageNumber()
             ? $previousPage
-            : null
+            : NULL
             ;
     }
 
@@ -51,7 +51,7 @@ 
 
         return $nextPage <= $this->paginator->getNumberOfPages()
             ? $nextPage
-            : null
+            : NULL
             ;
     }
 

Classes/Pagination/PageGridPaginator.php

Braces +1 added lines, -2 removed lines

@@ -16,8 +16,7 @@
 
 use TYPO3\CMS\Core\Pagination\AbstractPaginator;
 
-final class PageGridPaginator extends AbstractPaginator
-{
+final class PageGridPaginator extends AbstractPaginator {
     /**
      * @var array
      */

Classes/Controller/AbstractController.php

Spacing +8 added lines, -8 removed lines

@@ -145,11 +145,11 @@ 
                 if ($doc !== null) {
                     $this->document->setCurrentDocument($doc);
                 } else {
-                    $this->logger->error('Failed to load document with record ID "' . $this->requestData['recordId'] . '"');
+                    $this->logger->error('Failed to load document with record ID "'.$this->requestData['recordId'].'"');
                 }
             }
         } else {
-            $this->logger->error('Invalid ID "' . $documentId . '" or PID "' . $this->settings['storagePid'] . '" for document loading');
+            $this->logger->error('Invalid ID "'.$documentId.'" or PID "'.$this->settings['storagePid'].'" for document loading');
         }
     }
 
@@ -245,7 +245,7 @@ 
             && !MathUtility::canBeInterpretedAsInteger($this->requestData['id'])
             && !GeneralUtility::isValidUrl($this->requestData['id'])
         ) {
-            $this->logger->warning('Invalid ID or URI "' . $this->requestData['id'] . '" for document loading');
+            $this->logger->warning('Invalid ID or URI "'.$this->requestData['id'].'" for document loading');
             unset($this->requestData['id']);
         }
 
@@ -331,7 +331,7 @@ 
         $pages = [];
         $pagesSect = [];
         $aRange = [];
-        $nRange = 5;    // ToDo: should be made configurable
+        $nRange = 5; // ToDo: should be made configurable
 
         // lower limit of the range
         $nBottom = $currentPageNumber - $nRange;
@@ -346,7 +346,7 @@ 
 
         // check whether the first screen page is > 1, if yes then points must be added
         if ($aRange[0] > 1) {
-            array_push($pagesSect, ['label' => '...','startRecordNumber' => '...']);
+            array_push($pagesSect, ['label' => '...', 'startRecordNumber' => '...']);
         };
         $lastStartRecordNumberGrid = 0; // due to validity outside the loop
         foreach (range($firstPage, $lastPage) as $i) {
@@ -389,7 +389,7 @@ 
 
                 // Check if screen page is in range
                 if (in_array($i, $aRange)) {
-                    array_push($pagesSect, ['label' => $i,'startRecordNumber' => $startRecordNumber]);
+                    array_push($pagesSect, ['label' => $i, 'startRecordNumber' => $startRecordNumber]);
                 };
             };
         };
@@ -451,7 +451,7 @@ 
         if ($this->document) {
             $doc = AbstractDocument::getInstance($this->document->getLocation(), $this->settings, true);
         } else {
-            $this->logger->error('Invalid UID "' . $documentId . '" or PID "' . $this->settings['storagePid'] . '" for document loading');
+            $this->logger->error('Invalid UID "'.$documentId.'" or PID "'.$this->settings['storagePid'].'" for document loading');
         }
 
         return $doc;
@@ -489,7 +489,7 @@ 
 
             $this->document->setLocation($documentId);
         } else {
-            $this->logger->error('Invalid location given "' . $documentId . '" for document loading');
+            $this->logger->error('Invalid location given "'.$documentId.'" for document loading');
         }
 
         return $doc;

Braces +9 added lines, -12 removed lines

@@ -35,8 +35,7 @@ 
  *
  * @abstract
  */
-abstract class AbstractController extends ActionController implements LoggerAwareInterface
-{
+abstract class AbstractController extends ActionController implements LoggerAwareInterface {
     use LoggerAwareTrait;
 
     /**
@@ -222,8 +221,7 @@ 
      *
      * @return null|string|array
      */
-    protected function getParametersSafely(string $parameterName)
-    {
+    protected function getParametersSafely(string $parameterName) {
         if ($this->request->hasArgument($parameterName)) {
             return $this->request->getArgument($parameterName);
         }
@@ -310,8 +308,7 @@ 
      *
      * @return void
      */
-    public function __construct()
-    {
+    public function __construct() {
         $this->initialize();
     }
 
@@ -351,7 +348,8 @@ 
         $lastStartRecordNumberGrid = 0; // due to validity outside the loop
         foreach (range($firstPage, $lastPage) as $i) {
             // detect which pagination is active: ListView or GridView
-            if (get_class($pagination) == 'TYPO3\CMS\Core\Pagination\SimplePagination') {  // ListView
+            if (get_class($pagination) == 'TYPO3\CMS\Core\Pagination\SimplePagination') {
+// ListView
                 $lastStartRecordNumberGrid = $i; // save last $startRecordNumber for LastPage button
 
                 $pages[$i] = [
@@ -364,7 +362,8 @@ 
                 if (in_array($i, $aRange)) {
                     array_push($pagesSect, ['label' => $i, 'startRecordNumber' => $i]);
                 };
-            } else { // GridView
+            } else {
+// GridView
                 // to calculate the values for generation the links for the pagination pages
                 /** @var \Kitodo\Dlf\Pagination\PageGridPaginator $paginator */
                 $itemsPerPage = $paginator->getPublicItemsPerPage();
@@ -443,8 +442,7 @@ 
      *
      * @return AbstractDocument
      */
-    private function getDocumentByUid(int $documentId)
-    {
+    private function getDocumentByUid(int $documentId) {
         $doc = null;
         $this->document = $this->documentRepository->findOneByIdAndSettings($documentId);
 
@@ -466,8 +464,7 @@ 
      *
      * @return AbstractDocument
      */
-    private function getDocumentByUrl(string $documentId)
-    {
+    private function getDocumentByUrl(string $documentId) {
         $doc = AbstractDocument::getInstance($documentId, $this->settings, true);
 
         if ($doc !== null) {

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

@@ -61,7 +61,7 @@ 
      * @access protected
      * @var Document|null This holds the current document
      */
-    protected ?Document $document = null;
+    protected ?Document $document = NULL;
 
     /**
      * @access protected
@@ -131,7 +131,7 @@ 
         // Try to get document format from database
         if (!empty($documentId)) {
 
-            $doc = null;
+            $doc = NULL;
 
             if (MathUtility::canBeInterpretedAsInteger($documentId)) {
                 $doc = $this->getDocumentByUid($documentId);
@@ -139,7 +139,7 @@ 
                 $doc = $this->getDocumentByUrl($documentId);
             }
 
-            if ($this->document !== null && $doc !== null) {
+            if ($this->document !== NULL && $doc !== NULL) {
                 $this->document->setCurrentDocument($doc);
             }
 
@@ -147,9 +147,9 @@ 
 
             $this->document = $this->documentRepository->findOneByRecordId($this->requestData['recordId']);
 
-            if ($this->document !== null) {
-                $doc = AbstractDocument::getInstance($this->document->getLocation(), $this->settings, true);
-                if ($doc !== null) {
+            if ($this->document !== NULL) {
+                $doc = AbstractDocument::getInstance($this->document->getLocation(), $this->settings, TRUE);
+                if ($doc !== NULL) {
                     $this->document->setCurrentDocument($doc);
                 } else {
                     $this->logger->error('Failed to load document with record ID "' . $this->requestData['recordId'] . '"');
@@ -205,7 +205,7 @@ 
      */
     protected function isDocMissing(): bool
     {
-        return $this->document === null || $this->document->getCurrentDocument() === null;
+        return $this->document === NULL || $this->document->getCurrentDocument() === NULL;
     }
 
     /**
@@ -234,7 +234,7 @@ 
         if ($this->request->hasArgument($parameterName)) {
             return $this->request->getArgument($parameterName);
         }
-        return null;
+        return NULL;
     }
 
     /**
@@ -408,8 +408,8 @@ 
         };
 
         // Safely get the next and previous page numbers
-        $nextPageNumber = isset($pages[$currentPageNumber + 1]) ? $pages[$currentPageNumber + 1]['startRecordNumber'] : null;
-        $previousPageNumber = isset($pages[$currentPageNumber - 1]) ? $pages[$currentPageNumber - 1]['startRecordNumber'] : null;
+        $nextPageNumber = isset($pages[$currentPageNumber + 1]) ? $pages[$currentPageNumber + 1]['startRecordNumber'] : NULL;
+        $previousPageNumber = isset($pages[$currentPageNumber - 1]) ? $pages[$currentPageNumber - 1]['startRecordNumber'] : NULL;
 
         // 'startRecordNumber' is not required in GridView, only the variant for each loop is required
         // 'endRecordNumber' is not required in both views
@@ -454,11 +454,11 @@ 
      */
     private function getDocumentByUid(int $documentId)
     {
-        $doc = null;
+        $doc = NULL;
         $this->document = $this->documentRepository->findOneByIdAndSettings($documentId);
 
         if ($this->document) {
-            $doc = AbstractDocument::getInstance($this->document->getLocation(), $this->settings, true);
+            $doc = AbstractDocument::getInstance($this->document->getLocation(), $this->settings, TRUE);
         } else {
             $this->logger->error('Invalid UID "' . $documentId . '" or PID "' . $this->settings['storagePid'] . '" for document loading');
         }
@@ -477,13 +477,13 @@ 
      */
     private function getDocumentByUrl(string $documentId)
     {
-        $doc = AbstractDocument::getInstance($documentId, $this->settings, true);
+        $doc = AbstractDocument::getInstance($documentId, $this->settings, TRUE);
 
-        if ($doc !== null) {
+        if ($doc !== NULL) {
             if ($doc->recordId) {
                 // find document from repository by recordId
                 $docFromRepository = $this->documentRepository->findOneByRecordId($doc->recordId);
-                if ($docFromRepository !== null) {
+                if ($docFromRepository !== NULL) {
                     $this->document = $docFromRepository;
                 } else {
                     // create new dummy Document object