Erikmitk / kitodo-presentation

ext_localconf.php

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

@@ -220,7 +220,7 @@
 // Register AJAX eID handlers.
 $GLOBALS['TYPO3_CONF_VARS']['FE']['eID_include']['tx_dlf_search_suggest'] = \Kitodo\Dlf\Plugin\Eid\SearchSuggest::class . '::main';
 $GLOBALS['TYPO3_CONF_VARS']['FE']['eID_include']['tx_dlf_search_in_document'] = \Kitodo\Dlf\Plugin\Eid\SearchInDocument::class . '::main';
-if ($GLOBALS['TYPO3_CONF_VARS']['EXTENSIONS']['dlf']['enableInternalProxy'] ?? false) {
+if ($GLOBALS['TYPO3_CONF_VARS']['EXTENSIONS']['dlf']['enableInternalProxy'] ?? FALSE) {
     $GLOBALS['TYPO3_CONF_VARS']['FE']['eID_include']['tx_dlf_pageview_proxy'] = \Kitodo\Dlf\Plugin\Eid\PageViewProxy::class . '::main';
 }
 // Use Caching Framework for Solr queries

Spacing +10 added lines, -10 removed lines

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

Classes/Plugin/Eid/PageViewProxy.php

Braces +3 added lines, -6 removed lines

@@ -34,8 +34,7 @@ 
  * @subpackage dlf
  * @access public
  */
-class PageViewProxy
-{
+class PageViewProxy {
     /**
      * @var RequestFactory
      */
@@ -46,8 +45,7 @@ 
      */
     protected $extConf;
 
-    public function __construct()
-    {
+    public function __construct() {
         $this->requestFactory = GeneralUtility::makeInstance(RequestFactory::class);
         $this->extConf = GeneralUtility::makeInstance(ExtensionConfiguration::class)->get('dlf');
     }
@@ -173,8 +171,7 @@ 
      * @param ServerRequestInterface $request
      * @return ResponseInterface
      */
-    public function main(ServerRequestInterface $request)
-    {
+    public function main(ServerRequestInterface $request) {
         switch ($request->getMethod()) {
             case 'OPTIONS':
                 return $this->handleOptions($request);

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

@@ -140,11 +140,11 @@
                 // For performance, don't download content up-front. Rather, we'll
                 // download and upload simultaneously.
                 // https://docs.guzzlephp.org/en/6.5/request-options.html#stream
-                'stream' => true,
+                'stream' => TRUE,
 
                 // Don't throw exceptions when a non-success status code is
                 // received. We handle these manually.
-                'http_errors' => false,
+                'http_errors' => FALSE,
             ]);
         } catch (\Exception $e) {
             return new JsonResponse(['message' => 'Could not fetch resource of given URL.'], 500);

Classes/Common/StdOutStream.php

Braces +1 added lines, -2 removed lines

@@ -23,8 +23,7 @@
 {
     use StreamDecoratorTrait;
 
-    public function emit()
-    {
+    public function emit() {
         // Disable output buffering
         ob_end_flush();
 

Configuration/TCA/Overrides/tt_content.php

Spacing +15 added lines, -15 removed lines

@@ -16,63 +16,63 @@
 // Plugin "audioplayer".
 $GLOBALS['TCA']['tt_content']['types']['list']['subtypes_excludelist']['dlf_audioplayer'] = 'layout,select_key,pages,recursive';
 $GLOBALS['TCA']['tt_content']['types']['list']['subtypes_addlist']['dlf_audioplayer'] = 'pi_flexform';
-\TYPO3\CMS\Core\Utility\ExtensionManagementUtility::addPiFlexFormValue('dlf_audioplayer', 'FILE:EXT:' . 'dlf/Configuration/Flexforms/AudioPlayer.xml');
+\TYPO3\CMS\Core\Utility\ExtensionManagementUtility::addPiFlexFormValue('dlf_audioplayer', 'FILE:EXT:'.'dlf/Configuration/Flexforms/AudioPlayer.xml');
 // Plugin "basket".
 $GLOBALS['TCA']['tt_content']['types']['list']['subtypes_excludelist']['dlf_basket'] = 'layout,select_key,pages,recursive';
 $GLOBALS['TCA']['tt_content']['types']['list']['subtypes_addlist']['dlf_basket'] = 'pi_flexform';
-\TYPO3\CMS\Core\Utility\ExtensionManagementUtility::addPiFlexFormValue('dlf_basket', 'FILE:EXT:' . 'dlf/Configuration/Flexforms/Basket.xml');
+\TYPO3\CMS\Core\Utility\ExtensionManagementUtility::addPiFlexFormValue('dlf_basket', 'FILE:EXT:'.'dlf/Configuration/Flexforms/Basket.xml');
 // Plugin "calendar".
 $GLOBALS['TCA']['tt_content']['types']['list']['subtypes_excludelist']['dlf_calendar'] = 'layout,select_key,pages,recursive';
 $GLOBALS['TCA']['tt_content']['types']['list']['subtypes_addlist']['dlf_calendar'] = 'pi_flexform';
-\TYPO3\CMS\Core\Utility\ExtensionManagementUtility::addPiFlexFormValue('dlf_calendar', 'FILE:EXT:' . 'dlf/Configuration/Flexforms/Calendar.xml');
+\TYPO3\CMS\Core\Utility\ExtensionManagementUtility::addPiFlexFormValue('dlf_calendar', 'FILE:EXT:'.'dlf/Configuration/Flexforms/Calendar.xml');
 // Plugin "collection".
 $GLOBALS['TCA']['tt_content']['types']['list']['subtypes_excludelist']['dlf_collection'] = 'layout,select_key,pages,recursive';
 $GLOBALS['TCA']['tt_content']['types']['list']['subtypes_addlist']['dlf_collection'] = 'pi_flexform';
-\TYPO3\CMS\Core\Utility\ExtensionManagementUtility::addPiFlexFormValue('dlf_collection', 'FILE:EXT:' . 'dlf/Configuration/Flexforms/Collection.xml');
+\TYPO3\CMS\Core\Utility\ExtensionManagementUtility::addPiFlexFormValue('dlf_collection', 'FILE:EXT:'.'dlf/Configuration/Flexforms/Collection.xml');
 // Plugin "feeds".
 $GLOBALS['TCA']['tt_content']['types']['list']['subtypes_excludelist']['dlf_feeds'] = 'layout,select_key,pages,recursive';
 $GLOBALS['TCA']['tt_content']['types']['list']['subtypes_addlist']['dlf_feeds'] = 'pi_flexform';
-\TYPO3\CMS\Core\Utility\ExtensionManagementUtility::addPiFlexFormValue('dlf_feeds', 'FILE:EXT:' . 'dlf/Configuration/Flexforms/Feeds.xml');
+\TYPO3\CMS\Core\Utility\ExtensionManagementUtility::addPiFlexFormValue('dlf_feeds', 'FILE:EXT:'.'dlf/Configuration/Flexforms/Feeds.xml');
 // Plugin "listview".
 $GLOBALS['TCA']['tt_content']['types']['list']['subtypes_excludelist']['dlf_listview'] = 'layout,select_key,pages,recursive';
 $GLOBALS['TCA']['tt_content']['types']['list']['subtypes_addlist']['dlf_listview'] = 'pi_flexform';
-\TYPO3\CMS\Core\Utility\ExtensionManagementUtility::addPiFlexFormValue('dlf_listview', 'FILE:EXT:' . 'dlf/Configuration/Flexforms/ListView.xml');
+\TYPO3\CMS\Core\Utility\ExtensionManagementUtility::addPiFlexFormValue('dlf_listview', 'FILE:EXT:'.'dlf/Configuration/Flexforms/ListView.xml');
 // Plugin "metadata".
 $GLOBALS['TCA']['tt_content']['types']['list']['subtypes_excludelist']['dlf_metadata'] = 'layout,select_key,pages,recursive';
 $GLOBALS['TCA']['tt_content']['types']['list']['subtypes_addlist']['dlf_metadata'] = 'pi_flexform';
-\TYPO3\CMS\Core\Utility\ExtensionManagementUtility::addPiFlexFormValue('dlf_metadata', 'FILE:EXT:' . 'dlf/Configuration/Flexforms/Metadata.xml');
+\TYPO3\CMS\Core\Utility\ExtensionManagementUtility::addPiFlexFormValue('dlf_metadata', 'FILE:EXT:'.'dlf/Configuration/Flexforms/Metadata.xml');
 // Plugin "navigation".
 $GLOBALS['TCA']['tt_content']['types']['list']['subtypes_excludelist']['dlf_navigation'] = 'layout,select_key,pages,recursive';
 $GLOBALS['TCA']['tt_content']['types']['list']['subtypes_addlist']['dlf_navigation'] = 'pi_flexform';
-\TYPO3\CMS\Core\Utility\ExtensionManagementUtility::addPiFlexFormValue('dlf_navigation', 'FILE:EXT:' . 'dlf/Configuration/Flexforms/Navigation.xml');
+\TYPO3\CMS\Core\Utility\ExtensionManagementUtility::addPiFlexFormValue('dlf_navigation', 'FILE:EXT:'.'dlf/Configuration/Flexforms/Navigation.xml');
 // Plugin "oaipmh".
 $GLOBALS['TCA']['tt_content']['types']['list']['subtypes_excludelist']['dlf_oaipmh'] = 'layout,select_key,pages,recursive';
 $GLOBALS['TCA']['tt_content']['types']['list']['subtypes_addlist']['dlf_oaipmh'] = 'pi_flexform';
-\TYPO3\CMS\Core\Utility\ExtensionManagementUtility::addPiFlexFormValue('dlf_oaipmh', 'FILE:EXT:' . 'dlf/Configuration/Flexforms/OaiPmh.xml');
+\TYPO3\CMS\Core\Utility\ExtensionManagementUtility::addPiFlexFormValue('dlf_oaipmh', 'FILE:EXT:'.'dlf/Configuration/Flexforms/OaiPmh.xml');
 // Plugin "pagegrid".
 $GLOBALS['TCA']['tt_content']['types']['list']['subtypes_excludelist']['dlf_pagegrid'] = 'layout,select_key,pages,recursive';
 $GLOBALS['TCA']['tt_content']['types']['list']['subtypes_addlist']['dlf_pagegrid'] = 'pi_flexform';
-\TYPO3\CMS\Core\Utility\ExtensionManagementUtility::addPiFlexFormValue('dlf_pagegrid', 'FILE:EXT:' . 'dlf/Configuration/Flexforms/PageGrid.xml');
+\TYPO3\CMS\Core\Utility\ExtensionManagementUtility::addPiFlexFormValue('dlf_pagegrid', 'FILE:EXT:'.'dlf/Configuration/Flexforms/PageGrid.xml');
 // Plugin "pageview".
 $GLOBALS['TCA']['tt_content']['types']['list']['subtypes_excludelist']['dlf_pageview'] = 'layout,select_key,pages,recursive';
 $GLOBALS['TCA']['tt_content']['types']['list']['subtypes_addlist']['dlf_pageview'] = 'pi_flexform';
-\TYPO3\CMS\Core\Utility\ExtensionManagementUtility::addPiFlexFormValue('dlf_pageview', 'FILE:EXT:' . 'dlf/Configuration/Flexforms/PageView.xml');
+\TYPO3\CMS\Core\Utility\ExtensionManagementUtility::addPiFlexFormValue('dlf_pageview', 'FILE:EXT:'.'dlf/Configuration/Flexforms/PageView.xml');
 // Plugin "search".
 $GLOBALS['TCA']['tt_content']['types']['list']['subtypes_excludelist']['dlf_search'] = 'layout,select_key,pages,recursive';
 $GLOBALS['TCA']['tt_content']['types']['list']['subtypes_addlist']['dlf_search'] = 'pi_flexform';
-\TYPO3\CMS\Core\Utility\ExtensionManagementUtility::addPiFlexFormValue('dlf_search', 'FILE:EXT:' . 'dlf/Configuration/Flexforms/Search.xml');
+\TYPO3\CMS\Core\Utility\ExtensionManagementUtility::addPiFlexFormValue('dlf_search', 'FILE:EXT:'.'dlf/Configuration/Flexforms/Search.xml');
 // Plugin "statistics".
 $GLOBALS['TCA']['tt_content']['types']['list']['subtypes_excludelist']['dlf_statistics'] = 'layout,select_key,pages,recursive';
 $GLOBALS['TCA']['tt_content']['types']['list']['subtypes_addlist']['dlf_statistics'] = 'pi_flexform';
-\TYPO3\CMS\Core\Utility\ExtensionManagementUtility::addPiFlexFormValue('dlf_statistics', 'FILE:EXT:' . 'dlf/Configuration/Flexforms/Statistics.xml');
+\TYPO3\CMS\Core\Utility\ExtensionManagementUtility::addPiFlexFormValue('dlf_statistics', 'FILE:EXT:'.'dlf/Configuration/Flexforms/Statistics.xml');
 // Plugin "tableofcontents".
 $GLOBALS['TCA']['tt_content']['types']['list']['subtypes_excludelist']['dlf_tableofcontents'] = 'layout,select_key,pages,recursive';
 $GLOBALS['TCA']['tt_content']['types']['list']['subtypes_addlist']['dlf_tableofcontents'] = 'pi_flexform';
-\TYPO3\CMS\Core\Utility\ExtensionManagementUtility::addPiFlexFormValue('dlf_tableofcontents', 'FILE:EXT:' . 'dlf/Configuration/Flexforms/TableOfContents.xml');
+\TYPO3\CMS\Core\Utility\ExtensionManagementUtility::addPiFlexFormValue('dlf_tableofcontents', 'FILE:EXT:'.'dlf/Configuration/Flexforms/TableOfContents.xml');
 // Plugin "toolbox".
 $GLOBALS['TCA']['tt_content']['types']['list']['subtypes_excludelist']['dlf_toolbox'] = 'layout,select_key,pages,recursive';
 $GLOBALS['TCA']['tt_content']['types']['list']['subtypes_addlist']['dlf_toolbox'] = 'pi_flexform';
-\TYPO3\CMS\Core\Utility\ExtensionManagementUtility::addPiFlexFormValue('dlf_toolbox', 'FILE:EXT:' . 'dlf/Configuration/Flexforms/Toolbox.xml');
+\TYPO3\CMS\Core\Utility\ExtensionManagementUtility::addPiFlexFormValue('dlf_toolbox', 'FILE:EXT:'.'dlf/Configuration/Flexforms/Toolbox.xml');
 
 \TYPO3\CMS\Extbase\Utility\ExtensionUtility::registerPlugin(
     'Kitodo.Dlf',

Configuration/Extbase/Persistence/Classes.php

Spacing +1 added lines, -1 removed lines

@@ -1,5 +1,5 @@
 <?php
-declare(strict_types = 1);
+declare(strict_types=1);
 
 return [
     \Kitodo\Dlf\Domain\Model\ActionLog::class => [

Build/Documentation/dbdocs/Generator.php

Indentation +1 added lines, -3 removed lines

@@ -249,6 +249,4 @@
 
             $section->addTable($rows, $header);
         }
-        return $page;
-    }
-}
+        return $page
\ No newline at end of file

Switch Indentation +1 added lines, -3 removed lines

@@ -249,6 +249,4 @@
 
             $section->addTable($rows, $header);
         }
-        return $page;
-    }
-}
+        return $page
\ No newline at end of file

Spacing +2 added lines, -4 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);
 
@@ -249,6 +249,4 @@ 
 
             $section->addTable($rows, $header);
         }
-        return $page;
-    }
-}
+        return $page
\ No newline at end of file

Braces +5 added lines, -11 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
@@ -249,6 +245,4 @@ 
 
             $section->addTable($rows, $header);
         }
