Erikmitk / kitodo-presentation

Classes/Controller/AbstractController.php

Braces +8 added lines, -10 removed lines

@@ -39,8 +39,7 @@ 
  *
  * @abstract
  */
-abstract class AbstractController extends ActionController implements LoggerAwareInterface
-{
+abstract class AbstractController extends ActionController implements LoggerAwareInterface {
     use LoggerAwareTrait;
 
     /**
@@ -248,8 +247,7 @@ 
      *
      * @return null|string|array
      */
-    protected function getParametersSafely(string $parameterName)
-    {
+    protected function getParametersSafely(string $parameterName) {
         if ($this->request->hasArgument($parameterName)) {
             return $this->request->getArgument($parameterName);
         }
@@ -444,7 +442,8 @@ 
         $lastStartRecordNumberGrid = 0; // due to validity outside the loop
         foreach (range($firstPage, $lastPage) as $i) {
             // detect which pagination is active: ListView or GridView
-            if (get_class($pagination) == 'TYPO3\CMS\Core\Pagination\SimplePagination') {  // ListView
+            if (get_class($pagination) == 'TYPO3\CMS\Core\Pagination\SimplePagination') {
+// ListView
                 $lastStartRecordNumberGrid = $i; // save last $startRecordNumber for LastPage button
 
                 $pages[$i] = [
@@ -457,7 +456,8 @@ 
                 if (in_array($i, $aRange)) {
                     array_push($pagesSect, ['label' => $i, 'startRecordNumber' => $i]);
                 };
-            } else { // GridView
+            } else {
+// GridView
                 // to calculate the values for generation the links for the pagination pages
                 /** @var \Kitodo\Dlf\Pagination\PageGridPaginator $paginator */
                 $itemsPerPage = $paginator->getPublicItemsPerPage();
@@ -537,8 +537,7 @@ 
      *
      * @return AbstractDocument
      */
-    private function getDocumentByUid(int $documentId)
-    {
+    private function getDocumentByUid(int $documentId) {
         // TODO: implement multiView as it is in getDocumentByUrl
         $doc = null;
         $this->document = $this->documentRepository->findOneByIdAndSettings($documentId);
@@ -563,8 +562,7 @@ 
      *
      * @return AbstractDocument
      */
-    protected function getDocumentByUrl(string $documentId)
-    {
+    protected function getDocumentByUrl(string $documentId) {
         $doc = AbstractDocument::getInstance($documentId, $this->settings, true);
 
         if (isset($this->settings['multiViewType']) && $doc->tableOfContents[0]['type'] === $this->settings['multiViewType']) {

Classes/Controller/OaiPmhController.php

Braces +19 added lines, -38 removed lines

@@ -27,8 +27,7 @@ 
  *
  * @access public
  */
-class OaiPmhController extends AbstractController
-{
+class OaiPmhController extends AbstractController {
     /**
      * @access protected
      * @var TokenRepository
@@ -42,8 +41,7 @@ 
      *
      * @return void
      */
-    public function injectTokenRepository(TokenRepository $tokenRepository)
-    {
+    public function injectTokenRepository(TokenRepository $tokenRepository) {
         $this->tokenRepository = $tokenRepository;
     }
 
@@ -60,8 +58,7 @@ 
      *
      * @return void
      */
-    public function injectCollectionRepository(CollectionRepository $collectionRepository)
-    {
+    public function injectCollectionRepository(CollectionRepository $collectionRepository) {
         $this->collectionRepository = $collectionRepository;
     }
 
@@ -78,8 +75,7 @@ 
      *
      * @return void
      */
-    public function injectLibraryRepository(LibraryRepository $libraryRepository)
-    {
+    public function injectLibraryRepository(LibraryRepository $libraryRepository) {
         $this->libraryRepository = $libraryRepository;
     }
 
@@ -90,8 +86,7 @@ 
      *
      * @return void
      */
-    public function initializeAction()
-    {
+    public function initializeAction() {
         $this->request = $this->request->withFormat("xml");
     }
 
@@ -136,8 +131,7 @@ 
      *
      * @return void
      */
-    protected function deleteExpiredTokens()
-    {
+    protected function deleteExpiredTokens() {
         // Delete expired resumption tokens.
         $this->tokenRepository->deleteExpiredTokens($this->settings['expired']);
     }
@@ -149,8 +143,7 @@ 
      *
      * @return void
      */
-    protected function getUrlParams()
-    {
+    protected function getUrlParams() {
         $allowedParams = [
             'verb',
             'identifier',
@@ -181,8 +174,7 @@ 
      *
      * @return array The mapped metadata array
      */
-    private function getDublinCoreData(array $record)
-    {
+    private function getDublinCoreData(array $record) {
         $metadata = [];
 
         $metadata[] = ['dc:identifier' => $record['record_id']];
@@ -224,8 +216,7 @@ 
      *
      * @return void
      */
-    private function addDublinCoreData(&$metadata, $key, $value)
-    {
+    private function addDublinCoreData(&$metadata, $key, $value) {
         if (!empty($value)) {
             $metadata[] = [$key => $value];
         }
@@ -241,8 +232,7 @@ 
      *
      * @return string The fetched METS XML
      */
-    protected function getMetsData(array $record)
-    {
+    protected function getMetsData(array $record) {
         $mets = null;
         // Load METS file.
         $xml = new \DOMDocument();
@@ -335,8 +325,7 @@ 
      *
      * @return void
      */
-    protected function verbGetRecord()
-    {
+    protected function verbGetRecord() {
         if (count($this->parameters) !== 3 || empty($this->parameters['metadataPrefix']) || empty($this->parameters['identifier'])) {
             $this->error = 'badArgument';
             return;
@@ -388,8 +377,7 @@ 
      *
      * @return void
      */
-    protected function verbIdentify()
-    {
+    protected function verbIdentify() {
         $library = $this->libraryRepository->findByUid($this->settings['library']);
 
         $oaiIdentifyInfo = [];
@@ -438,8 +426,7 @@ 
      *
      * @return void
      */
-    protected function verbListIdentifiers()
-    {
+    protected function verbListIdentifiers() {
         // If we have a resumption token we can continue our work
         if (!empty($this->parameters['resumptionToken'])) {
             // "resumptionToken" is an exclusive argument.
@@ -493,8 +480,7 @@ 
      *
      * @return void
      */
-    protected function verbListMetadataFormats()
-    {
+    protected function verbListMetadataFormats() {
         $resArray = [];
         // check for the optional "identifier" parameter
         if (isset($this->parameters['identifier'])) {
@@ -526,8 +512,7 @@ 
      *
      * @return void
      */
-    protected function verbListRecords()
-    {
+    protected function verbListRecords() {
         // Check for invalid arguments.
         if (!empty($this->parameters['resumptionToken'])) {
             // "resumptionToken" is an exclusive argument.
@@ -582,8 +567,7 @@ 
      *
      * @return void
      */
-    protected function verbListSets()
-    {
+    protected function verbListSets() {
         // It is required to set a oai_name inside the collection record to be shown in oai-pmh plugin.
         $this->settings['hideEmptyOaiNames'] = true;
 
@@ -729,8 +713,7 @@ 
      *
      * @return array|false
      */
-    private function getDate(string $dateType)
-    {
+    private function getDate(string $dateType) {
         return strptime($this->parameters[$dateType], '%Y-%m-%dT%H:%M:%SZ') ?: strptime($this->parameters[$dateType], '%Y-%m-%d');
     }
 
@@ -785,8 +768,7 @@ 
      *
      * @return array of enriched records
      */
-    protected function generateOutputForDocumentList(array $documentListSet)
-    {
+    protected function generateOutputForDocumentList(array $documentListSet) {
         // check whether any result elements are available
         if (empty($documentListSet) || empty($documentListSet['elements'])) {
             $this->error = 'noRecordsMatch';
@@ -841,8 +823,7 @@ 
      *
      * @return void
      */
-    protected function generateResumptionTokenForDocumentListSet(array $documentListSet, int $numShownDocuments)
-    {
+    protected function generateResumptionTokenForDocumentListSet(array $documentListSet, int $numShownDocuments) {
         // The cursor specifies how many elements have already been returned in previous requests
         // See http://www.openarchives.org/OAI/openarchivesprotocol.html#FlowControl
         $currentCursor = $documentListSet['metadata']['cursor'];

Classes/Controller/AnnotationController.php

Braces +1 added lines, -2 removed lines

@@ -22,8 +22,7 @@
  * @subpackage dlf
  * @access public
  */
-class AnnotationController extends AbstractController
-{
+class AnnotationController extends AbstractController {
     /**
      * The main method of the plugin
      *

Classes/Controller/PageViewController.php

Braces +3 added lines, -6 removed lines

@@ -31,8 +31,7 @@ 
  *
  * @access public
  */
-class PageViewController extends AbstractController
-{
+class PageViewController extends AbstractController {
     /**
      * @access protected
      * @var array Holds the controls to add to the map
@@ -258,8 +257,7 @@ 
      * @param $page
      * @return false|int|mixed|string|null
      */
-    public function convertMeasureOrPage($document, $measure = null, $page = null)
-    {
+    public function convertMeasureOrPage($document, $measure = null, $page = null) {
         $return = null;
         $measure2Page = array_column($document->musicalStructure, 'page');
         if ($measure) {
@@ -370,8 +368,7 @@ 
      *
      * @return array URL and MIME type of fulltext file
      */
-    protected function getScore(int $page, MetsDocument $specificDoc = null)
-    {
+    protected function getScore(int $page, MetsDocument $specificDoc = null) {
         $score = [];
         $loc = '';
         if ($specificDoc) {

Classes/Common/Solr/SolrSearchQuery.php

Braces +3 added lines, -6 removed lines

@@ -16,8 +16,7 @@ 
  * @property int $limit
  * @property int $offset
  */
-class SolrSearchQuery extends Query
-{
+class SolrSearchQuery extends Query {
     /**
      * @access private
      * @var SolrSearch
@@ -33,8 +32,7 @@ 
      *
      * @return void
      */
-    public function __construct($solrSearch)
-    {
+    public function __construct($solrSearch) {
         $this->solrSearch = $solrSearch;
 
         $this->offset = 0;
@@ -52,8 +50,7 @@ 
      */
     // TODO: Return type (array) of method SolrSearchQuery::execute() should be compatible with return type (iterable<object>&TYPO3\CMS\Extbase\Persistence\QueryResultInterface) of method TYPO3\CMS\Extbase\Persistence\QueryInterface::execute()
     // @phpstan-ignore-next-line
-    public function execute($returnRawQueryResult = false)
-    {
+    public function execute($returnRawQueryResult = false) {
         $this->solrSearch->submit($this->offset, $this->limit);
 
         // solrSearch now only contains the results in range, indexed in [0, n)

Tests/Functional/Api/OaiPmhTest.php

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 array $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));
     }
 }

Tests/Functional/FunctionalTestCase.php

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

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