Erikmitk / kitodo-presentation

Classes/Domain/Repository/CollectionRepository.php

Spacing +1 added lines, -1 removed lines

@@ -98,7 +98,7 @@
 
         // order by oai_name
         $query->setOrderings(
-            array('oai_name' => QueryInterface::ORDER_ASCENDING)
+            array ('oai_name' => QueryInterface::ORDER_ASCENDING)
         );
 
         return $query->execute();

Braces +1 added lines, -2 removed lines

@@ -28,8 +28,7 @@
  *
  * @access public
  */
-class CollectionRepository extends Repository
-{
+class CollectionRepository extends Repository {
     /**
      * @access protected
      * @var array Set the default ordering. This is applied to findAll(), too.

Classes/Updates/MigrateSettings.php

Spacing +3 added lines, -3 removed lines

@@ -54,8 +54,8 @@ 
      */
     public function getDescription(): string
     {
-        return 'This wizard migrates existing front end plugins of the extension Kitodo.Presentation (dlf) to' .
-            ' make use of the Extbase naming scheme. Therefore it updates the field values' .
+        return 'This wizard migrates existing front end plugins of the extension Kitodo.Presentation (dlf) to'.
+            ' make use of the Extbase naming scheme. Therefore it updates the field values'.
             ' "pi_flexform" within the tt_content table';
     }
 
@@ -170,7 +170,7 @@ 
         foreach ($fields as $field) {
             // change the index attribute if it doesn't start with 'settings.' yet
             if (strpos($field['index'], 'settings.') === false) {
-                $field['index'] = 'settings.' . $field['index'];
+                $field['index'] = 'settings.'.$field['index'];
             }
         }
 

Braces +1 added lines, -2 removed lines

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

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

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

Tests/routeFunctionalInstance.php

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

@@ -16,10 +16,10 @@
 
 if (!empty($matches)) {
     $root = realpath($_SERVER['DOCUMENT_ROOT'] . $matches[0]);
-    if ($root !== false) {
+    if ($root !== FALSE) {
         putenv('TYPO3_PATH_ROOT=' . $root);
         putenv('TYPO3_PATH_APP=' . $root);
     }
 }
 
-return false;
+return FALSE;

Spacing +3 added lines, -3 removed lines

@@ -15,10 +15,10 @@
 preg_match("@.*/(?:acceptance|functional-[a-z\d]+)@", $_SERVER['REQUEST_URI'], $matches);
 
 if (!empty($matches)) {
-    $root = realpath($_SERVER['DOCUMENT_ROOT'] . $matches[0]);
+    $root = realpath($_SERVER['DOCUMENT_ROOT'].$matches[0]);
     if ($root !== false) {
-        putenv('TYPO3_PATH_ROOT=' . $root);
-        putenv('TYPO3_PATH_APP=' . $root);
+        putenv('TYPO3_PATH_ROOT='.$root);
+        putenv('TYPO3_PATH_APP='.$root);
     }
 }
 

Tests/Functional/Api/PageViewProxyDisabledTest.php

Braces +2 added lines, -4 removed lines

@@ -5,12 +5,10 @@
 use Kitodo\Dlf\Tests\Functional\FunctionalTestCase;
 use TYPO3\CMS\Core\Utility\GeneralUtility;
 
-class PageViewProxyDisabledTest extends FunctionalTestCase
-{
+class PageViewProxyDisabledTest extends FunctionalTestCase {
     protected $disableJsonWrappedResponse = true;
 
-    protected function queryProxy(array $query, string $method = 'GET')
-    {
+    protected function queryProxy(array $query, string $method = 'GET') {
         $query['eID'] = 'tx_dlf_pageview_proxy';
 
         return $this->httpClient->request($method, '', [

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

@@ -7,7 +7,7 @@
 
 class PageViewProxyDisabledTest extends FunctionalTestCase
 {
-    protected $disableJsonWrappedResponse = true;
+    protected $disableJsonWrappedResponse = TRUE;
 
     protected function queryProxy(array $query, string $method = 'GET')
     {

Tests/Functional/Repository/DocumentRepositoryTest.php

Braces +1 added lines, -2 removed lines

@@ -8,8 +8,7 @@
 use Kitodo\Dlf\Tests\Functional\FunctionalTestCase;
 use TYPO3\CMS\Extbase\Persistence\Generic\LazyObjectStorage;
 
-class DocumentRepositoryTest extends FunctionalTestCase
-{
+class DocumentRepositoryTest extends FunctionalTestCase {
     /**
      * @var DocumentRepository
      */

Spacing +3 added lines, -3 removed lines

@@ -31,9 +31,9 @@
 
         $this->documentRepository = $this->initializeRepository(DocumentRepository::class, 20000);
 
-        $this->importCSVDataSet(__DIR__ . '/../../Fixtures/Common/documents_1.csv');
-        $this->importDataSet(__DIR__ . '/../../Fixtures/Common/pages.xml');
-        $this->importCSVDataSet(__DIR__ . '/../../Fixtures/Common/libraries.csv');
+        $this->importCSVDataSet(__DIR__.'/../../Fixtures/Common/documents_1.csv');
+        $this->importDataSet(__DIR__.'/../../Fixtures/Common/pages.xml');
+        $this->importCSVDataSet(__DIR__.'/../../Fixtures/Common/libraries.csv');
     }
 
     /**

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 +8 added lines, -16 removed lines

@@ -32,8 +32,7 @@ 
  * @subpackage dlf
  * @access public
  */
-class Generator
-{
+class Generator {
     /**
      * @var LanguageService
      */
@@ -57,37 +56,32 @@ 
     /**
      * @param LanguageService $languageService
      */
-    public function injectLanguageService(LanguageService $languageService)
-    {
+    public function injectLanguageService(LanguageService $languageService) {
         $this->languageService = $languageService;
     }
 
     /**
      * @param DataMapper $dataMapper
      */
-    public function injectDataMapper(DataMapper $dataMapper)
-    {
+    public function injectDataMapper(DataMapper $dataMapper) {
         $this->dataMapper = $dataMapper;
     }
 
     /**
      * @param SqlReader $sqlReader
      */
-    public function injectSqlReader(DataMapper $sqlReader)
-    {
+    public function injectSqlReader(DataMapper $sqlReader) {
         $this->sqlReader = $sqlReader;
     }
 
     /**
      * @param ConfigurationManager $configurationManager
      */
-    public function injectConfigurationManager(ConfigurationManager $configurationManager)
-    {
+    public function injectConfigurationManager(ConfigurationManager $configurationManager) {
         $this->configurationManager = $configurationManager;
     }
 
-    public function __construct()
-    {
+    public function __construct() {
 
     }
 
@@ -205,8 +199,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
@@ -231,8 +224,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

@@ -97,7 +97,7 @@ 
      */
     public function collectTables(): array
     {
-        $sqlCode = $this->sqlReader->getTablesDefinitionString(true);
+        $sqlCode = $this->sqlReader->getTablesDefinitionString(TRUE);
         $createTableStatements = $this->sqlReader->getCreateTableStatementArray($sqlCode);
 
         $tableToClassName = $this->getTableClassMap();
@@ -113,7 +113,7 @@ 
                 continue;
             }
 
-            $className = $tableToClassName[$tableName] ?? null;
+            $className = $tableToClassName[$tableName] ?? NULL;
 
             $result[] = $this->getTableInfo($table, $className);
         }
@@ -151,7 +151,7 @@ 
         $isPrimary = [];
         if (!is_null($primaryKey = $table->getPrimaryKey())) {
             foreach ($primaryKey->getUnquotedColumns() as $primaryColumn) {
-                $isPrimary[$primaryColumn] = true;
+                $isPrimary[$primaryColumn] = TRUE;
             }
         }
 
@@ -172,14 +172,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);
@@ -189,7 +189,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();
 
@@ -215,7 +215,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;
             }
 
@@ -239,7 +239,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) {
@@ -274,11 +274,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/Eid/PageViewProxy.php

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);

Braces +2 added lines, -4 removed lines

@@ -34,8 +34,7 @@ 
  *
  * @access public
  */
-class PageViewProxy
-{
+class PageViewProxy {
     /**
      * @access protected
      * @var RequestFactory
@@ -55,8 +54,7 @@ 
      *
      * @return void
      */
-    public function __construct()
-    {
+    public function __construct() {
         $this->requestFactory = GeneralUtility::makeInstance(RequestFactory::class);
         $this->extConf = GeneralUtility::makeInstance(ExtensionConfiguration::class)->get('dlf', 'general');
     }

Classes/Controller/StatisticsController.php

Spacing +2 added lines, -2 removed lines

@@ -33,13 +33,13 @@
         $foundNumbers = $this->documentRepository->getStatisticsForSelectedCollection($this->settings);
 
         // Set replacements.
-        $args['###TITLES###'] = $foundNumbers['titles'] . ' ' . htmlspecialchars(
+        $args['###TITLES###'] = $foundNumbers['titles'].' '.htmlspecialchars(
             LocalizationUtility::translate(
                 ($foundNumbers['titles'] > 1 ? 'titles' : 'title'), 'dlf'
             )
         );
 
-        $args['###VOLUMES###'] = $foundNumbers['volumes'] . ' ' . htmlspecialchars(
+        $args['###VOLUMES###'] = $foundNumbers['volumes'].' '.htmlspecialchars(
             LocalizationUtility::translate(
                 ($foundNumbers['volumes'] > 1 ? 'volumes' : 'volume'), 'dlf'
             )

Braces +1 added lines, -2 removed lines

@@ -21,8 +21,7 @@
  *
  * @access public
  */
-class StatisticsController extends AbstractController
-{
+class StatisticsController extends AbstractController {
     /**
      * The main method of the plugin
      *

Tests/Functional/Api/OaiPmhTest.php

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

@@ -14,7 +14,7 @@ 
 
 class OaiPmhTest extends FunctionalTestCase
 {
-    protected $disableJsonWrappedResponse = true;
+    protected $disableJsonWrappedResponse = TRUE;
 
     protected $coreExtensionsToLoad = [
         'fluid',
@@ -56,9 +56,9 @@ 
     protected function setUpOaiSolr()
     {
         // Setup Solr only once for all tests in this suite
-        static $solr = null;
+        static $solr = NULL;
 
-        if ($solr === null) {
+        if ($solr === NULL) {
             $coreName = Solr::createCore();
             $solr = Solr::getInstance($coreName);
 
@@ -161,7 +161,7 @@ 
         $this->expectExceptionMessage('empty list');
 
         $oai = Endpoint::build($this->oaiUrl);
-        $result = $oai->listRecords('mets', null, (new DateTime())->setDate(1900, 1, 1));
+        $result = $oai->listRecords('mets', NULL, (new DateTime())->setDate(1900, 1, 1));
 
         $result->current();
     }

Spacing +9 added lines, -9 removed lines

@@ -51,15 +51,15 @@ 
     {
         parent::setUp();
 
-        $this->oaiUrl = $this->baseUrl . 'index.php?id=' . $this->oaiPage;
-        $this->oaiUrlNoStoragePid = $this->baseUrl . 'index.php?id=' . $this->oaiPageNoStoragePid;
+        $this->oaiUrl = $this->baseUrl.'index.php?id='.$this->oaiPage;
+        $this->oaiUrlNoStoragePid = $this->baseUrl.'index.php?id='.$this->oaiPageNoStoragePid;
 
-        $this->importCSVDataSet(__DIR__ . '/../../Fixtures/Common/documents_1.csv');
-        $this->importCSVDataSet(__DIR__ . '/../../Fixtures/Common/metadata.csv');
-        $this->importCSVDataSet(__DIR__ . '/../../Fixtures/Common/libraries.csv');
-        $this->importCSVDataSet(__DIR__ . '/../../Fixtures/Common/pages.csv');
-        $this->importDataSet(__DIR__ . '/../../Fixtures/OaiPmh/pages.xml');
-        $this->importCSVDataSet(__DIR__ . '/../../Fixtures/OaiPmh/solrcores.csv');
+        $this->importCSVDataSet(__DIR__.'/../../Fixtures/Common/documents_1.csv');
+        $this->importCSVDataSet(__DIR__.'/../../Fixtures/Common/metadata.csv');
+        $this->importCSVDataSet(__DIR__.'/../../Fixtures/Common/libraries.csv');
+        $this->importCSVDataSet(__DIR__.'/../../Fixtures/Common/pages.csv');
+        $this->importDataSet(__DIR__.'/../../Fixtures/OaiPmh/pages.xml');
+        $this->importCSVDataSet(__DIR__.'/../../Fixtures/OaiPmh/solrcores.csv');
 
         $this->solrCoreRepository = $this->initializeRepository(SolrCoreRepository::class, 20000);
 
@@ -75,7 +75,7 @@ 
             $coreName = Solr::createCore();
             $solr = Solr::getInstance($coreName);
 
-            $this->importSolrDocuments($solr, __DIR__ . '/../../Fixtures/Common/documents_1.solr.json');
+            $this->importSolrDocuments($solr, __DIR__.'/../../Fixtures/Common/documents_1.solr.json');
         }
 
         $oaiCoreModel = $this->solrCoreRepository->findByUid(11001);

Braces +14 added lines, -28 removed lines

@@ -21,8 +21,7 @@ 
 use Phpoaipmh\Exception\OaipmhException;
 use SimpleXMLElement;
 
-class OaiPmhTest extends FunctionalTestCase
-{
+class OaiPmhTest extends FunctionalTestCase {
     protected $disableJsonWrappedResponse = true;
 
     protected $coreExtensionsToLoad = [
@@ -66,8 +65,7 @@ 
         $this->setUpOaiSolr();
     }
 
-    protected function setUpOaiSolr()
-    {
+    protected function setUpOaiSolr() {
         // Setup Solr only once for all tests in this suite
         static $solr = null;
 
@@ -87,8 +85,7 @@ 
     /**
      * @test
      */
-    public function correctlyRespondsOnBadVerb()
-    {
+    public function correctlyRespondsOnBadVerb() {
         $client = new HttpClient();
         $response = $client->get($this->baseUrl, [
             'query' => [
@@ -113,8 +110,7 @@ 
     /**
      * @test
      */
-    public function canIdentify()
-    {
+    public function canIdentify() {
         $oai = Endpoint::build($this->oaiUrl);
         $identity = $oai->identify();
 
@@ -127,8 +123,7 @@ 
     /**
      * @test
      */
-    public function identifyGivesFallbackDatestampWhenNoDocuments()
-    {
+    public function identifyGivesFallbackDatestampWhenNoDocuments() {
         $oai = Endpoint::build($this->oaiUrlNoStoragePid);
         $identity = $oai->identify();
 
@@ -138,8 +133,7 @@ 
     /**
      * @test
      */
-    public function canListMetadataFormats()
-    {
+    public function canListMetadataFormats() {
         $oai = Endpoint::build($this->oaiUrl);
         $formats = $oai->listMetadataFormats();
 
@@ -154,8 +148,7 @@ 
     /**
      * @test
      */
-    public function canListRecords()
-    {
+    public function canListRecords() {
         $oai = Endpoint::build($this->oaiUrl);
         $result = $oai->listRecords('mets');
 
@@ -168,8 +161,7 @@ 
     /**
      * @test
      */
-    public function noRecordsUntil1900()
-    {
+    public function noRecordsUntil1900() {
         $this->expectException(OaipmhException::class);
         $this->expectExceptionMessage('empty list');
 
@@ -182,8 +174,7 @@ 
     /**
      * @test
      */
-    public function canUseResumptionToken()
-    {
+    public function canUseResumptionToken() {
         // NOTE: cursor and expirationDate are optional by the specification,
         //       but we include them in our implementation
 
@@ -241,8 +232,7 @@ 
     /**
      * @test
      */
-    public function noResumptionTokenForCompleteList()
-    {
+    public function noResumptionTokenForCompleteList() {
         $client = new HttpClient();
 
         foreach (['ListIdentifiers', 'ListRecords'] as $verb) {
@@ -264,8 +254,7 @@ 
     /**
      * @test
      */
-    public function canListAndResumeIdentifiers()
-    {
+    public function canListAndResumeIdentifiers() {
         $oai = Endpoint::build($this->oaiUrl);
         $result = $oai->listIdentifiers('mets');
 
@@ -278,18 +267,15 @@ 
         self::assertEquals('oai:de:slub-dresden:db:id-476248086', $record->identifier);
     }
 
-    protected function parseUtc(string $dateTime)
-    {
+    protected function parseUtc(string $dateTime) {
         return DateTime::createFromFormat('Y-m-d\TH:i:s\Z', $dateTime);
     }
 
-    protected function assertUtcDateString(string $dateTime)
-    {
+    protected function assertUtcDateString(string $dateTime) {
         self::assertInstanceOf(DateTime::class, $this->parseUtc($dateTime));
     }
 
-    protected function assertInFuture(string $dateTime)
-    {
+    protected function assertInFuture(string $dateTime) {
         self::assertGreaterThan(new DateTime(), $this->parseUtc($dateTime));
     }
 }