Erikmitk / kitodo-presentation

Build/Documentation/dbdocs/Generator.php

Spacing +5 added lines, -5 removed lines

@@ -183,7 +183,7 @@ 
 
             // There may be a single non-signifying space after the doc-comment asterisk,
             // which is not included.
-            $text .= preg_replace('#\\s*/?[*/]*\\s?(.*)$#', '$1', $line) . "\n";
+            $text .= preg_replace('#\\s*/?[*/]*\\s?(.*)$#', '$1', $line)."\n";
         }
         $text = trim($text);
 
@@ -204,7 +204,7 @@ 
 RST);
 
         // Sort tables alphabetically
-        usort($tables, function ($lhs, $rhs) {
+        usort($tables, function($lhs, $rhs) {
             return $lhs->name <=> $rhs->name;
         });
 
@@ -214,13 +214,13 @@ 
             // Set header
             $header = $tableInfo->name;
             if (!empty($tableInfo->feComment)) {
-                $header .= ': ' . $tableInfo->feComment;
+                $header .= ': '.$tableInfo->feComment;
             }
             $section->setHeader($header);
 
             // Set introductory text of subsection
             if ($tableInfo->modelClass) {
-                $section->addText('Extbase domain model: ``' . $tableInfo->modelClass . '``');
+                $section->addText('Extbase domain model: ``'.$tableInfo->modelClass.'``');
             }
             $section->addText($tableInfo->classComment);
             $section->addText($tableInfo->sqlComment);
@@ -231,7 +231,7 @@ 
                 'description' => 'Description',
             ]];
 