-        return $page;
-    }
-}
+        return $page
\ No newline at end of file

Upper-Lower-Casing +8 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,21 +141,21 @@ 
         $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);
 
             foreach ($reflection->getProperties() as $property) {
                 $column = $dataMap->getColumnMap($property->getName());
-                if ($column !== null) {
+                if ($column !== NULL) {
                     $result->columns[$column->getColumnName()]->fieldComment = $this->parseDocComment($property->getDocComment());
                 }
             }
@@ -177,7 +177,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;
             }
 
@@ -249,6 +249,4 @@ 
 
             $section->addTable($rows, $header);
         }
-        return $page;
-    }
-}
+        return $page
\ No newline at end of file

Build/Documentation/dbdocs/RstSection.php

Spacing +8 added lines, -8 removed lines

@@ -35,9 +35,9 @@ 
     {
         if (!empty($text)) {
             if ($format['bold'] ?? false) {
-                $text = '**' . $text . '**';
+                $text = '**'.$text.'**';
             } elseif ($format['italic'] ?? false) {
-                $text = '*' . $text . '*';
+                $text = '*'.$text.'*';
             }
         }
 
@@ -46,7 +46,7 @@ 
 
     public static function paragraphs(array $paragraphs)
     {
-        $paragraphs = array_values(array_filter($paragraphs, function ($entry) {
+        $paragraphs = array_values(array_filter($paragraphs, function($entry) {
             return !empty($entry);
         }));
 
@@ -68,7 +68,7 @@ 
     public function addText(string $text)
     {
         if (!empty($text)) {
-            $this->text .= $text . "\n\n";
+            $this->text .= $text."\n\n";
         }
     }
 
@@ -97,10 +97,10 @@ 
                 $numLines = count($valueLines);
                 for ($i = 0; $i < $numLines; $i++) {
                     $prefix = $i === 0
-                        ? '     :' . $key . ':'
+                        ? '     :'.$key.':'
                         : '';
 
-                    $entry .= str_pad($prefix, 32) . trim($valueLines[$i]) . "\n";
+                    $entry .= str_pad($prefix, 32).trim($valueLines[$i])."\n";
                 }
             }
 
@@ -138,10 +138,10 @@ 
         $headerSep = str_repeat($headerChar, mb_strlen($this->header));
 
         if ($level === 0) {
-            $result .= $headerSep . "\n";
+            $result .= $headerSep."\n";
         }
 
-        $result .= $this->header . "\n" . $headerSep . "\n\n";
+        $result .= $this->header."\n".$headerSep."\n\n";
 
         return $result;
     }

Braces +9 added lines, -18 removed lines

@@ -20,8 +20,7 @@ 
  * @subpackage dlf
  * @access public
  */
-class RstSection
-{
+class RstSection {
     /** @var string */
     protected $header = '';
 
@@ -31,8 +30,7 @@ 
     /** @var RstSection[] */
     protected $subsections = [];
 
-    public static function format(string $text, array $format = [])
-    {
+    public static function format(string $text, array $format = []) {
         if (!empty($text)) {
             if ($format['bold'] ?? false) {
                 $text = '**' . $text . '**';
@@ -44,8 +42,7 @@ 
         return $text;
     }
 
-    public static function paragraphs(array $paragraphs)
-    {
+    public static function paragraphs(array $paragraphs) {
         $paragraphs = array_values(array_filter($paragraphs, function ($entry) {
             return !empty($entry);
         }));
@@ -53,27 +50,23 @@ 
         return implode("\n\n", $paragraphs);
     }
 
-    public function subsection()
-    {
+    public function subsection() {
         $section = new static();
         $this->subsections[] = $section;
         return $section;
     }
 
-    public function setHeader(string $text)
-    {
+    public function setHeader(string $text) {
         $this->header = $text;
     }
 
-    public function addText(string $text)
-    {
+    public function addText(string $text) {
         if (!empty($text)) {
             $this->text .= $text . "\n\n";
         }
     }
 
-    public function addTable(array $rows, array $headerRows)
-    {
+    public function addTable(array $rows, array $headerRows) {
         $numHeaderRows = count($headerRows);
 
         $tableRst = <<<RST
@@ -115,8 +108,7 @@ 
         $this->addText($tableRst);
     }
 
-    public function render(int $level = 0)
-    {
+    public function render(int $level = 0) {
         $result = '';
 
         $result .= $this->renderHeader($level);
@@ -130,8 +122,7 @@ 
         return $result;
     }
 
-    protected function renderHeader(int $level)
-    {
+    protected function renderHeader(int $level) {
         $result = '';
 
         $headerChar = ['=', '=', '-', '~', '"'][$level];

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

@@ -34,9 +34,9 @@ 
     public static function format(string $text, array $format = [])
     {
         if (!empty($text)) {
-            if ($format['bold'] ?? false) {
+            if ($format['bold'] ?? FALSE) {
                 $text = '**' . $text . '**';
-            } elseif ($format['italic'] ?? false) {
+            } elseif ($format['italic'] ?? FALSE) {
                 $text = '*' . $text . '*';
             }
         }
@@ -81,7 +81,7 @@ 
    :header-rows: $numHeaderRows
 
 
-RST;
+rst;
 
         // Pattern for a row:
         //

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/Plugin/Eid/SearchSuggest.php

Spacing +1 added lines, -1 removed lines

@@ -45,7 +45,7 @@
         $parameters = $request->getParsedBody();
         $solrCore = (string) $parameters['solrcore'];
         $uHash = (string) $parameters['uHash'];
-        if (hash_equals(GeneralUtility::hmac((string) (new Typo3Version()) . Environment::getExtensionsPath(), 'SearchSuggest'), $uHash) === false) {
+        if (hash_equals(GeneralUtility::hmac((string) (new Typo3Version()).Environment::getExtensionsPath(), 'SearchSuggest'), $uHash) === false) {
             throw new \InvalidArgumentException('No valid parameter passed!', 1580585079);
         }
         // Perform Solr query.

Braces +2 added lines, -4 removed lines

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

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

@@ -45,7 +45,7 @@
         $parameters = $request->getParsedBody();
         $solrCore = (string) $parameters['solrcore'];
         $uHash = (string) $parameters['uHash'];
-        if (hash_equals(GeneralUtility::hmac((string) (new Typo3Version()) . Environment::getExtensionsPath(), 'SearchSuggest'), $uHash) === false) {
+        if (hash_equals(GeneralUtility::hmac((string) (new Typo3Version()) . Environment::getExtensionsPath(), 'SearchSuggest'), $uHash) === FALSE) {
             throw new \InvalidArgumentException('No valid parameter passed!', 1580585079);
         }
         // Perform Solr query.