Erikmitk / kitodo-presentation

Tests/Functional/Common/SolrSearchTest.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 SolrSearchTest extends FunctionalTestCase
-{
+class SolrSearchTest extends FunctionalTestCase {
     private static array $databaseFixtures = [
         __DIR__ . '/../../Fixtures/Common/solrcores.csv'
     ];
@@ -41,8 +40,7 @@ 
     /**
      * @test
      */
-    public function canPrepareAndSubmit()
-    {
+    public function canPrepareAndSubmit() {
         $documentRepository = $this->initializeRepository(DocumentRepository::class, 0);
         $solrCoreName = $this->solrCoreRepository->findByUid(5)->getIndexName();
         $settings = ['solrcore' => $solrCoreName, 'storagePid' => 0];
@@ -80,8 +78,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/SolrIndexingTest.php

Braces +5 added lines, -10 removed lines

@@ -23,8 +23,7 @@ 
 use TYPO3\CMS\Core\Core\Bootstrap;
 use TYPO3\CMS\Core\Utility\GeneralUtility;
 
-class SolrIndexingTest extends FunctionalTestCase
-{
+class SolrIndexingTest extends FunctionalTestCase {
     /** @var CollectionRepository */
     protected $collectionRepository;
 
@@ -53,8 +52,7 @@ 
     /**
      * @test
      */
-    public function canCreateCore()
-    {
+    public function canCreateCore() {
         $coreName = uniqid('testCore');
         $solr = Solr::getInstance($coreName);
         self::assertNull($solr->core);
@@ -69,8 +67,7 @@ 
     /**
      * @test
      */
-    public function canIndexAndSearchDocument()
-    {
+    public function canIndexAndSearchDocument() {
         $core = $this->createSolrCore();
 
         $document = $this->documentRepository->findByUid(1001);
@@ -124,8 +121,7 @@ 
     /**
      * @test
      */
-    public function canSearchInCollections()
-    {
+    public function canSearchInCollections() {
         $core = $this->createSolrCore();
 
         $this->importCSVDataSet(__DIR__ . '/../../Fixtures/Common/documents_fulltext.csv');
@@ -165,8 +161,7 @@ 
     /**
      * @test
      */
-    public function canGetIndexFieldName()
-    {
+    public function canGetIndexFieldName() {
         $this->assertEquals('title_usi', Indexer::getIndexFieldName('title', 20000));
         $this->assertEquals('year_uuu', Indexer::getIndexFieldName('year', 20000));
         $this->assertEquals('', Indexer::getIndexFieldName('title'));

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, '', [