-            $rows = array_map(function ($column) use ($page) {
+            $rows = array_map(function($column) use ($page) {
                 return [
                     'field' => (
                         $page->format($column->name, ['bold' => $column->isPrimary])

Braces +4 added lines, -8 removed lines

@@ -32,8 +32,7 @@ 
  * @subpackage dlf
  * @access public
  */
-class Generator
-{
+class Generator {
     /**
      * @var ObjectManager
      */
@@ -49,8 +48,7 @@ 
      */
     protected $dataMapper;
 
-    public function __construct()
-    {
+    public function __construct() {
         $this->objectManager = GeneralUtility::makeInstance(ObjectManager::class);
         $this->languageService = $this->objectManager->get(LanguageService::class);
         $this->dataMapper = $this->objectManager->get(DataMapper::class);
@@ -167,8 +165,7 @@ 
         return $result;
     }
 
-    protected function parseDocComment($docComment)
-    {
+    protected function parseDocComment($docComment) {
         // TODO: Consider using phpDocumentor (though that splits the docblock into summary and description)
 
         // Adopted from DocCommentParser in TYPO3 v9
@@ -193,8 +190,7 @@ 
     /**
      * Transform table structure into .rst page.
      */
-    public function generatePage(array $tables)
-    {
+    public function generatePage(array $tables) {
         $page = new RstSection();
         $page->setHeader('Database Tables');
         $page->addText(<<<RST

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

@@ -63,7 +63,7 @@ 
     public function collectTables(): array
     {
         $sqlReader = $this->objectManager->get(SqlReader::class);
-        $sqlCode = $sqlReader->getTablesDefinitionString(true);
+        $sqlCode = $sqlReader->getTablesDefinitionString(TRUE);
         $createTableStatements = $sqlReader->getCreateTableStatementArray($sqlCode);
 
         $tableToClassName = $this->getTableClassMap();
@@ -79,7 +79,7 @@ 
                 continue;
             }
 
-            $className = $tableToClassName[$tableName] ?? null;
+            $className = $tableToClassName[$tableName] ?? NULL;
 
             $result[] = $this->getTableInfo($table, $className);
         }
@@ -120,7 +120,7 @@ 
         $isPrimary = [];
         if (!is_null($primaryKey = $table->getPrimaryKey())) {
             foreach ($primaryKey->getUnquotedColumns() as $primaryColumn) {
-                $isPrimary[$primaryColumn] = true;
+                $isPrimary[$primaryColumn] = TRUE;
             }
         }
 
@@ -141,14 +141,14 @@ 
         $result = (object) [
             'name' => $tableName,
             'columns' => $columns,
-            'modelClass' => null,
+            'modelClass' => NULL,
             'sqlComment' => $table->getComment() ?? '',
             'classComment' => '',
             'feComment' => $this->languageService->sL($GLOBALS['TCA'][$tableName]['ctrl']['title'] ?? ''),
         ];
 
         // Integrate doc-comments from model class and its fields
-        if ($className !== null) {
+        if ($className !== NULL) {
             $reflection = new ReflectionClass($className);
 
             $dataMap = $this->dataMapper->getDataMap($className);
@@ -158,7 +158,7 @@ 
                 // In that case, try to guess the column name from the property name.
 
                 $column = $dataMap->getColumnMap($property->getName());
-                $columnName = $column === null
+                $columnName = $column === NULL
                     ? GeneralUtility::camelCaseToLowerCaseUnderscored($property->getName())
                     : $column->getColumnName();
 
@@ -184,7 +184,7 @@ 
         $lines = explode("\n", $docComment);
         foreach ($lines as $line) {
             // Stop parsing at first tag
-            if ($line !== '' && strpos($line, '@') !== false) {
+            if ($line !== '' && strpos($line, '@') !== FALSE) {
                 break;
             }
 
@@ -208,7 +208,7 @@ 
 This is a reference of all database tables defined by Kitodo.Presentation.
 
 .. tip:: This page is auto-generated. If you would like to edit it, please use doc-comments in the model class, COMMENT fields in ``ext_tables.sql`` if the table does not have one, or TCA labels. Then, you may re-generate the page by running ``composer docs:db`` inside the Kitodo.Presentation base folder.
-RST);
+rst);
 
         // Sort tables alphabetically
         usort($tables, function ($lhs, $rhs) {
@@ -243,11 +243,11 @@ 
                     'field' => (
                         $page->format($column->name, ['bold' => $column->isPrimary])
                         . "\u{00a0}\u{00a0}"
-                        . $page->format($column->type->getName(), ['italic' => true])
+                        . $page->format($column->type->getName(), ['italic' => TRUE])
                     ),
 
                     'description' => $page->paragraphs([
-                        $page->format($column->feComment, ['italic' => true]),
+                        $page->format($column->feComment, ['italic' => TRUE]),
                         $column->fieldComment,
                         $column->sqlComment,
                     ]),

Classes/Domain/Repository/TokenRepository.php

Braces +1 added lines, -2 removed lines

@@ -25,8 +25,7 @@
      *
      * @return void
      */
-    public function deleteExpiredTokens($expireTime)
-    {
+    public function deleteExpiredTokens($expireTime) {
         $query = $this->createQuery();
 
         $constraints = [];

Classes/Domain/Repository/MailRepository.php

Braces +1 added lines, -2 removed lines

@@ -18,8 +18,7 @@
 class MailRepository extends \TYPO3\CMS\Extbase\Persistence\Repository
 {
 
-    public function findAllWithPid($pid)
-    {
+    public function findAllWithPid($pid) {
         /** @var Typo3QuerySettings $querySettings */
         $querySettings = GeneralUtility::makeInstance(Typo3QuerySettings::class);
 

Classes/Domain/Model/Metadata.php

Braces +5 added lines, -10 removed lines

@@ -109,14 +109,12 @@ 
     /**
      * constructor
      */
-    public function __construct()
-    {
+    public function __construct() {
         // Do not remove the next line: It would break the functionality
         $this->initStorageObjects();
     }
 
-    protected function initStorageObjects()
-    {
+    protected function initStorageObjects() {
         $this->format = new ObjectStorage();
     }
 
@@ -187,8 +185,7 @@ 
     /**
      * @return \TYPO3\CMS\Extbase\Persistence\ObjectStorage<\Kitodo\Dlf\Domain\Model\MetadataFormat> $format
      */
-    public function getFormat()
-    {
+    public function getFormat() {
         return $this->format;
     }
 
@@ -207,8 +204,7 @@ 
      *
      * @return void
      */
-    public function addFormat(MetadataFormat $format)
-    {
+    public function addFormat(MetadataFormat $format) {
         $this->format->attach($format);
     }
 
@@ -219,8 +215,7 @@ 
      *
      * @return void
      */
-    public function removeFormat(MetadataFormat $formatToRemove)
-    {
+    public function removeFormat(MetadataFormat $formatToRemove) {
         $this->format->detach($formatToRemove);
     }
 

Classes/Controller/MetadataController.php

Braces +9 added lines, -18 removed lines

@@ -29,8 +29,7 @@ 
  * @subpackage dlf
  * @access public
  */
-class MetadataController extends AbstractController
-{
+class MetadataController 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;
     }
 
@@ -65,16 +62,14 @@ 
     /**
      * @param StructureRepository $structureRepository
      */
-    public function injectStructureRepository(StructureRepository $structureRepository)
-    {
+    public function injectStructureRepository(StructureRepository $structureRepository) {
         $this->structureRepository = $structureRepository;
     }
 
     /**
      * @return string|void
      */
-    public function mainAction()
-    {
+    public function mainAction() {
         $this->cObj = $this->configurationManager->getContentObject();
 
         // Load current document.
@@ -130,8 +125,7 @@ 
      *
      * @return string The metadata array ready for output
      */
-    protected function printMetadata(array $metadataArray, $useOriginalIiifManifestMetadata = false)
-    {
+    protected function printMetadata(array $metadataArray, $useOriginalIiifManifestMetadata = false) {
         if ($useOriginalIiifManifestMetadata) {
             $iiifData = [];
             foreach ($metadataArray as $metadata) {
@@ -250,8 +244,7 @@ 
                     }
 
                     if (is_array($metadataArray[$i][$metadataName])) {
-                        $metadataArray[$i][$metadataName] = array_values(array_filter($metadataArray[$i][$metadataName], function($value)
-                        {
+                        $metadataArray[$i][$metadataName] = array_values(array_filter($metadataArray[$i][$metadataName], function($value) {
                             return !empty($value);
                         }));
                     }
@@ -273,8 +266,7 @@ 
      *
      * @return array metadata
      */
-    private function getMetadata()
-    {
+    private function getMetadata() {
         $metadata = [];
         if ($this->settings['rootline'] < 2) {
             // Get current structure's @ID.
@@ -312,8 +304,7 @@ 
      *
      * @return array metadata
      */
-    private function getMetadataForIds($id, $metadata)
-    {
+    private function getMetadataForIds($id, $metadata) {
         $useOriginalIiifManifestMetadata = $this->settings['originalIiifMetadata'] == 1 && $this->document->getDoc() instanceof IiifManifest;
         foreach ($id as $sid) {
             if ($useOriginalIiifManifestMetadata) {

Spacing +2 added lines, -2 removed lines

@@ -112,7 +112,7 @@ 
             array_unshift($metadata, $data);
         }
         if (empty($metadata)) {
-            $this->logger->warning('No metadata found for document with UID ' . $this->document->getUid());
+            $this->logger->warning('No metadata found for document with UID '.$this->document->getUid());
             return '';
         }
         ksort($metadata);
@@ -215,7 +215,7 @@ 
                         if (empty(implode('', $metadataValue)) && $this->settings['getTitle'] && $this->document->getPartof()) {
                             $superiorTitle = Doc::getTitle($this->document->getPartof(), true);
                             if (!empty($superiorTitle)) {
-                                $metadataArray[$i][$metadataName] = ['[' . $superiorTitle . ']'];
+                                $metadataArray[$i][$metadataName] = ['['.$superiorTitle.']'];
                             }
                         }
                         if (!empty($metadataValue)) {

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

@@ -80,8 +80,8 @@ 
         // Load current document.
         $this->loadDocument($this->requestData);
         if (
-            $this->document === null
-            || $this->document->getDoc() === null
+            $this->document === NULL
+            || $this->document->getDoc() === NULL
         ) {
             // Quit without doing anything if required variables are not set.
             return '';
@@ -130,7 +130,7 @@ 
      *
      * @return string The metadata array ready for output
      */
-    protected function printMetadata(array $metadataArray, $useOriginalIiifManifestMetadata = false)
+    protected function printMetadata(array $metadataArray, $useOriginalIiifManifestMetadata = FALSE)
     {
         if ($useOriginalIiifManifestMetadata) {
             $iiifData = [];
@@ -148,14 +148,14 @@ 
                             $iiifData[$key] = [
                                 'label' => $key,
                                 'value' => $group,
-                                'buildUrl' => true,
+                                'buildUrl' => TRUE,
                             ];
                         } else {
                             // Data output
                             $iiifData[$key] = [
                                 'label' => $key,
                                 'value' => $group,
-                                'buildUrl' => false,
+                                'buildUrl' => FALSE,
                             ];
                         }
                     } else {
@@ -172,18 +172,18 @@ 
                                 $iiifData[$key]['data'][] = [
                                     'label' => $nolabel ? '' : $label,
                                     'value' => $value,
-                                    'buildUrl' => true,
+                                    'buildUrl' => TRUE,
                                 ];
                             } else {
                                 $iiifData[$key]['data'][] = [
                                     'label' => $label,
                                     'value' => $value,
-                                    'buildUrl' => false,
+                                    'buildUrl' => FALSE,
                                 ];
                             }
                         }
                     }
-                    $this->view->assign('useIiif', true);
+                    $this->view->assign('useIiif', TRUE);
                     $this->view->assign('iiifData', $iiifData);
                 }
             }
@@ -213,7 +213,7 @@ 
                     if ($metadataName == 'title') {
                         // Get title of parent document if needed.
                         if (empty(implode('', $metadataValue)) && $this->settings['getTitle'] && $this->document->getPartof()) {
-                            $superiorTitle = Doc::getTitle($this->document->getPartof(), true);
+                            $superiorTitle = Doc::getTitle($this->document->getPartof(), TRUE);
                             if (!empty($superiorTitle)) {
                                 $metadataArray[$i][$metadataName] = ['[' . $superiorTitle . ']'];
                             }

Classes/Controller/BasketController.php

Spacing +26 added lines, -26 removed lines

@@ -109,7 +109,7 @@ 
                 foreach ($this->requestData['selected'] as $docValue) {
                     if ($docValue['id']) {
                         $docData = $this->getDocumentData($docValue['id'], $docValue);
-                        $pdfUrl .= $docData['urlParams'] . $this->settings['pdfparamseparator'];
+                        $pdfUrl .= $docData['urlParams'].$this->settings['pdfparamseparator'];
                         $this->redirectToUri($pdfUrl);
                     }
                 }
@@ -172,7 +172,7 @@ 
         if ($allMails->count() > 0) {
             $mailSelect[0] = htmlspecialchars(LocalizationUtility::translate('basket.chooseMail', 'dlf'));
             foreach ($allMails as $mail) {
-                $mailSelect[$mail->getUid()] = htmlspecialchars($mail->getName()) . ' (' . htmlspecialchars($mail->getMail()) . ')';
+                $mailSelect[$mail->getUid()] = htmlspecialchars($mail->getName()).' ('.htmlspecialchars($mail->getMail()).')';
             }
             $this->view->assign('mailSelect', $mailSelect);
         }
@@ -256,12 +256,12 @@ 
 
         $entryArray['BASKETDATA'] = $docData;
 
-        $entryKey = $id . '_' . $startpage;
+        $entryKey = $id.'_'.$startpage;
         if (!empty($startX)) {
-            $entryKey .= '_' . $startX;
+            $entryKey .= '_'.$startX;
         }
         if (!empty($endX)) {
-            $entryKey .= '_' . $endX;
+            $entryKey .= '_'.$endX;
         }
 
         $entryArray['id'] = $id;
@@ -312,7 +312,7 @@ 
             $urlParams = str_replace("##endy##", $data['endY'] === "" ? "" : (int) $data['endY'], $urlParams);
             $urlParams = str_replace("##rotation##", $data['rotation'] === "" ? "" : (int) $data['rotation'], $urlParams);
 
-            $downloadUrl = $this->settings['pdfgenerate'] . $urlParams;
+            $downloadUrl = $this->settings['pdfgenerate'].$urlParams;
 
             $title = $this->document->getTitle();
             if (empty($title)) {
@@ -323,15 +323,15 @@ 
             $info = '';
             if ($data['startX'] != '' && $data['endX'] != '') {
                 // cutout
-                $info .= htmlspecialchars(LocalizationUtility::translate('basket.cutout', 'dlf')) . ' ';
+                $info .= htmlspecialchars(LocalizationUtility::translate('basket.cutout', 'dlf')).' ';
             }
             if ($data['startpage'] == $data['endpage']) {
                 // One page
-                $info .= htmlspecialchars(LocalizationUtility::translate('page', 'dlf')) . ' ' . $data['startpage'];
+                $info .= htmlspecialchars(LocalizationUtility::translate('page', 'dlf')).' '.$data['startpage'];
             } else {
-                $info .= htmlspecialchars(LocalizationUtility::translate('page', 'dlf')) . ' ' . $data['startpage'] . '-' . $data['endpage'];
+                $info .= htmlspecialchars(LocalizationUtility::translate('page', 'dlf')).' '.$data['startpage'].'-'.$data['endpage'];
             }
-            $downloadLink = '<a href="' . $downloadUrl . '" target="_blank">' . htmlspecialchars($title) . '</a> (' . $info . ')';
+            $downloadLink = '<a href="'.$downloadUrl.'" target="_blank">'.htmlspecialchars($title).'</a> ('.$info.')';
             if ($data['startpage'] == $data['endpage']) {
                 $pageNums = 1;
             } else {
@@ -407,12 +407,12 @@ 
             if ($_piVars['addToBasket'] == 'list') {
                 $documentItem['endpage'] = $this->document->getDoc()->numPages;
             }
-            $arrayKey = $documentItem['id'] . '_' . $page;
+            $arrayKey = $documentItem['id'].'_'.$page;
             if (!empty($documentItem['startX'])) {
-                $arrayKey .= '_' . $documentItem['startX'];
+                $arrayKey .= '_'.$documentItem['startX'];
             }
             if (!empty($documentItem['endX'])) {
-                $arrayKey .= '_' . $documentItem['endX'];
+                $arrayKey .= '_'.$documentItem['endX'];
             }
             // do not add more than one identical object
             if (!in_array($arrayKey, $items)) {
@@ -431,14 +431,14 @@ 
                     // remove parameter endpage
                     $pdfParams = str_replace(",##endpage##", '', $pdfParams);
                 }
-                $pdfGenerateUrl = $this->settings['pdfgenerate'] . $pdfParams;
+                $pdfGenerateUrl = $this->settings['pdfgenerate'].$pdfParams;
                 if ($this->settings['pregeneration']) {
                     // send ajax request to webapp
                     $output .= '
      <script>
       $(document).ready(function(){
        $.ajax({
-         url: "' . $pdfGenerateUrl . '",
+         url: "' . $pdfGenerateUrl.'",
        }).done(function() {
        });
       });
@@ -476,12 +476,12 @@ 
         }
         foreach ($_piVars['selected'] as $value) {
             if (isset($value['id'])) {
-                $arrayKey = $value['id'] . '_' . $value['startpage'];
+                $arrayKey = $value['id'].'_'.$value['startpage'];
                 if (!empty($value['startX'])) {
-                    $arrayKey .= '_' . $value['startX'];
+                    $arrayKey .= '_'.$value['startX'];
                 }
                 if (!empty($value['endX'])) {
-                    $arrayKey .= '_' . $value['endX'];
+                    $arrayKey .= '_'.$value['endX'];
                 }
                 if (isset($items[$arrayKey])) {
                     unset($items[$arrayKey]);
@@ -514,7 +514,7 @@ 
 
         $mailObject = $this->mailRepository->findByUid(intval($mailId))->getFirst();
 
-        $mailText = htmlspecialchars(LocalizationUtility::translate('basket.mailBody', 'dlf')) . "\n";
+        $mailText = htmlspecialchars(LocalizationUtility::translate('basket.mailBody', 'dlf'))."\n";
         $numberOfPages = 0;
         $pdfUrl = $this->settings['pdfdownload'];
         // prepare links
@@ -522,7 +522,7 @@ 
             if ($docValue['id']) {
                 $explodeId = explode("_", $docValue['id']);
                 $docData = $this->getDocumentData($explodeId[0], $docValue);
-                $pdfUrl .= $docData['urlParams'] . $this->settings['pdfparamseparator'];
+                $pdfUrl .= $docData['urlParams'].$this->settings['pdfparamseparator'];
                 $pages = (abs(intval($docValue['startpage']) - intval($docValue['endpage'])));
                 if ($pages === 0) {
                     $numberOfPages = $numberOfPages + 1;
@@ -533,7 +533,7 @@ 
         }
         // Remove leading/tailing pdfparamseperator
         $pdfUrl = trim($pdfUrl, $this->settings['pdfparamseparator']);
-        $mailBody = $mailText . $pdfUrl;
+        $mailBody = $mailText.$pdfUrl;
         // Get hook objects.
         $hookObjects = Helper::getHookObjects('Classes/Controller/BasketController.php');
         // Hook for getting a customized mail body.
@@ -560,7 +560,7 @@ 
         $newActionLog = GeneralUtility::makeInstance(ActionLog::class);
         $newActionLog->setFileName($pdfUrl);
         $newActionLog->setCountPages($numberOfPages);
-        $newActionLog->setLabel('Mail: ' . $mailObject->getMail());
+        $newActionLog->setLabel('Mail: '.$mailObject->getMail());
 
         if ($GLOBALS["TSFE"]->loginUser) {
             // internal user
@@ -592,7 +592,7 @@ 
         foreach ($this->requestData['selected'] as $docId => $docValue) {
             if ($docValue['id']) {
                 $docData = $this->getDocumentData($docValue['id'], $docValue);
-                $pdfUrl .= $docData['urlParams'] . $this->settings['pdfparamseparator'];
+                $pdfUrl .= $docData['urlParams'].$this->settings['pdfparamseparator'];
                 $numberOfPages += $docData['pageNums'];
             }
         }
@@ -610,7 +610,7 @@ 
                 if ($docValue['id']) {
                     $explodeId = explode("_", $docId);
                     $docData = $this->getDocumentData($explodeId[0], $docValue);
-                    $pdfUrl .= $docData['urlParams'] . $this->settings['pdfparamseparator'];
+                    $pdfUrl .= $docData['urlParams'].$this->settings['pdfparamseparator'];
                     $numberOfPages += $docData['pageNums'];
                 }
             }
@@ -627,12 +627,12 @@ 
             // internal user
             $actionLog->setUserId($GLOBALS["TSFE"]->fe_user->user['uid']);
             $actionLog->setName($GLOBALS["TSFE"]->fe_user->user['username']);
-            $actionLog->setLabel('Print: ' . $printer->getLabel());
+            $actionLog->setLabel('Print: '.$printer->getLabel());
         } else {
             // external user
             $actionLog->setUserId(0);
             $actionLog->setName('n/a');
-            $actionLog->setLabel('Print: ' . $printer->getLabel());
+            $actionLog->setLabel('Print: '.$printer->getLabel());
         }
         // add action to protocol
         $this->actionLogRepository->add($actionLog);

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

@@ -162,7 +162,7 @@ 
 
         $countDocs = 0;
         if ($basket->getDocIds()) {
-            $countDocs = count(json_decode($basket->getDocIds(), true));
+            $countDocs = count(json_decode($basket->getDocIds(), TRUE));
         }
         $this->view->assign('countDocs', $countDocs);
 
@@ -212,13 +212,13 @@ 
             $basket = $this->basketRepository->findOneByFeUserId((int) $GLOBALS['TSFE']->fe_user->user['uid']);
         } else {
             $GLOBALS['TSFE']->fe_user->setKey('ses', 'tx_dlf_basket', '');
-            $GLOBALS['TSFE']->fe_user->sesData_change = true;
+            $GLOBALS['TSFE']->fe_user->sesData_change = TRUE;
             $GLOBALS['TSFE']->fe_user->storeSessionData();
 
             $basket = $this->basketRepository->findOneBySessionId($sessionId);
         }
         // session does not exist
-        if ($basket === null) {
+        if ($basket === NULL) {
             // create new basket in db
             $basket = GeneralUtility::makeInstance(Basket::class);
             $basket->setSessionId($sessionId);
@@ -347,7 +347,7 @@ 
                 'record_id' => $this->document->getRecordId(),
             ];
         }
-        return false;
+        return FALSE;
     }
 
     /**
@@ -369,7 +369,7 @@ 
         } else {
             $page = (int) $_piVars['startpage'];
         }
-        if ($page != null || $_piVars['addToBasket'] == 'list') {
+        if ($page != NULL || $_piVars['addToBasket'] == 'list') {
             $documentItem = [
                 'id' => (int) $_piVars['id'],
                 'startpage' => (int) $_piVars['startpage'],
@@ -391,8 +391,8 @@ 
             // get document instance to load further information
             $this->loadDocument(['id' => $documentItem['id']]);
             if (
-                $this->document === null
-                || $this->document->getDoc() === null
+                $this->document === NULL
+                || $this->document->getDoc() === NULL
             ) {
                 // Quit without doing anything if required variables are not set.
                 return;
@@ -447,7 +447,7 @@ 
             }
 
             $basket->setDocIds(json_encode($items));
-            if ($basket->getUid() === null) {
+            if ($basket->getUid() === NULL) {
                 $this->basketRepository->add($basket);
             } else {
                 $this->basketRepository->update($basket);

Braces +15 added lines, -30 removed lines

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

Classes/Format/TeiHeader.php

Braces +1 added lines, -2 removed lines

@@ -32,8 +32,7 @@
      *
      * @return void
      */
-    public function extractMetadata(\SimpleXMLElement $xml, array &$metadata)
-    {
+    public function extractMetadata(\SimpleXMLElement $xml, array &$metadata) {
         $xml->registerXPathNamespace('teihdr', 'http://www.tei-c.org/ns/1.0');
     }
 }

Classes/Controller/Backend/NewTenantController.php

Spacing +11 added lines, -11 removed lines

@@ -158,7 +158,7 @@ 
     public function addFormatAction()
     {
         // Include formats definition file.
-        $formatsDefaults = include(ExtensionManagementUtility::extPath('dlf') . 'Resources/Private/Data/FormatDefaults.php');
+        $formatsDefaults = include(ExtensionManagementUtility::extPath('dlf').'Resources/Private/Data/FormatDefaults.php');
 
         $frameworkConfiguration = $this->configurationManager->getConfiguration($this->configurationManager::CONFIGURATION_TYPE_FRAMEWORK);
         // tx_dlf_formats are stored on PID = 0
@@ -196,7 +196,7 @@ 
     public function addMetadataAction()
     {
         // Include metadata definition file.
-        $metadataDefaults = include(ExtensionManagementUtility::extPath('dlf') . 'Resources/Private/Data/MetadataDefaults.php');
+        $metadataDefaults = include(ExtensionManagementUtility::extPath('dlf').'Resources/Private/Data/MetadataDefaults.php');
 
         $doPersist = false;
 
@@ -208,7 +208,7 @@ 
             if ($this->metadataRepository->findOneByIndexName($indexName) === null) {
 
                 $newRecord = GeneralUtility::makeInstance(Metadata::class);
-                $newRecord->setLabel($this->getLLL('metadata.' . $indexName, $this->siteLanguages[0]->getTypo3Language(), $metadataLabels));
+                $newRecord->setLabel($this->getLLL('metadata.'.$indexName, $this->siteLanguages[0]->getTypo3Language(), $metadataLabels));
                 $newRecord->setIndexName($indexName);
                 $newRecord->setDefaultValue($values['default_value']);
                 $newRecord->setWrap($values['wrap'] ? : $GLOBALS['TCA']['tx_dlf_metadata']['columns']['wrap']['config']['default']);
@@ -243,7 +243,7 @@ 
                     $translatedRecord = GeneralUtility::makeInstance(Metadata::class);
                     $translatedRecord->setL18nParent($newRecord);
                     $translatedRecord->_setProperty('_languageUid', $siteLanguage->getLanguageId());
-                    $translatedRecord->setLabel($this->getLLL('metadata.' . $indexName, $siteLanguage->getTypo3Language(), $metadataLabels));
+                    $translatedRecord->setLabel($this->getLLL('metadata.'.$indexName, $siteLanguage->getTypo3Language(), $metadataLabels));
                     $translatedRecord->setIndexName($indexName);
                     $translatedRecord->setWrap($newRecord->getWrap());
 
@@ -277,7 +277,7 @@ 
 
         if ($this->solrCoreRepository->findOneByPid($this->pid) === null) {
             $newRecord = GeneralUtility::makeInstance(SolrCore::class);
-            $newRecord->setLabel($this->getLLL('flexform.solrcore', $this->siteLanguages[0]->getTypo3Language(), $beLabels). ' (PID ' . $this->pid . ')');
+            $newRecord->setLabel($this->getLLL('flexform.solrcore', $this->siteLanguages[0]->getTypo3Language(), $beLabels).' (PID '.$this->pid.')');
             $indexName = Solr::createCore('');
             $newRecord->setIndexName($indexName);
 
@@ -301,7 +301,7 @@ 
     public function addStructureAction()
     {
         // Include structure definition file.
-        $structureDefaults = include(ExtensionManagementUtility::extPath('dlf') . 'Resources/Private/Data/StructureDefaults.php');
+        $structureDefaults = include(ExtensionManagementUtility::extPath('dlf').'Resources/Private/Data/StructureDefaults.php');
 
         $doPersist = false;
 
@@ -312,7 +312,7 @@ 
             // if default format record is not found, add it to the repository
             if ($this->structureRepository->findOneByIndexName($indexName) === null) {
                 $newRecord = GeneralUtility::makeInstance(Structure::class);
-                $newRecord->setLabel($this->getLLL('structure.' . $indexName, $this->siteLanguages[0]->getTypo3Language(), $structLabels));
+                $newRecord->setLabel($this->getLLL('structure.'.$indexName, $this->siteLanguages[0]->getTypo3Language(), $structLabels));
                 $newRecord->setIndexName($indexName);
                 $newRecord->setToplevel($values['toplevel']);
                 $newRecord->setOaiName($values['oai_name']);
@@ -326,7 +326,7 @@ 
                     $translatedRecord = GeneralUtility::makeInstance(Structure::class);
                     $translatedRecord->setL18nParent($newRecord);
                     $translatedRecord->_setProperty('_languageUid', $siteLanguage->getLanguageId());
-                    $translatedRecord->setLabel($this->getLLL('structure.' . $indexName, $siteLanguage->getTypo3Language(), $structLabels));
+                    $translatedRecord->setLabel($this->getLLL('structure.'.$indexName, $siteLanguage->getTypo3Language(), $structLabels));
                     $translatedRecord->setIndexName($indexName);
 
                     $this->structureRepository->add($translatedRecord);
@@ -378,15 +378,15 @@ 
             $this->forward('error');
         }
 
-        $formatsDefaults = include(ExtensionManagementUtility::extPath('dlf') . 'Resources/Private/Data/FormatDefaults.php');
+        $formatsDefaults = include(ExtensionManagementUtility::extPath('dlf').'Resources/Private/Data/FormatDefaults.php');
         $recordInfos['formats']['numCurrent'] = $this->formatRepository->countAll();
         $recordInfos['formats']['numDefault'] = count($formatsDefaults);
 
-        $structuresDefaults = include(ExtensionManagementUtility::extPath('dlf') . 'Resources/Private/Data/StructureDefaults.php');
+        $structuresDefaults = include(ExtensionManagementUtility::extPath('dlf').'Resources/Private/Data/StructureDefaults.php');
         $recordInfos['structures']['numCurrent'] = $this->structureRepository->countByPid($this->pid);
         $recordInfos['structures']['numDefault'] = count($structuresDefaults);
 
-        $metadataDefaults = include(ExtensionManagementUtility::extPath('dlf') . 'Resources/Private/Data/MetadataDefaults.php');
+        $metadataDefaults = include(ExtensionManagementUtility::extPath('dlf').'Resources/Private/Data/MetadataDefaults.php');
         $recordInfos['metadata']['numCurrent'] = $this->metadataRepository->countByPid($this->pid);
         $recordInfos['metadata']['numDefault'] = count($metadataDefaults);
 

Braces +14 added lines, -28 removed lines

@@ -44,8 +44,7 @@ 
  * @subpackage dlf
  * @access public
  */
-class NewTenantController extends AbstractController
-{
+class NewTenantController extends AbstractController {
     /**
      * @var int
      */
@@ -85,8 +84,7 @@ 
     /**
      * @param FormatRepository $formatRepository
      */
-    public function injectFormatRepository(FormatRepository $formatRepository)
-    {
+    public function injectFormatRepository(FormatRepository $formatRepository) {
         $this->formatRepository = $formatRepository;
     }
 
@@ -98,8 +96,7 @@ 
     /**
      * @param MetadataRepository $metadataRepository
      */
-    public function injectMetadataRepository(MetadataRepository $metadataRepository)
-    {
+    public function injectMetadataRepository(MetadataRepository $metadataRepository) {
         $this->metadataRepository = $metadataRepository;
     }
 
@@ -111,8 +108,7 @@ 
     /**
      * @param StructureRepository $structureRepository
      */
-    public function injectStructureRepository(StructureRepository $structureRepository)
-    {
+    public function injectStructureRepository(StructureRepository $structureRepository) {
         $this->structureRepository = $structureRepository;
     }
 
@@ -124,8 +120,7 @@ 
     /**
      * @param SolrCoreRepository $solrCoreRepository
      */
-    public function injectSolrCoreRepository(SolrCoreRepository $solrCoreRepository)
-    {
+    public function injectSolrCoreRepository(SolrCoreRepository $solrCoreRepository) {
         $this->solrCoreRepository = $solrCoreRepository;
     }
 
@@ -133,8 +128,7 @@ 
      * Initialization for all actions
      *
      */
-    protected function initializeAction()
-    {
+    protected function initializeAction() {
         $this->pid = (int) GeneralUtility::_GP('id');
 
         $frameworkConfiguration = $this->configurationManager->getConfiguration($this->configurationManager::CONFIGURATION_TYPE_FRAMEWORK);
@@ -155,8 +149,7 @@ 
     /**
      * Action adding formats records
      */
-    public function addFormatAction()
-    {
+    public function addFormatAction() {
         // Include formats definition file.
         $formatsDefaults = include(ExtensionManagementUtility::extPath('dlf') . 'Resources/Private/Data/FormatDefaults.php');
 
@@ -193,8 +186,7 @@ 
     /**
      * Action adding metadata records
      */
-    public function addMetadataAction()
-    {
+    public function addMetadataAction() {
         // Include metadata definition file.
         $metadataDefaults = include(ExtensionManagementUtility::extPath('dlf') . 'Resources/Private/Data/MetadataDefaults.php');
 
@@ -268,8 +260,7 @@ 
     /**
      * Action adding Solr core records
      */
-    public function addSolrCoreAction()
-    {
+    public function addSolrCoreAction() {
         $doPersist = false;
 
         // load language file in own array
@@ -298,8 +289,7 @@ 
     /**
      * Action adding structure records
      */
-    public function addStructureAction()
-    {
+    public function addStructureAction() {
         // Include structure definition file.
         $structureDefaults = include(ExtensionManagementUtility::extPath('dlf') . 'Resources/Private/Data/StructureDefaults.php');
 
@@ -351,8 +341,7 @@ 
      * @param ViewInterface $view
      * @return void
      */
-    protected function initializeView(ViewInterface $view)
-    {
+    protected function initializeView(ViewInterface $view) {
         /** @var BackendTemplateView $view */
         parent::initializeView($view);
         if ($this->actionMethodName == 'indexAction') {
@@ -370,8 +359,7 @@ 
      * @access public
      *
      */
-    public function indexAction()
-    {
+    public function indexAction() {
         $recordInfos = [];
 
         if ($this->pageInfo['doktype'] != 254) {
@@ -401,8 +389,7 @@ 
      * @access public
      *
      */
-    public function errorAction()
-    {
+    public function errorAction() {
     }
 
     /**
@@ -414,8 +401,7 @@ 
      *
      * @access public
      */
-    protected function getLLL($index, $lang, $langArray)
-    {
+    protected function getLLL($index, $lang, $langArray) {
         if (isset($langArray[$lang][$index][0]['target'])) {
             return $langArray[$lang][$index][0]['target'];
         } else {

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

@@ -165,11 +165,11 @@ 
         $frameworkConfiguration['persistence']['storagePid'] = 0;
         $this->configurationManager->setConfiguration($frameworkConfiguration);
 
-        $doPersist = false;
+        $doPersist = FALSE;
 
         foreach ($formatsDefaults as $type => $values) {
             // if default format record is not found, add it to the repository
-            if ($this->formatRepository->findOneByType($type) === null) {
+            if ($this->formatRepository->findOneByType($type) === NULL) {
                 $newRecord = GeneralUtility::makeInstance(Format::class);
                 $newRecord->setType($type);
                 $newRecord->setRoot($values['root']);
@@ -177,12 +177,12 @@ 
                 $newRecord->setClass($values['class']);
                 $this->formatRepository->add($newRecord);
 
-                $doPersist = true;
+                $doPersist = TRUE;
             }
         }
 
         // We must persist here, if we changed anything.
-        if ($doPersist === true) {
+        if ($doPersist === TRUE) {
             $persistenceManager = GeneralUtility::makeInstance(PersistenceManager::class);
             $persistenceManager->persistAll();
         }
@@ -198,14 +198,14 @@ 
         // Include metadata definition file.
         $metadataDefaults = include(ExtensionManagementUtility::extPath('dlf') . 'Resources/Private/Data/MetadataDefaults.php');
 
-        $doPersist = false;
+        $doPersist = FALSE;
 
         // load language file in own array
         $metadataLabels = $this->languageFactory->getParsedData('EXT:dlf/Resources/Private/Language/locallang_metadata.xlf', $this->siteLanguages[0]->getTypo3Language());
 
         foreach ($metadataDefaults as $indexName => $values) {
             // if default format record is not found, add it to the repository
-            if ($this->metadataRepository->findOneByIndexName($indexName) === null) {
+            if ($this->metadataRepository->findOneByIndexName($indexName) === NULL) {
 
                 $newRecord = GeneralUtility::makeInstance(Metadata::class);
                 $newRecord->setLabel($this->getLLL('metadata.' . $indexName, $this->siteLanguages[0]->getTypo3Language(), $metadataLabels));
@@ -225,7 +225,7 @@ 
                     foreach ($values['format'] as $format) {
                         $formatRecord = $this->formatRepository->findOneByRoot($format['format_root']);
                         // If formatRecord is null, we cannot create a MetadataFormat record.
-                        if ($formatRecord !== null) {
+                        if ($formatRecord !== NULL) {
                             $newMetadataFormat = GeneralUtility::makeInstance(MetadataFormat::class);
                             $newMetadataFormat->setEncoded($formatRecord->getUid());
                             $newMetadataFormat->setXpath($format['xpath']);
@@ -252,12 +252,12 @@ 
 
                 $this->metadataRepository->add($newRecord);
 
-                $doPersist = true;
+                $doPersist = TRUE;
             }
         }
 
         // We must persist here, if we changed anything.
-        if ($doPersist === true) {
+        if ($doPersist === TRUE) {
             $persistenceManager = GeneralUtility::makeInstance(PersistenceManager::class);
             $persistenceManager->persistAll();
         }
@@ -270,12 +270,12 @@ 
      */
     public function addSolrCoreAction()
     {
-        $doPersist = false;
+        $doPersist = FALSE;
 
         // load language file in own array
         $beLabels = $this->languageFactory->getParsedData('EXT:dlf/Resources/Private/Language/locallang_be.xlf', $this->siteLanguages[0]->getTypo3Language());
 
-        if ($this->solrCoreRepository->findOneByPid($this->pid) === null) {
+        if ($this->solrCoreRepository->findOneByPid($this->pid) === NULL) {
             $newRecord = GeneralUtility::makeInstance(SolrCore::class);
             $newRecord->setLabel($this->getLLL('flexform.solrcore', $this->siteLanguages[0]->getTypo3Language(), $beLabels). ' (PID ' . $this->pid . ')');
             $indexName = Solr::createCore('');
@@ -283,11 +283,11 @@ 
 
             $this->solrCoreRepository->add($newRecord);
 
-            $doPersist = true;
+            $doPersist = TRUE;
         }
 
         // We must persist here, if we changed anything.
-        if ($doPersist === true) {
+        if ($doPersist === TRUE) {
             $persistenceManager = GeneralUtility::makeInstance(PersistenceManager::class);
             $persistenceManager->persistAll();
         }
@@ -303,14 +303,14 @@ 
         // Include structure definition file.
         $structureDefaults = include(ExtensionManagementUtility::extPath('dlf') . 'Resources/Private/Data/StructureDefaults.php');
 
-        $doPersist = false;
+        $doPersist = FALSE;
 
         // load language file in own array
         $structLabels = $this->languageFactory->getParsedData('EXT:dlf/Resources/Private/Language/locallang_structure.xlf', $this->siteLanguages[0]->getTypo3Language());
 
         foreach ($structureDefaults as $indexName => $values) {
             // if default format record is not found, add it to the repository
-            if ($this->structureRepository->findOneByIndexName($indexName) === null) {
+            if ($this->structureRepository->findOneByIndexName($indexName) === NULL) {
                 $newRecord = GeneralUtility::makeInstance(Structure::class);
                 $newRecord->setLabel($this->getLLL('structure.' . $indexName, $this->siteLanguages[0]->getTypo3Language(), $structLabels));
                 $newRecord->setIndexName($indexName);
@@ -332,12 +332,12 @@ 
                     $this->structureRepository->add($translatedRecord);
                 }
 
-                $doPersist = true;
+                $doPersist = TRUE;
             }
         }
 
         // We must persist here, if we changed anything.
-        if ($doPersist === true) {
+        if ($doPersist === TRUE) {
             $persistenceManager = GeneralUtility::makeInstance(PersistenceManager::class);
             $persistenceManager->persistAll();
         }

Classes/Eid/SearchInDocument.php

Spacing +1 added lines, -1 removed lines

@@ -120,7 +120,7 @@
      */
     private function getQuery($fields, $parameters)
     {
-        return $fields['fulltext'] . ':(' . Solr::escapeQuery((string) $parameters['q']) . ') AND ' . $fields['uid'] . ':' . $this->getUid($parameters['uid']);
+        return $fields['fulltext'].':('.Solr::escapeQuery((string) $parameters['q']).') AND '.$fields['uid'].':'.$this->getUid($parameters['uid']);
     }
 
     /**

Braces +4 added lines, -8 removed lines

@@ -28,16 +28,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
@@ -118,8 +116,7 @@ 
      *
      * @return string SOLR query
      */
-    private function getQuery($fields, $parameters)
-    {
+    private function getQuery($fields, $parameters) {
         return $fields['fulltext'] . ':(' . Solr::escapeQuery((string) $parameters['q']) . ') AND ' . $fields['uid'] . ':' . $this->getUid($parameters['uid']);
     }
 
@@ -133,8 +130,7 @@ 
      *
      * @return int|string uid of the document
      */
-    private function getUid($uid)
-    {
+    private function getUid($uid) {
         return is_numeric($uid) ? intval($uid) : $uid;
     }
 }

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

@@ -44,7 +44,7 @@
         ];
         // Get input parameters and decrypt core name.
         $parameters = $request->getParsedBody();
-        if ($parameters === null) {
+        if ($parameters === NULL) {
             throw new \InvalidArgumentException('No parameters passed!', 1632322297);
         }
         $encrypted = (string) $parameters['encrypted'];