Erikmitk / kitodo-presentation

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
      *

Classes/Controller/AudioPlayerController.php

Spacing +4 added lines, -4 removed lines

@@ -52,12 +52,12 @@
             $(document).ready(function() {
                 AudioPlayer = new dlfAudioPlayer({
                     audio: {
-                        mimeType: "' . $this->audio['mimetype'] . '",
-                        title: "' . $this->audio['label'] . '",
-                        url:  "' . $this->audio['url'] . '"
+                        mimeType: "' . $this->audio['mimetype'].'",
+                        title: "' . $this->audio['label'].'",
+                        url:  "' . $this->audio['url'].'"
                     },
                     parentElId: "tx-dlf-audio",
-                    swfPath: "' . PathUtility::stripPathSitePrefix(ExtensionManagementUtility::extPath('dlf')) . 'Resources/Public/JavaScript/jPlayer/jquery.jplayer.swf"
+                    swfPath: "' . PathUtility::stripPathSitePrefix(ExtensionManagementUtility::extPath('dlf')).'Resources/Public/JavaScript/jPlayer/jquery.jplayer.swf"
                 });
             });
         ';

Braces +1 added lines, -2 removed lines

@@ -24,8 +24,7 @@
  *
  * @access public
  */
-class AudioplayerController extends AbstractController
-{
+class AudioplayerController extends AbstractController {
     /**
      * Holds the current audio file's URL, MIME type and optional label
      *

Classes/Api/Orcid/Profile.php

Spacing +1 added lines, -1 removed lines

@@ -129,7 +129,7 @@
             $this->raw->registerXPathNamespace('personal-details', 'http://www.orcid.org/ns/personal-details');
             $givenNames = $this->raw->xpath('./personal-details:name/personal-details:given-names');
             $familyName = $this->raw->xpath('./personal-details:name/personal-details:family-name');
-            return (string) $givenNames[0] . ' ' . (string) $familyName[0];
+            return (string) $givenNames[0].' '.(string) $familyName[0];
         } else {
             $this->logger->warning('No name found for given ORCID');
             return false;

Braces +6 added lines, -12 removed lines

@@ -26,8 +26,7 @@ 
  *
  * @access public
  **/
-class Profile
-{
+class Profile {
     /**
      * @access protected
      * @var Logger This holds the logger
@@ -55,8 +54,7 @@ 
      *
      * @return void
      **/
-    public function __construct(string $orcid)
-    {
+    public function __construct(string $orcid) {
         $this->logger = GeneralUtility::makeInstance(LogManager::class)->getLogger(static::class);
         $this->client = new Client($orcid, GeneralUtility::makeInstance(RequestFactory::class));
     }
@@ -68,8 +66,7 @@ 
      *
      * @return array|false
      **/
-    public function getData()
-    {
+    public function getData() {
         $this->getRaw('person');
         if ($this->raw !== false && !empty($this->raw)) {
             $data = [];
@@ -90,8 +87,7 @@ 
      *
      * @return string|false
      **/
-    public function getAddress()
-    {
+    public function getAddress() {
         $this->getRaw('address');
         if ($this->raw !== false && !empty($this->raw)) {
             $this->raw->registerXPathNamespace('address', 'http://www.orcid.org/ns/address');
@@ -109,8 +105,7 @@ 
      *
      * @return string|false
      **/
-    public function getEmail()
-    {
+    public function getEmail() {
         $this->getRaw('email');
         if ($this->raw !== false && !empty($this->raw)) {
             $this->raw->registerXPathNamespace('email', 'http://www.orcid.org/ns/email');
@@ -128,8 +123,7 @@ 
      *
      * @return string|false
      **/
-    public function getFullName()
-    {
+    public function getFullName() {
         $this->getRaw('personal-details');
         if ($this->raw !== false && !empty($this->raw)) {
             $this->raw->registerXPathNamespace('personal-details', 'http://www.orcid.org/ns/personal-details');

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

@@ -44,7 +44,7 @@ 
      * @access private
      * @var \SimpleXmlElement|false The raw ORCID profile
      **/
-    private $raw = false;
+    private $raw = FALSE;
 
     /**
      * Constructs client instance
@@ -71,7 +71,7 @@ 
     public function getData()
     {
         $this->getRaw('person');
-        if ($this->raw !== false && !empty($this->raw)) {
+        if ($this->raw !== FALSE && !empty($this->raw)) {
             $data = [];
             $data['address'] = $this->getAddress();
             $data['email'] = $this->getEmail();
@@ -79,7 +79,7 @@ 
             return $data;
         } else {
             $this->logger->warning('No data found for given ORCID');
-            return false;
+            return FALSE;
         }
     }
 
@@ -93,12 +93,12 @@ 
     public function getAddress()
     {
         $this->getRaw('address');
-        if ($this->raw !== false && !empty($this->raw)) {
+        if ($this->raw !== FALSE && !empty($this->raw)) {
             $this->raw->registerXPathNamespace('address', 'http://www.orcid.org/ns/address');
             return (string) $this->raw->xpath('./address:address/address:country')[0];
         } else {
             $this->logger->warning('No address found for given ORCID');
-            return false;
+            return FALSE;
         }
     }
 
@@ -112,12 +112,12 @@ 
     public function getEmail()
     {
         $this->getRaw('email');
-        if ($this->raw !== false && !empty($this->raw)) {
+        if ($this->raw !== FALSE && !empty($this->raw)) {
             $this->raw->registerXPathNamespace('email', 'http://www.orcid.org/ns/email');
             return (string) $this->raw->xpath('./email:email/email:email')[0];
         } else {
             $this->logger->warning('No email found for given ORCID');
-            return false;
+            return FALSE;
         }
     }
 
@@ -131,14 +131,14 @@ 
     public function getFullName()
     {
         $this->getRaw('personal-details');
-        if ($this->raw !== false && !empty($this->raw)) {
+        if ($this->raw !== FALSE && !empty($this->raw)) {
             $this->raw->registerXPathNamespace('personal-details', 'http://www.orcid.org/ns/personal-details');
             $givenNames = $this->raw->xpath('./personal-details:name/personal-details:given-names');
             $familyName = $this->raw->xpath('./personal-details:name/personal-details:family-name');
             return (string) $givenNames[0] . ' ' . (string) $familyName[0];
         } else {
             $this->logger->warning('No name found for given ORCID');
-            return false;
+            return FALSE;
         }
     }
 
@@ -155,7 +155,7 @@ 
     {
         $this->client->setEndpoint($endpoint);
         $data = $this->client->getData();
-        if ($data != false) {
+        if ($data != FALSE) {
             $this->raw = Helper::getXmlFileAsString($data);
         }
     }