Erikmitk / kitodo-presentation

Classes/Common/SolrSearchQuery.php

Braces +8 added lines, -16 removed lines

@@ -10,10 +10,8 @@ 
 /**
  * Targeted towards being used in ``PaginateController`` (``<f:widget.paginate>``).
  */
-class SolrSearchQuery implements QueryInterface
-{
-    public function __construct($solrSearch)
-    {
+class SolrSearchQuery implements QueryInterface {
+    public function __construct($solrSearch) {
         $this->solrSearch = $solrSearch;
 
         $this->offset = 0;
@@ -22,8 +20,7 @@ 
 
     public function getSource() {}
 
-    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)
@@ -37,14 +34,12 @@ 
 
     public function setOrderings(array $orderings) {}
 
-    public function setLimit($limit)
-    {
+    public function setLimit($limit) {
         $this->limit = $limit;
         return $this;
     }
 
-    public function setOffset($offset)
-    {
+    public function setOffset($offset) {
         $this->offset = $offset;
         return $this;
     }
@@ -65,20 +60,17 @@ 
     public function setQuerySettings(QuerySettingsInterface $querySettings) {}
     public function getQuerySettings() {}
 
-    public function count()
-    {
+    public function count() {
         // TODO?
     }
 
     public function getOrderings() {}
 
-    public function getLimit()
-    {
+    public function getLimit() {
         return $this->limit;
     }
 
-    public function getOffset()
-    {
+    public function getOffset() {
         return $this->offset;
     }
 

Classes/Domain/Repository/DocumentRepository.php

Braces +13 added lines, -26 removed lines

@@ -48,8 +48,7 @@ 
      *
      * @return \Kitodo\Dlf\Domain\Model\Document|null
      */
-    public function findOneByParameters($parameters)
-    {
+    public function findOneByParameters($parameters) {
         $doc = null;
         $document = null;
 
@@ -93,8 +92,7 @@ 
      *
      * @return \Kitodo\Dlf\Domain\Model\Document|null
      */
-    public function findOldestDocument()
-    {
+    public function findOldestDocument() {
         $query = $this->createQuery();
 
         $query->setOrderings(['tstamp' => QueryInterface::ORDER_ASCENDING]);
@@ -108,8 +106,7 @@ 
      * @param  \Kitodo\Dlf\Domain\Model\Structure $structure
      * @return array|\TYPO3\CMS\Extbase\Persistence\QueryResultInterface
      */
-    public function getChildrenOfYearAnchor($partOf, $structure)
-    {
+    public function getChildrenOfYearAnchor($partOf, $structure) {
         $query = $this->createQuery();
 
         $query->matching($query->equals('structure', $structure));
@@ -130,8 +127,7 @@ 
      *
      * @return \Kitodo\Dlf\Domain\Model\Document|null
      */
-    public function findOneByIdAndSettings($uid, $settings = [])
-    {
+    public function findOneByIdAndSettings($uid, $settings = []) {
         $settings = ['documentSets' => $uid];
 
         return $this->findDocumentsBySettings($settings)->getFirst();
@@ -144,8 +140,7 @@ 
      *
      * @return array|\TYPO3\CMS\Extbase\Persistence\QueryResultInterface
      */
-    public function findDocumentsBySettings($settings = [])
-    {
+    public function findDocumentsBySettings($settings = []) {
         $query = $this->createQuery();
 
         $constraints = [];
@@ -175,8 +170,7 @@ 
      *
      * @return array|\TYPO3\CMS\Extbase\Persistence\QueryResultInterface
      */
-    public function findAllByCollectionsLimited($collections, $limit = 50)
-    {
+    public function findAllByCollectionsLimited($collections, $limit = 50) {
         $query = $this->createQuery();
 
         // order by start_date -> start_time...
@@ -213,8 +207,7 @@ 
      *
      * @return array
      */
-    public function getStatisticsForSelectedCollection($settings)
-    {
+    public function getStatisticsForSelectedCollection($settings) {
         if ($settings['collections']) {
             // Include only selected collections.
             $queryBuilder = GeneralUtility::makeInstance(ConnectionPool::class)
@@ -348,8 +341,7 @@ 
      *
      * @return \TYPO3\CMS\Extbase\Persistence\QueryResultInterface
      */
-    public function getTableOfContentsFromDb($uid, $pid, $settings)
-    {
+    public function getTableOfContentsFromDb($uid, $pid, $settings) {
         // Build table of contents from database.
         $queryBuilder = GeneralUtility::makeInstance(ConnectionPool::class)
             ->getQueryBuilderForTable('tx_dlf_documents');
@@ -397,8 +389,7 @@ 
      *
      * @return array The found document object
      */
-    public function getOaiRecord($settings, $parameters)
-    {
+    public function getOaiRecord($settings, $parameters) {
         $where = '';
 
         if (!$settings['show_userdefined']) {
@@ -438,8 +429,7 @@ 
      *
      * @return array The found document objects
      */
-    public function getOaiDocumentList($settings, $documentsToProcess)
-    {
+    public function getOaiDocumentList($settings, $documentsToProcess) {
         $connection = GeneralUtility::makeInstance(ConnectionPool::class)
             ->getConnectionForTable('tx_dlf_documents');
 
@@ -474,8 +464,7 @@ 
      *
      * @return array
      */
-    public function findAllByUids($uids, $checkPartof = false)
-    {
+    public function findAllByUids($uids, $checkPartof = false) {
         // get all documents from db we are talking about
         $connectionPool = GeneralUtility::makeInstance(ConnectionPool::class);
         $queryBuilder = $connectionPool->getQueryBuilderForTable('tx_dlf_documents');
@@ -524,8 +513,7 @@ 
      *
      * @return array
      */
-    public function findChildrenOfEach(array $uids)
-    {
+    public function findChildrenOfEach(array $uids) {
         $allDocuments = $this->findAllByUids($uids, true);
 
         $result = [];
@@ -546,8 +534,7 @@ 
      * @param \TYPO3\CMS\Extbase\Persistence\Generic\QueryResult $listedMetadata
      * @return array
      */
-    public function findSolrByCollection($collection, $settings, $searchParams, $listedMetadata = null)
-    {
+    public function findSolrByCollection($collection, $settings, $searchParams, $listedMetadata = null) {
         // set settings global inside this repository
         // (may be necessary when SolrSearch calls back)
         $this->settings = $settings;

Tests/Functional/Common/HelperTest.php

Braces +4 added lines, -8 removed lines

@@ -6,8 +6,7 @@ 
 use Kitodo\Dlf\Tests\Functional\FunctionalTestCase;
 use TYPO3\CMS\Core\Localization\LanguageService;
 
-class HelperTest extends FunctionalTestCase
-{
+class HelperTest extends FunctionalTestCase {
     public function setUp(): void
     {
         parent::setUp();
@@ -19,8 +18,7 @@ 
     /**
      * @test
      */
-    public function canGetIndexNameFromUid()
-    {
+    public function canGetIndexNameFromUid() {
         // Repeat to make sure caching isn't broken
         for ($n = 0; $n < 2; $n++) {
             // Good UID, no PID
@@ -69,8 +67,7 @@ 
      * @test
      * @group getLanguageName
      */
-    public function canTranslateLanguageNameToEnglish()
-    {
+    public function canTranslateLanguageNameToEnglish() {
         // NOTE: This only tests in BE mode
 
         $this->initLanguageService('default');
@@ -84,8 +81,7 @@ 
      * @test
      * @group getLanguageName
      */
-    public function canTranslateLanguageNameToGerman()
-    {
+    public function canTranslateLanguageNameToGerman() {
         // NOTE: This only tests in BE mode
 
         $this->initLanguageService('de');

Tests/Functional/Common/MetsDocumentTest.php

Braces +7 added lines, -14 removed lines

@@ -5,8 +5,7 @@ 
 use Kitodo\Dlf\Common\Doc;
 use Kitodo\Dlf\Tests\Functional\FunctionalTestCase;
 
-class MetsDocumentTest extends FunctionalTestCase
-{
+class MetsDocumentTest extends FunctionalTestCase {
     public function setUp(): void
     {
         parent::setUp();
@@ -15,8 +14,7 @@ 
         $this->importDataSet(__DIR__ . '/../../Fixtures/MetsDocument/metadata_mets.xml');
     }
 
-    protected function doc(string $file)
-    {
+    protected function doc(string $file) {
         $url = 'http://web:8001/Tests/Fixtures/MetsDocument/' . $file;
         $doc = Doc::getInstance($url);
         $this->assertNotNull($doc);
@@ -26,8 +24,7 @@ 
     /**
      * @test
      */
-    public function canParseDmdAndAmdSec()
-    {
+    public function canParseDmdAndAmdSec() {
         $doc = $this->doc('av_beispiel.xml');
 
         $titledata = $doc->getTitledata(20000);
@@ -45,8 +42,7 @@ 
     /**
      * @test
      */
-    public function canReadFileMetadata()
-    {
+    public function canReadFileMetadata() {
         $doc = $this->doc('av_beispiel.xml');
 
         $thumbsMeta = $doc->getMetadata('FILE_0000_THUMBS', 20000);
@@ -61,8 +57,7 @@ 
     /**
      * @test
      */
-    public function canGetLogicalStructure()
-    {
+    public function canGetLogicalStructure() {
         $doc = $this->doc('av_beispiel.xml');
 
         $toc = $doc->tableOfContents[0] ?? [];
@@ -98,8 +93,7 @@ 
     /**
      * @test
      */
-    public function doesNotOverwriteFirstDmdSec()
-    {
+    public function doesNotOverwriteFirstDmdSec() {
         $doc = $this->doc('two_dmdsec.xml');
 
         $titledata = $doc->getTitledata(20000);
@@ -112,8 +106,7 @@ 
     /**
      * @test
      */
-    public function returnsEmptyMetadataWhenNoDmdSec()
-    {
+    public function returnsEmptyMetadataWhenNoDmdSec() {
         $doc = $this->doc('two_dmdsec.xml');
 
         // DMD and AMD works

Tests/Functional/FunctionalTestCase.php

Braces +7 added lines, -14 removed lines

@@ -67,8 +67,7 @@ 
      */
     protected $httpClient;
 
-    public function __construct()
-    {
+    public function __construct() {
         parent::__construct();
 
         $this->configurationToUseInTestInstance['EXTENSIONS']['dlf'] = $this->getDlfConfiguration();
@@ -95,8 +94,7 @@ 
         $this->addSiteConfig('dlf-testing', $this->baseUrl);
     }
 
-    protected function getDlfConfiguration()
-    {
+    protected function getDlfConfiguration() {
         return [
             'fileGrpImages' => 'DEFAULT,MAX',
             'fileGrpThumbs' => 'THUMBS',
@@ -134,8 +132,7 @@ 
         ];
     }
 
-    protected function addSiteConfig($identifier, $baseUrl)
-    {
+    protected function addSiteConfig($identifier, $baseUrl) {
         $siteConfig = Yaml::parseFile(__DIR__ . '/../Fixtures/siteconfig.yaml');
         $siteConfig['base'] = $baseUrl;
         $siteConfig['languages'][0]['base'] = $baseUrl;
@@ -145,8 +142,7 @@ 
         file_put_contents($siteConfigPath . '/config.yaml', Yaml::dump($siteConfig));
     }
 
-    protected function initializeRepository(string $className, int $storagePid)
-    {
+    protected function initializeRepository(string $className, int $storagePid) {
         $repository = $this->objectManager->get($className);
 
         $querySettings = $this->objectManager->get(Typo3QuerySettings::class);
@@ -156,8 +152,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();
@@ -176,8 +171,7 @@ 
         $solr->service->update($updateQuery);
     }
 
-    protected function initLanguageService(string $locale)
-    {
+    protected function initLanguageService(string $locale) {
         if (class_exists(\TYPO3\CMS\Core\Localization\LanguageServiceFactory::class)) {
             $GLOBALS['LANG'] = GeneralUtility::makeInstance(\TYPO3\CMS\Core\Localization\LanguageServiceFactory::class)->create($locale);
         } else {
@@ -193,8 +187,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 = '') {
         $this->assertEquals($sub, ArrayUtility::intersectRecursive($super, $sub), $message);
     }
 }

Classes/Hooks/ItemsProcFunc.php

Braces +4 added lines, -8 removed lines

@@ -28,8 +28,7 @@ 
  * @subpackage dlf
  * @access public
  */
-class ItemsProcFunc implements LoggerAwareInterface
-{
+class ItemsProcFunc implements LoggerAwareInterface {
     use LoggerAwareTrait;
 
     /**
@@ -46,8 +45,7 @@ 
      *
      * @return void
      */
-    public function toolList(&$params)
-    {
+    public function toolList(&$params) {
         foreach ($GLOBALS['TYPO3_CONF_VARS']['SC_OPTIONS']['dlf/Classes/Plugin/Toolbox.php']['tools'] as $class => $label) {
             $params['items'][] = [Helper::getLanguageService()->sL($label), $class];
         }
@@ -97,8 +95,7 @@ 
      *
      * @return void
      */
-    public function extendedSearchList(&$params)
-    {
+    public function extendedSearchList(&$params) {
         $this->generateList(
             $params,
             'label,index_name',
@@ -139,8 +136,7 @@ 
      *
      * @return void
      */
-    protected function generateList(&$params, $fields, $table, $sorting, $andWhere = '')
-    {
+    protected function generateList(&$params, $fields, $table, $sorting, $andWhere = '') {
         $this->getTyposcriptConfigFromPluginSiteRoot($params);
 
         $queryBuilder = GeneralUtility::makeInstance(ConnectionPool::class)

Classes/Controller/TableOfContentsController.php

Braces +8 added lines, -16 removed lines

@@ -24,8 +24,7 @@ 
  * @subpackage dlf
  * @access public
  */
-class TableOfContentsController extends AbstractController
-{
+class TableOfContentsController extends AbstractController {
     /**
      * This holds the active entries according to the currently selected page
      *
@@ -45,8 +44,7 @@ 
      *
      * @return void
      */
-    public function filterAction()
-    {
+    public function filterAction() {
         // if filter was triggered, get filter parameters from POST variables
         $this->filterParams = $this->getParametersSafely('filterParameter');
 
@@ -59,8 +57,7 @@ 
      *
      * @return void
      */
-    public function mainAction()
-    {
+    public function mainAction() {
         // Load current document.
         $this->loadDocument($this->requestData);
         if (
@@ -91,8 +88,7 @@ 
      * @access protected
      * @return array HMENU array
      */
-    protected function makeMenuArray()
-    {
+    protected function makeMenuArray() {
         // Set default values for page if not set.
         // $this->requestData['page'] may be integer or string (physical structure @ID)
         if (
@@ -168,8 +164,7 @@ 
      *
      * @return array HMENU array
      */
-    protected function makeMenuFor3DObjects()
-    {
+    protected function makeMenuFor3DObjects() {
         $menuArray = [];
 
         // Go through table of contents and create all menu entries.
@@ -192,8 +187,7 @@ 
      *
      * @return array HMENU array for menu entry
      */
-    protected function getMenuEntry(array $entry, $recursive = false)
-    {
+    protected function getMenuEntry(array $entry, $recursive = false) {
         $entry = $this->resolveMenuEntry($entry);
 
         $entryArray = [];
@@ -287,8 +281,7 @@ 
      * @param array $entry
      * @return array
      */
-    protected function resolveMenuEntry($entry)
-    {
+    protected function resolveMenuEntry($entry) {
         // If the menu entry points to the parent document,
         // resolve to the parent UID set on indexation.
         $doc = $this->document->getDoc();
@@ -304,8 +297,7 @@ 
         return $entry;
     }
 
-    protected function getMenuEntryWithImage(array $entry, $recursive = false)
-    {
+    protected function getMenuEntryWithImage(array $entry, $recursive = false) {
         $entryArray = [];
 
         // don't filter if the entry type is collection or search params are empty