Erikmitk / kitodo-presentation

Tests/Functional/Common/SolrSearchQueryTest.php

Braces +3 added lines, -6 removed lines

@@ -18,8 +18,7 @@ 
 use Kitodo\Dlf\Domain\Repository\SolrCoreRepository;
 use Kitodo\Dlf\Tests\Functional\FunctionalTestCase;
 
-class SolrSearchQueryTest extends FunctionalTestCase
-{
+class SolrSearchQueryTest extends FunctionalTestCase {
     private $solrCoreRepository;
 
     private static array $databaseFixtures = [
@@ -43,8 +42,7 @@ 
      * @test
      * @ignore
      */
-    public function canExecute()
-    {
+    public function canExecute() {
         $documentRepository = $this->initializeRepository(DocumentRepository::class, 0);
         $settings = ['solrcore' => 4, 'storagePid' => 0];
 
@@ -68,8 +66,7 @@ 
         $this->initializeRepository(DocumentRepository::class, 0);
     }
 
-    protected function setUpSolr($uid, $storagePid, $solrFixtures)
-    {
+    protected function setUpSolr($uid, $storagePid, $solrFixtures) {
         $this->solrCoreRepository = $this->initializeRepository(SolrCoreRepository::class, $storagePid);
 
         // Setup Solr only once for all tests in this suite

Tests/Functional/Common/SolrTest.php

Braces +7 added lines, -14 removed lines

@@ -17,8 +17,7 @@ 
 use Kitodo\Dlf\Domain\Repository\SolrCoreRepository;
 use Kitodo\Dlf\Tests\Functional\FunctionalTestCase;
 
-class SolrTest extends FunctionalTestCase
-{
+class SolrTest extends FunctionalTestCase {
 
     private static array $databaseFixtures = [
         __DIR__ . '/../../Fixtures/Common/documents_1.csv',
@@ -33,8 +32,7 @@ 
     /**
      * @test
      */
-    public function canCreateCore()
-    {
+    public function canCreateCore() {
         $this->assertEquals('newCoreName', Solr::createCore('newCoreName'));
         $this->assertEquals('newCoreName', Solr::getInstance('newCoreName')->core);
     }
@@ -42,8 +40,7 @@ 
     /**
      * @test
      */
-    public function canEscapeQuery()
-    {
+    public function canEscapeQuery() {
         $query1 = Solr::escapeQuery('"custom query with special characters: "testvalue"\n"');
         $this->assertEquals('"custom query with special characters\: "testvalue"\\\\n"', $query1);
 
@@ -54,8 +51,7 @@ 
     /**
      * @test
      */
-    public function canEscapeQueryKeepField()
-    {
+    public function canEscapeQueryKeepField() {
         $query1 = Solr::escapeQueryKeepField('abc_uui:(abc)', 0);
         $this->assertEquals('abc_uui\:(abc)', $query1);
     }
@@ -63,8 +59,7 @@ 
     /**
      * @test
      */
-    public function canGetNextCoreNumber()
-    {
+    public function canGetNextCoreNumber() {
         $this->assertEquals(5, Solr::getNextCoreNumber());
         $this->assertEquals(5, Solr::getNextCoreNumber());
         Solr::createCore();
@@ -74,8 +69,7 @@ 
     /**
      * @test
      */
-    public function canSearchRaw()
-    {
+    public function canSearchRaw() {
         $this->setUpData(self::$databaseFixtures);
         $solr = $this->setUpSolr(4, 0, self::$solrFixtures);
         $resultSet = $solr->searchRaw(['core' => 4, 'collection' => 1]);
@@ -92,8 +86,7 @@ 
         $this->initializeRepository(DocumentRepository::class, 0);
     }
 
-    protected function setUpSolr($uid, $storagePid, $solrFixtures)
-    {
+    protected function setUpSolr($uid, $storagePid, $solrFixtures) {
         $solrCoreRepository = $this->initializeRepository(SolrCoreRepository::class, $storagePid);
 
         // Setup Solr only once for all tests in this suite

Tests/Functional/FunctionalTestCase.php

Braces +7 added lines, -14 removed lines

@@ -91,8 +91,7 @@ 
      */
     protected $httpClient;
 
-    public function __construct()
-    {
+    public function __construct() {
         parent::__construct();
 
         $this->configurationToUseInTestInstance['EXTENSIONS']['dlf'] = $this->getDlfConfiguration();
@@ -120,8 +119,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();
 
@@ -162,8 +160,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;
@@ -173,8 +170,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);
@@ -184,8 +180,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();
@@ -204,16 +199,14 @@ 
         $solr->service->update($updateQuery);
     }
 
-    protected function initLanguageService(string $locale)
-    {
+    protected function initLanguageService(string $locale) {
         $GLOBALS['LANG'] = GeneralUtility::makeInstance(LanguageServiceFactory::class)->create($locale);
     }
 
     /**
      * 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/Command/DeleteCommand.php

Braces +1 added lines, -2 removed lines

@@ -31,8 +31,7 @@
  *
  * @access public
  */
-class DeleteCommand extends BaseCommand
-{
+class DeleteCommand extends BaseCommand {
 
     /**
      * Configure the command by defining the name, options and arguments

Classes/Common/IiifManifest.php

Braces +2 added lines, -4 removed lines

@@ -75,8 +75,7 @@ 
  * @property array $mimeTypes this holds the mime types of linked resources in the manifest (extracted during parsing) for later us
  * 
  */
-final class IiifManifest extends AbstractDocument
-{
+final class IiifManifest extends AbstractDocument {
     /**
      * @access protected
      * @var string This holds the manifest file as string for serialization purposes
@@ -229,8 +228,7 @@ 
      *
      * @return array|string
      */
-    protected function getUseGroups(string $use)
-    {
+    protected function getUseGroups(string $use) {
         if (!$this->useGrpsLoaded) {
             // Get configured USE attributes.
             $extConf = GeneralUtility::makeInstance(ExtensionConfiguration::class)->get(self::$extKey, 'files');

Classes/Eid/PageViewProxy.php

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

Tests/Functional/Api/PageViewProxyTest.php

Braces +3 added lines, -6 removed lines

@@ -15,12 +15,10 @@ 
 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(), [
             'general' => [
                 'enableInternalProxy' => true
@@ -28,8 +26,7 @@ 
         ]);
     }
 
-    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, '', [

Tests/Functional/Common/MetsDocumentTest.php

Braces +14 added lines, -28 removed lines

@@ -15,8 +15,7 @@ 
 use Kitodo\Dlf\Common\AbstractDocument;
 use Kitodo\Dlf\Tests\Functional\FunctionalTestCase;
 
-class MetsDocumentTest extends FunctionalTestCase
-{
+class MetsDocumentTest extends FunctionalTestCase {
     public function setUp(): void
     {
         parent::setUp();
@@ -26,8 +25,7 @@ 
         $this->importCSVDataSet(__DIR__ . '/../../Fixtures/MetsDocument/metadata_mets.csv');
     }
 
-    protected function doc(string $file)
-    {
+    protected function doc(string $file) {
         $url = 'http://web:8001/Tests/Fixtures/MetsDocument/' . $file;
         $doc = AbstractDocument::getInstance($url, ['general' => ['useExternalApisForMetadata' => 0]]);
         self::assertNotNull($doc);
@@ -37,8 +35,7 @@ 
     /**
      * @test
      */
-    public function canParseDmdAndAmdSec()
-    {
+    public function canParseDmdAndAmdSec() {
         $doc = $this->doc('av_beispiel.xml');
 
         $toplevelMetadata = $doc->getToplevelMetadata(20000);
@@ -56,8 +53,7 @@ 
     /**
      * @test
      */
-    public function canReadFileMetadata()
-    {
+    public function canReadFileMetadata() {
         $doc = $this->doc('av_beispiel.xml');
 
         $thumbsMeta = $doc->getMetadata('FILE_0000_THUMBS', 20000);
@@ -72,8 +68,7 @@ 
     /**
      * @test
      */
-    public function canGetLogicalStructure()
-    {
+    public function canGetLogicalStructure() {
         $doc = $this->doc('av_beispiel.xml');
 
         $toc = $doc->tableOfContents[0] ?? [];
@@ -109,8 +104,7 @@ 
     /**
      * @test
      */
-    public function doesNotOverwriteFirstDmdSec()
-    {
+    public function doesNotOverwriteFirstDmdSec() {
         $doc = $this->doc('two_dmdsec.xml');
 
         $toplevelMetadata = $doc->getToplevelMetadata(20000);
@@ -123,8 +117,7 @@ 
     /**
      * @test
      */
-    public function returnsEmptyMetadataWhenNoDmdSec()
-    {
+    public function returnsEmptyMetadataWhenNoDmdSec() {
         $doc = $this->doc('two_dmdsec.xml');
 
         // DMD and AMD works
@@ -143,8 +136,7 @@ 
     /**
      * @test
      */
-    public function canGetDownloadLocation()
-    {
+    public function canGetDownloadLocation() {
         $doc = $this->doc('two_dmdsec.xml');
 
         $correct = $doc->getDownloadLocation('FILE_0000_DOWNLOAD');
@@ -162,8 +154,7 @@ 
     /**
      * @test
      */
-    public function canGetFileLocation()
-    {
+    public function canGetFileLocation() {
         $doc = $this->doc('two_dmdsec.xml');
 
         $correct = $doc->getFileLocation('FILE_0000_DEFAULT');
@@ -176,8 +167,7 @@ 
     /**
      * @test
      */
-    public function canGetFileMimeType()
-    {
+    public function canGetFileMimeType() {
         $doc = $this->doc('two_dmdsec.xml');
 
         $correct = $doc->getFileMimeType('FILE_0000_DEFAULT');
@@ -191,8 +181,7 @@ 
     /**
      * @test
      */
-    public function canGetPhysicalPage()
-    {
+    public function canGetPhysicalPage() {
         $doc = $this->doc('mets_with_pages.xml');
 
         // pass orderlabel and retrieve order
@@ -203,8 +192,7 @@ 
     /**
      * @test
      */
-    public function canGetTitle()
-    {
+    public function canGetTitle() {
         $doc = $this->doc('mets_with_pages.xml');
 
         $correct = $doc->getTitle(1001);
@@ -217,8 +205,7 @@ 
     /**
      * @test
      */
-    public function canGetFullText()
-    {
+    public function canGetFullText() {
         $doc = $this->doc('mets_with_pages.xml');
 
         $fulltext = $doc->getFullText('PHYS_0003');
@@ -234,8 +221,7 @@ 
     /**
      * @test
      */
-    public function canGetStructureDepth()
-    {
+    public function canGetStructureDepth() {
         $doc = $this->doc('mets_with_pages.xml');
 
         $correct = $doc->getStructureDepth('LOG_0001');

Classes/Validation/DocumentValidator.php

Braces +2 added lines, -4 removed lines

@@ -27,8 +27,7 @@ 
  *
  * @access public
  */
-class DocumentValidator
-{
+class DocumentValidator {
      /**
      * @access protected
      * @var Logger This holds the logger
@@ -63,8 +62,7 @@ 
      *
      * @return void
      */
-    public function __construct(array $metadata = [], array $requiredMetadataFields = [], ?\SimpleXMLElement $xml = null)
-    {
+    public function __construct(array $metadata = [], array $requiredMetadataFields = [], ?\SimpleXMLElement $xml = null) {
         $this->logger = GeneralUtility::makeInstance(LogManager::class)->getLogger(static::class);
         $this->metadata = $metadata;
         $this->requiredMetadataFields = $requiredMetadataFields;