Erikmitk / kitodo-presentation

Configuration/Backend/Modules.php

Spacing +1 added lines, -1 removed lines

@@ -26,7 +26,7 @@
         'navigationComponentId' => '@typo3/backend/page-tree/page-tree-element',
         'controllerActions'     => [
             \Kitodo\Dlf\Controller\Backend\NewTenantController::class => [
-                'index','error','addFormat','addMetadata','addSolrCore','addStructure'
+                'index', 'error', 'addFormat', 'addMetadata', 'addSolrCore', 'addStructure'
             ],
         ],
     ],

Tests/Functional/FunctionalTestCase.php

Spacing +7 added lines, -7 removed lines

@@ -96,7 +96,7 @@ 
         $this->configurationToUseInTestInstance['EXTENSIONS']['dlf'] = $this->getDlfConfiguration();
 
         if ($this->disableJsonWrappedResponse) {
-            $this->frameworkExtensionsToLoad = array_filter($this->frameworkExtensionsToLoad, function ($ext) {
+            $this->frameworkExtensionsToLoad = array_filter($this->frameworkExtensionsToLoad, function($ext) {
                 return $ext !== 'Resources/Core/Functional/Extensions/json_response';
             });
         }
@@ -108,9 +108,9 @@ 
 
         $this->persistenceManager = GeneralUtility::makeInstance(PersistenceManager::class);
 
-        $this->baseUrl = 'http://web:8000/public/typo3temp/var/tests/functional-' . $this->identifier . '/';
+        $this->baseUrl = 'http://web:8000/public/typo3temp/var/tests/functional-'.$this->identifier.'/';
         $this->httpClient = new HttpClient([
-            'base_uri' => $this->baseUrl . 'index.php',
+            'base_uri' => $this->baseUrl.'index.php',
             'http_errors' => false,
         ]);
 
@@ -169,13 +169,13 @@ 
 
     protected function addSiteConfig($identifier)
     {
-        $siteConfig = Yaml::parseFile(__DIR__ . '/../Fixtures/siteconfig.yaml');
+        $siteConfig = Yaml::parseFile(__DIR__.'/../Fixtures/siteconfig.yaml');
         $siteConfig['base'] = $this->baseUrl;
         $siteConfig['languages'][0]['base'] = $this->baseUrl;
 
-        $siteConfigPath = $this->instancePath . '/typo3conf/sites/' . $identifier;
+        $siteConfigPath = $this->instancePath.'/typo3conf/sites/'.$identifier;
         @mkdir($siteConfigPath, 0775, true);
-        file_put_contents($siteConfigPath . '/config.yaml', Yaml::dump($siteConfig));
+        file_put_contents($siteConfigPath.'/config.yaml', Yaml::dump($siteConfig));
 
         // refresh site cache (otherwise site config is not found)
         $finder = GeneralUtility::makeInstance(\TYPO3\CMS\Core\Site\SiteFinder::class);
@@ -197,7 +197,7 @@ 
         $jsonDocuments = json_decode(file_get_contents($path), true);
 
         $updateQuery = $solr->service->createUpdate();
-        $documents = array_map(function ($jsonDoc) use ($updateQuery) {
+        $documents = array_map(function($jsonDoc) use ($updateQuery) {
             $document = $updateQuery->createDocument();
             foreach ($jsonDoc as $key => $value) {
                 $document->setField($key, $value);

Braces +7 added lines, -14 removed lines

@@ -89,8 +89,7 @@ 
      */
     protected $httpClient;
 
-    public function __construct()
-    {
+    public function __construct() {
         parent::__construct();
 
         $this->configurationToUseInTestInstance['EXTENSIONS']['dlf'] = $this->getDlfConfiguration();
@@ -117,8 +116,7 @@ 
         $this->addSiteConfig('dlf-testing');
     }
 
-    protected function getDlfConfiguration()
-    {
+    protected function getDlfConfiguration() {
         $dotenv = Dotenv::createImmutable('/home/runner/work/kitodo-presentation/kitodo-presentation/Build/Test/', 'test.env');
         $dotenv->load();
 
@@ -167,8 +165,7 @@ 
         ];
     }
 
-    protected function addSiteConfig($identifier)
-    {
+    protected function addSiteConfig($identifier) {
         $siteConfig = Yaml::parseFile(__DIR__ . '/../Fixtures/siteconfig.yaml');
         $siteConfig['base'] = $this->baseUrl;
         $siteConfig['languages'][0]['base'] = $this->baseUrl;
@@ -182,8 +179,7 @@ 
         $finder->getAllSites(false); // useCache = false
     }
 
-    protected function initializeRepository(string $className, int $storagePid)
-    {
+    protected function initializeRepository(string $className, int $storagePid) {
         $repository = GeneralUtility::makeInstance($className);
         $querySettings = GeneralUtility::makeInstance(Typo3QuerySettings::class);
         $querySettings->setStoragePageIds([$storagePid]);
@@ -192,8 +188,7 @@ 
         return $repository;
     }
 
-    protected function importSolrDocuments(Solr $solr, string $path)
-    {
+    protected function importSolrDocuments(Solr $solr, string $path) {
         $jsonDocuments = json_decode(file_get_contents($path), true);
 
         $updateQuery = $solr->service->createUpdate();
@@ -212,8 +207,7 @@ 
         $solr->service->update($updateQuery);
     }
 
-    protected function initLanguageService(string $locale)
-    {
+    protected function initLanguageService(string $locale) {
         // create mock backend user and set language
         // which is loaded by LanguageServiceFactory as default value in backend mode
         $backendUser = GeneralUtility::makeInstance(BackendUserAuthentication::class);
@@ -224,8 +218,7 @@ 
     /**
      * Assert that $sub is recursively contained within $super.
      */
-    protected function assertArrayMatches(array $sub, array $super, string $message = '')
-    {
+    protected function assertArrayMatches(array $sub, array $super, string $message = '') {
         self::assertEquals($sub, ArrayUtility::intersectRecursive($super, $sub), $message);
     }
 }

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

@@ -52,7 +52,7 @@ 
         ],
         'FE' => [
             'cacheHash' => [
-                'enforceValidation' => false,
+                'enforceValidation' => FALSE,
             ],
         ],
         'DB' => [
@@ -72,7 +72,7 @@ 
      *
      * @var bool
      */
-    protected $disableJsonWrappedResponse = false;
+    protected $disableJsonWrappedResponse = FALSE;
 
     /**
      * @var PersistenceManager
@@ -111,7 +111,7 @@ 
         $this->baseUrl = 'http://web:8000/public/typo3temp/var/tests/functional-' . $this->identifier . '/';
         $this->httpClient = new HttpClient([
             'base_uri' => $this->baseUrl . 'index.php',
-            'http_errors' => false,
+            'http_errors' => FALSE,
         ]);
 
         $this->addSiteConfig('dlf-testing');
@@ -174,12 +174,12 @@ 
         $siteConfig['languages'][0]['base'] = $this->baseUrl;
 
         $siteConfigPath = $this->instancePath . '/typo3conf/sites/' . $identifier;
-        @mkdir($siteConfigPath, 0775, true);
+        @mkdir($siteConfigPath, 0775, TRUE);
         file_put_contents($siteConfigPath . '/config.yaml', Yaml::dump($siteConfig));
 
         // refresh site cache (otherwise site config is not found)
         $finder = GeneralUtility::makeInstance(\TYPO3\CMS\Core\Site\SiteFinder::class);
-        $finder->getAllSites(false); // useCache = false
+        $finder->getAllSites(FALSE); // useCache = false
     }
 
     protected function initializeRepository(string $className, int $storagePid)
@@ -194,7 +194,7 @@ 
 
     protected function importSolrDocuments(Solr $solr, string $path)
     {
-        $jsonDocuments = json_decode(file_get_contents($path), true);
+        $jsonDocuments = json_decode(file_get_contents($path), TRUE);
 
         $updateQuery = $solr->service->createUpdate();
         $documents = array_map(function ($jsonDoc) use ($updateQuery) {

Configuration/TCA/Overrides/tt_content.php

Spacing +49 added lines, -49 removed lines

@@ -25,7 +25,7 @@ 
 \TYPO3\CMS\Extbase\Utility\ExtensionUtility::registerPlugin(
     'Dlf',
     'Annotation',
-    $pluginsLabel . 'annotation.title',
+    $pluginsLabel.'annotation.title',
 );
 
 // Plugin "audioplayer".
@@ -36,14 +36,14 @@ 
 
 \TYPO3\CMS\Core\Utility\ExtensionManagementUtility::addPiFlexFormValue(
     $plugin,
-    $flexFormsPathPrefix . 'AudioPlayer.xml'
+    $flexFormsPathPrefix.'AudioPlayer.xml'
 );
 
 \TYPO3\CMS\Extbase\Utility\ExtensionUtility::registerPlugin(
     'Dlf',
     'AudioPlayer',
-    $pluginsLabel . 'audioplayer.title',
-    $iconsDirectory . 'tx-dlf-audioplayer.svg'
+    $pluginsLabel.'audioplayer.title',
+    $iconsDirectory.'tx-dlf-audioplayer.svg'
 );
 
 // Plugin "basket".
@@ -54,14 +54,14 @@ 
 
 \TYPO3\CMS\Core\Utility\ExtensionManagementUtility::addPiFlexFormValue(
     $plugin,
-    $flexFormsPathPrefix . 'Basket.xml'
+    $flexFormsPathPrefix.'Basket.xml'
 );
 
 \TYPO3\CMS\Extbase\Utility\ExtensionUtility::registerPlugin(
     'Dlf',
     'Basket',
-    $pluginsLabel . 'basket.title',
-    $iconsDirectory . 'tx-dlf-basket.svg'
+    $pluginsLabel.'basket.title',
+    $iconsDirectory.'tx-dlf-basket.svg'
 );
 
 // Plugin "calendar".
@@ -72,14 +72,14 @@ 
 
 \TYPO3\CMS\Core\Utility\ExtensionManagementUtility::addPiFlexFormValue(
     $plugin,
-    $flexFormsPathPrefix . 'Calendar.xml'
+    $flexFormsPathPrefix.'Calendar.xml'
 );
 
 \TYPO3\CMS\Extbase\Utility\ExtensionUtility::registerPlugin(
     'Dlf',
     'Calendar',
-    $pluginsLabel . 'calendar.title',
-    $iconsDirectory . 'tx-dlf-calendar.svg'
+    $pluginsLabel.'calendar.title',
+    $iconsDirectory.'tx-dlf-calendar.svg'
 );
 
 // Plugin "collection".
@@ -90,14 +90,14 @@ 
 
 \TYPO3\CMS\Core\Utility\ExtensionManagementUtility::addPiFlexFormValue(
     $plugin,
-    $flexFormsPathPrefix . 'Collection.xml'
+    $flexFormsPathPrefix.'Collection.xml'
 );
 
 \TYPO3\CMS\Extbase\Utility\ExtensionUtility::registerPlugin(
     'Dlf',
     'Collection',
-    $pluginsLabel . 'collection.title',
-    $iconsDirectory . 'tx-dlf-collection.svg'
+    $pluginsLabel.'collection.title',
+    $iconsDirectory.'tx-dlf-collection.svg'
 );
 
 // Plugin "embedded3dviewer".
@@ -108,14 +108,14 @@ 
 
 \TYPO3\CMS\Core\Utility\ExtensionManagementUtility::addPiFlexFormValue(
     'dlf_embedded3dviewer',
-    $flexFormsPathPrefix . 'Embedded3dViewer.xml'
+    $flexFormsPathPrefix.'Embedded3dViewer.xml'
 );
 
 \TYPO3\CMS\Extbase\Utility\ExtensionUtility::registerPlugin(
     'Dlf',
     'Embedded3dViewer',
-    $pluginsLabel . 'embedded3dviewer.title',
-    $iconsDirectory . 'tx-dlf-embedded3dviewer.svg'
+    $pluginsLabel.'embedded3dviewer.title',
+    $iconsDirectory.'tx-dlf-embedded3dviewer.svg'
 );
 
 // Plugin "feeds".
@@ -126,14 +126,14 @@ 
 
 \TYPO3\CMS\Core\Utility\ExtensionManagementUtility::addPiFlexFormValue(
     $plugin,
-    $flexFormsPathPrefix . 'Feeds.xml'
+    $flexFormsPathPrefix.'Feeds.xml'
 );
 
 \TYPO3\CMS\Extbase\Utility\ExtensionUtility::registerPlugin(
     'Dlf',
     'Feeds',
-    $pluginsLabel . 'feeds.title',
-    $iconsDirectory . 'tx-dlf-feeds.svg'
+    $pluginsLabel.'feeds.title',
+    $iconsDirectory.'tx-dlf-feeds.svg'
 );
 
 // Plugin "listview".
@@ -144,14 +144,14 @@ 
 
 \TYPO3\CMS\Core\Utility\ExtensionManagementUtility::addPiFlexFormValue(
     $plugin,
-    $flexFormsPathPrefix . 'ListView.xml'
+    $flexFormsPathPrefix.'ListView.xml'
 );
 
 \TYPO3\CMS\Extbase\Utility\ExtensionUtility::registerPlugin(
     'Dlf',
     'ListView',
-    $pluginsLabel . 'listview.title',
-    $iconsDirectory . 'tx-dlf-listview.svg'
+    $pluginsLabel.'listview.title',
+    $iconsDirectory.'tx-dlf-listview.svg'
 );
 
 // Plugin "metadata".
@@ -161,14 +161,14 @@ 
 $GLOBALS['TCA']['tt_content']['types']['list']['subtypes_addlist'][$plugin] = $addList;
 \TYPO3\CMS\Core\Utility\ExtensionManagementUtility::addPiFlexFormValue(
     $plugin,
-    $flexFormsPathPrefix . 'Metadata.xml'
+    $flexFormsPathPrefix.'Metadata.xml'
 );
 
 \TYPO3\CMS\Extbase\Utility\ExtensionUtility::registerPlugin(
     'Dlf',
     'Metadata',
-    $pluginsLabel . 'metadata.title',
-    $iconsDirectory . 'tx-dlf-metadata.svg'
+    $pluginsLabel.'metadata.title',
+    $iconsDirectory.'tx-dlf-metadata.svg'
 );
 
 // Plugin "navigation".
@@ -179,14 +179,14 @@ 
 
 \TYPO3\CMS\Core\Utility\ExtensionManagementUtility::addPiFlexFormValue(
     $plugin,
-    $flexFormsPathPrefix . 'Navigation.xml'
+    $flexFormsPathPrefix.'Navigation.xml'
 );
 
 \TYPO3\CMS\Extbase\Utility\ExtensionUtility::registerPlugin(
     'Dlf',
     'Navigation',
-    $pluginsLabel . 'navigation.title',
-    $iconsDirectory . 'tx-dlf-navigation.svg'
+    $pluginsLabel.'navigation.title',
+    $iconsDirectory.'tx-dlf-navigation.svg'
 );
 
 // Plugin "oaipmh".
@@ -197,14 +197,14 @@ 
 
 \TYPO3\CMS\Core\Utility\ExtensionManagementUtility::addPiFlexFormValue(
     $plugin,
-    $flexFormsPathPrefix . 'OaiPmh.xml'
+    $flexFormsPathPrefix.'OaiPmh.xml'
 );
 
 \TYPO3\CMS\Extbase\Utility\ExtensionUtility::registerPlugin(
     'Dlf',
     'OaiPmh',
-    $pluginsLabel . 'oaipmh.title',
-    $iconsDirectory . 'tx-dlf-oaipmh.svg'
+    $pluginsLabel.'oaipmh.title',
+    $iconsDirectory.'tx-dlf-oaipmh.svg'
 );
 
 // Plugin "pagegrid".
@@ -214,14 +214,14 @@ 
 $GLOBALS['TCA']['tt_content']['types']['list']['subtypes_addlist'][$plugin] = $addList;
 \TYPO3\CMS\Core\Utility\ExtensionManagementUtility::addPiFlexFormValue(
     $plugin,
-    $flexFormsPathPrefix . 'PageGrid.xml'
+    $flexFormsPathPrefix.'PageGrid.xml'
 );
 
 \TYPO3\CMS\Extbase\Utility\ExtensionUtility::registerPlugin(
     'Dlf',
     'PageGrid',
-    $pluginsLabel . 'pagegrid.title',
-    $iconsDirectory . 'tx-dlf-pagegrid.svg'
+    $pluginsLabel.'pagegrid.title',
+    $iconsDirectory.'tx-dlf-pagegrid.svg'
 );
 
 // Plugin "pageview".
@@ -231,14 +231,14 @@ 
 $GLOBALS['TCA']['tt_content']['types']['list']['subtypes_addlist'][$plugin] = $addList;
 \TYPO3\CMS\Core\Utility\ExtensionManagementUtility::addPiFlexFormValue(
     $plugin,
-    $flexFormsPathPrefix . 'PageView.xml'
+    $flexFormsPathPrefix.'PageView.xml'
 );
 
 \TYPO3\CMS\Extbase\Utility\ExtensionUtility::registerPlugin(
     'Dlf',
     'PageView',
-    $pluginsLabel . 'plugins.pageview.title',
-    $iconsDirectory . 'tx-dlf-pageview.svg'
+    $pluginsLabel.'plugins.pageview.title',
+    $iconsDirectory.'tx-dlf-pageview.svg'
 );
 
 // Plugin "search".
@@ -249,14 +249,14 @@ 
 
 \TYPO3\CMS\Core\Utility\ExtensionManagementUtility::addPiFlexFormValue(
     $plugin,
-    $flexFormsPathPrefix . 'Search.xml'
+    $flexFormsPathPrefix.'Search.xml'
 );
 
 \TYPO3\CMS\Extbase\Utility\ExtensionUtility::registerPlugin(
     'Dlf',
     'Search',
-    $pluginsLabel . 'search.title',
-    $iconsDirectory . 'tx-dlf-search.svg'
+    $pluginsLabel.'search.title',
+    $iconsDirectory.'tx-dlf-search.svg'
 );
 
 // Plugin "statistics".
@@ -267,14 +267,14 @@ 
 
 \TYPO3\CMS\Core\Utility\ExtensionManagementUtility::addPiFlexFormValue(
     $plugin,
-    $flexFormsPathPrefix . 'Statistics.xml'
+    $flexFormsPathPrefix.'Statistics.xml'
 );
 
 \TYPO3\CMS\Extbase\Utility\ExtensionUtility::registerPlugin(
     'Dlf',
     'Statistics',
-    $pluginsLabel . 'statistics.title',
-    $iconsDirectory . 'tx-dlf-statistics.svg'
+    $pluginsLabel.'statistics.title',
+    $iconsDirectory.'tx-dlf-statistics.svg'
 );
 
 // Plugin "tableofcontents".
@@ -285,14 +285,14 @@ 
 
 \TYPO3\CMS\Core\Utility\ExtensionManagementUtility::addPiFlexFormValue(
     $plugin,
-    $flexFormsPathPrefix . 'TableOfContents.xml'
+    $flexFormsPathPrefix.'TableOfContents.xml'
 );
 
 \TYPO3\CMS\Extbase\Utility\ExtensionUtility::registerPlugin(
     'Dlf',
     'TableOfContents',
-    $pluginsLabel . 'tableofcontents.title',
-    $iconsDirectory . 'tx-dlf-tableofcontents.svg'
+    $pluginsLabel.'tableofcontents.title',
+    $iconsDirectory.'tx-dlf-tableofcontents.svg'
 );
 
 // Plugin "toolbox".
@@ -302,12 +302,12 @@ 
 $GLOBALS['TCA']['tt_content']['types']['list']['subtypes_addlist'][$plugin] = $addList;
 \TYPO3\CMS\Core\Utility\ExtensionManagementUtility::addPiFlexFormValue(
     $plugin,
-    $flexFormsPathPrefix . 'Toolbox.xml'
+    $flexFormsPathPrefix.'Toolbox.xml'
 );
 
 \TYPO3\CMS\Extbase\Utility\ExtensionUtility::registerPlugin(
     'Dlf',
     'Toolbox',
-    $pluginsLabel . 'toolbox.title',
-    $iconsDirectory . 'tx-dlf-toolbox.svg'
+    $pluginsLabel.'toolbox.title',
+    $iconsDirectory.'tx-dlf-toolbox.svg'
 );

Classes/Updates/UpdateSolrSchema.php

Braces +1 added lines, -2 removed lines

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

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

@@ -97,9 +97,9 @@ 
                             'replace-field' => [
                                 'name' => 'autocomplete',
                                 'type' => 'autocomplete',
-                                'indexed' => true,
-                                'stored' => true,
-                                'multiValued' => true,
+                                'indexed' => TRUE,
+                                'stored' => TRUE,
+                                'multiValued' => TRUE,
                             ],
                         ]
                     ),
@@ -108,10 +108,10 @@ 
             $result = $solr->service->execute($query);
 
             if ($result->getResponse()->getStatusCode() == 400) {
-                return false;
+                return FALSE;
             }
         }
-        return true;
+        return TRUE;
     }
 
     /**
@@ -126,9 +126,9 @@ 
     public function updateNecessary(): bool
     {
         if (count($this->getAllAffectedSolrCores())) {
-            return true;
+            return TRUE;
         }
-        return false;
+        return FALSE;
     }
 
     /**
@@ -194,7 +194,7 @@ 
             );
             $result = $solr->service->execute($query)->getData();
 
-            if (!isset($result['field']['stored']) || $result['field']['stored'] === true) {
+            if (!isset($result['field']['stored']) || $result['field']['stored'] === TRUE) {
                 continue;
             }