Erikmitk / kitodo-presentation

Classes/Controller/PageViewController.php

Braces +6 added lines, -12 removed lines

@@ -26,8 +26,7 @@ 
  * @subpackage dlf
  * @access public
  */
-class PageViewController extends AbstractController
-{
+class PageViewController extends AbstractController {
     /**
      * Holds the controls to add to the map
      *
@@ -65,8 +64,7 @@ 
      *
      * @return void
      */
-    public function mainAction()
-    {
+    public function mainAction() {
         // Load current document.
         $this->loadDocument($this->requestData);
         if (
@@ -121,8 +119,7 @@ 
      *
      * @return array URL and MIME type of fulltext file
      */
-    protected function getFulltext($page)
-    {
+    protected function getFulltext($page) {
         $fulltext = [];
         // Get fulltext link.
         $fileGrpsFulltext = GeneralUtility::trimExplode(',', $this->extConf['fileGrpFulltext']);
@@ -162,8 +159,7 @@ 
      *
      * @return void
      */
-    protected function addViewerJS()
-    {
+    protected function addViewerJS() {
         // Viewer configuration.
         $viewerConfiguration = '$(document).ready(function() {
                 if (dlfUtils.exists(dlfViewer)) {
@@ -189,8 +185,7 @@ 
      * @return array An array containing the IRIs of the AnnotationLists / AnnotationPages as well as
      *               some information about the canvas.
      */
-    protected function getAnnotationContainers($page)
-    {
+    protected function getAnnotationContainers($page) {
         if ($this->document->getDoc() instanceof IiifManifest) {
             $canvasId = $this->document->getDoc()->physicalStructure[$page];
             $iiif = $this->document->getDoc()->getIiif();
@@ -246,8 +241,7 @@ 
      *
      * @return array URL and MIME type of image file
      */
-    protected function getImage($page)
-    {
+    protected function getImage($page) {
         $image = [];
         // Get @USE value of METS fileGrp.
         $fileGrpsImages = GeneralUtility::trimExplode(',', $this->extConf['fileGrpImages']);

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

@@ -70,7 +70,7 @@ 
         // Load current document.
         $this->loadDocument($this->requestData);
         if (
-            $this->document === null
+            $this->document === NULL
             || $this->document->getDoc()->numPages < 1
         ) {
             // Quit without doing anything if required variables are not set.
@@ -133,7 +133,7 @@ 
                     // Configure @action URL for form.
                     $uri = $this->uriBuilder->reset()
                         ->setTargetPageUid($GLOBALS['TSFE']->id)
-                        ->setCreateAbsoluteUri(!empty($this->settings['forceAbsoluteUrl']) ? true : false)
+                        ->setCreateAbsoluteUri(!empty($this->settings['forceAbsoluteUrl']) ? TRUE : FALSE)
                         ->setArguments([
                             'eID' => 'tx_dlf_pageview_proxy',
                             'url' => $fulltext['url'],
@@ -197,7 +197,7 @@ 
             if ($iiif instanceof ManifestInterface) {
                 $canvas = $iiif->getContainedResourceById($canvasId);
                 /* @var $canvas \Ubl\Iiif\Presentation\Common\Model\Resources\CanvasInterface */
-                if ($canvas != null && !empty($canvas->getPossibleTextAnnotationContainers(Motivation::PAINTING))) {
+                if ($canvas != NULL && !empty($canvas->getPossibleTextAnnotationContainers(Motivation::PAINTING))) {
                     $annotationContainers = [];
                     /*
                      *  TODO Analyzing the annotations on the server side requires loading the annotation lists / pages
@@ -207,11 +207,11 @@ 
                      *  On the other hand, server connections are potentially better than client connections. Downloading annotation lists
                      */
                     foreach ($canvas->getPossibleTextAnnotationContainers(Motivation::PAINTING) as $annotationContainer) {
-                        if (($textAnnotations = $annotationContainer->getTextAnnotations(Motivation::PAINTING)) != null) {
+                        if (($textAnnotations = $annotationContainer->getTextAnnotations(Motivation::PAINTING)) != NULL) {
                             foreach ($textAnnotations as $annotation) {
                                 if (
                                     $annotation->getBody()->getFormat() == 'text/plain'
-                                    && $annotation->getBody()->getChars() != null
+                                    && $annotation->getBody()->getChars() != NULL
                                 ) {
                                     $annotationListData = [];
                                     $annotationListData['uri'] = $annotationContainer->getId();
@@ -259,7 +259,7 @@ 
                     // Configure @action URL for form.
                     $uri = $this->uriBuilder->reset()
                         ->setTargetPageUid($GLOBALS['TSFE']->id)
-                        ->setCreateAbsoluteUri(!empty($this->settings['forceAbsoluteUrl']) ? true : false)
+                        ->setCreateAbsoluteUri(!empty($this->settings['forceAbsoluteUrl']) ? TRUE : FALSE)
                         ->setArguments([
                             'eID' => 'tx_dlf_pageview_proxy',
                             'url' => $image['url'],

Spacing +11 added lines, -11 removed lines

@@ -146,11 +146,11 @@ 
                 $fulltext['mimetype'] = $this->document->getDoc()->getFileMimeType($this->document->getDoc()->physicalStructureInfo[$this->document->getDoc()->physicalStructure[$page]]['files'][$fileGrpFulltext]);
                 break;
             } else {
-                $this->logger->notice('No full-text file found for page "' . $page . '" in fileGrp "' . $fileGrpFulltext . '"');
+                $this->logger->notice('No full-text file found for page "'.$page.'" in fileGrp "'.$fileGrpFulltext.'"');
             }
         }
         if (empty($fulltext)) {
-            $this->logger->notice('No full-text file found for page "' . $page . '" in fileGrps "' . $this->extConf['fileGrpFulltext'] . '"');
+            $this->logger->notice('No full-text file found for page "'.$page.'" in fileGrps "'.$this->extConf['fileGrpFulltext'].'"');
         }
         return $fulltext;
     }
@@ -168,13 +168,13 @@ 
         $viewerConfiguration = '$(document).ready(function() {
                 if (dlfUtils.exists(dlfViewer)) {
                     tx_dlf_viewer = new dlfViewer({
-                        controls: ["' . implode('", "', $this->controls) . '"],
-                        div: "' . $this->settings['elementId'] . '",
-                        progressElementId: "' . $this->settings['progressElementId'] . '",
-                        images: ' . json_encode($this->images) . ',
-                        fulltexts: ' . json_encode($this->fulltexts) . ',
-                        annotationContainers: ' . json_encode($this->annotationContainers) . ',
-                        useInternalProxy: ' . ($this->settings['useInternalProxy'] ? 1 : 0) . '
+                        controls: ["' . implode('", "', $this->controls).'"],
+                        div: "' . $this->settings['elementId'].'",
+                        progressElementId: "' . $this->settings['progressElementId'].'",
+                        images: ' . json_encode($this->images).',
+                        fulltexts: ' . json_encode($this->fulltexts).',
+                        annotationContainers: ' . json_encode($this->annotationContainers).',
+                        useInternalProxy: ' . ($this->settings['useInternalProxy'] ? 1 : 0).'
                     });
                 }
             });';
@@ -275,11 +275,11 @@ 
                 }
                 break;
             } else {
-                $this->logger->notice('No image file found for page "' . $page . '" in fileGrp "' . $fileGrpImages . '"');
+                $this->logger->notice('No image file found for page "'.$page.'" in fileGrp "'.$fileGrpImages.'"');
             }
         }
         if (empty($image)) {
-            $this->logger->warning('No image file found for page "' . $page . '" in fileGrps "' . $this->extConf['fileGrpImages'] . '"');
+            $this->logger->warning('No image file found for page "'.$page.'" in fileGrps "'.$this->extConf['fileGrpImages'].'"');
         }
         return $image;
     }

Tests/Unit/Common/HelperTest.php

Braces +2 added lines, -4 removed lines

@@ -5,10 +5,8 @@
 use Kitodo\Dlf\Common\Helper;
 use TYPO3\TestingFramework\Core\Unit\UnitTestCase;
 
-class HelperTest extends UnitTestCase
-{
-    public function assertInvalidXml($xml)
-    {
+class HelperTest extends UnitTestCase {
+    public function assertInvalidXml($xml) {
         $result = Helper::getXmlFileAsString($xml);
         $this->assertEquals(false, $result);
     }

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

@@ -10,7 +10,7 @@ 
     public function assertInvalidXml($xml)
     {
         $result = Helper::getXmlFileAsString($xml);
-        $this->assertEquals(false, $result);
+        $this->assertEquals(FALSE, $result);
     }
 
     /**
@@ -19,8 +19,8 @@ 
      */
     public function invalidXmlYieldsFalse(): void
     {
-        $this->assertInvalidXml(false);
-        $this->assertInvalidXml(null);
+        $this->assertInvalidXml(FALSE);
+        $this->assertInvalidXml(NULL);
         $this->assertInvalidXml(1);
         $this->assertInvalidXml([]);
         $this->assertInvalidXml(new \stdClass());
@@ -40,7 +40,7 @@ 
 <root>
     <single />
 </root>
-XML;
+xml;
         $node = Helper::getXmlFileAsString($xml);
         $this->assertIsObject($node);
         $this->assertEquals('root', $node->getName());

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/PageViewProxyTest.php

Spacing +1 added lines, -1 removed lines

@@ -77,7 +77,7 @@
         ]);
 
         $this->assertEquals(200, $response->getStatusCode());
-        $this->assertEquals('This is some plain text test file.' . "\n", (string) $response->getBody());
+        $this->assertEquals('This is some plain text test file.'."\n", (string) $response->getBody());
     }
 
     /**

Braces +3 added lines, -6 removed lines

@@ -6,19 +6,16 @@
 use Kitodo\Dlf\Tests\Functional\FunctionalTestCase;
 use TYPO3\CMS\Core\Utility\GeneralUtility;
 
-class PageViewProxyTest extends FunctionalTestCase
-{
+class PageViewProxyTest extends FunctionalTestCase {
     protected $disableJsonWrappedResponse = true;
 
-    protected function getDlfConfiguration()
-    {
+    protected function getDlfConfiguration() {
         return array_merge(parent::getDlfConfiguration(), [
             'enableInternalProxy' => 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 +2 added lines, -2 removed lines

@@ -8,12 +8,12 @@
 
 class PageViewProxyTest extends FunctionalTestCase
 {
-    protected $disableJsonWrappedResponse = true;
+    protected $disableJsonWrappedResponse = TRUE;
 
     protected function getDlfConfiguration()
     {
         return array_merge(parent::getDlfConfiguration(), [
-            'enableInternalProxy' => true,
+            'enableInternalProxy' => TRUE,
         ]);
     }
 

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

Spacing +3 added lines, -3 removed lines

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

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
      */

Build/Documentation/dbdocs/Generator.php

Spacing +5 added lines, -5 removed lines

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

Braces +4 added lines, -8 removed lines

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

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

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

Classes/Domain/Repository/TokenRepository.php

Braces +1 added lines, -2 removed lines

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

Classes/Domain/Repository/MailRepository.php

Braces +1 added lines, -2 removed lines

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