@@ -15,14 +15,12 @@ |
||
| 15 | 15 | use Kitodo\Dlf\Common\IiifUrlReader; |
| 16 | 16 | use Kitodo\Dlf\Tests\Functional\FunctionalTestCase; |
| 17 | 17 | |
| 18 | -class IiifUrlReaderTest extends FunctionalTestCase |
|
| 19 | -{ |
|
| 18 | +class IiifUrlReaderTest extends FunctionalTestCase { |
|
| 20 | 19 | /** |
| 21 | 20 | * @test |
| 22 | 21 | * @group getContent |
| 23 | 22 | */ |
| 24 | - public function getContentCheck() |
|
| 25 | - { |
|
| 23 | + public function getContentCheck() { |
|
| 26 | 24 | $iiifUrlReader = new IiifUrlReader(); |
| 27 | 25 | |
| 28 | 26 | $correctUrl = 'http://web:8001/Tests/Fixtures/Common/correct.txt'; |
@@ -18,8 +18,7 @@ discard block |
||
| 18 | 18 | use Kitodo\Dlf\Domain\Repository\SolrCoreRepository; |
| 19 | 19 | use Kitodo\Dlf\Tests\Functional\FunctionalTestCase; |
| 20 | 20 | |
| 21 | -class SolrSearchTest extends FunctionalTestCase |
|
| 22 | -{ |
|
| 21 | +class SolrSearchTest extends FunctionalTestCase { |
|
| 23 | 22 | private static array $databaseFixtures = [ |
| 24 | 23 | __DIR__ . '/../../Fixtures/Common/solrcores.csv' |
| 25 | 24 | ]; |
@@ -41,8 +40,7 @@ discard block |
||
| 41 | 40 | /** |
| 42 | 41 | * @test |
| 43 | 42 | */ |
| 44 | - public function canPrepareAndSubmit() |
|
| 45 | - { |
|
| 43 | + public function canPrepareAndSubmit() { |
|
| 46 | 44 | $documentRepository = $this->initializeRepository(DocumentRepository::class, 0); |
| 47 | 45 | $solrCoreName = $this->solrCoreRepository->findByUid(5)->getIndexName(); |
| 48 | 46 | $settings = ['solrcore' => $solrCoreName, 'storagePid' => 0]; |
@@ -80,8 +78,7 @@ discard block |
||
| 80 | 78 | $this->initializeRepository(DocumentRepository::class, 0); |
| 81 | 79 | } |
| 82 | 80 | |
| 83 | - protected function setUpSolr($uid, $storagePid, $solrFixtures) |
|
| 84 | - { |
|
| 81 | + protected function setUpSolr($uid, $storagePid, $solrFixtures) { |
|
| 85 | 82 | $this->solrCoreRepository = $this->initializeRepository(SolrCoreRepository::class, $storagePid); |
| 86 | 83 | |
| 87 | 84 | // Setup Solr only once for all tests in this suite |
@@ -23,8 +23,7 @@ discard block |
||
| 23 | 23 | use TYPO3\CMS\Core\Core\Bootstrap; |
| 24 | 24 | use TYPO3\CMS\Core\Utility\GeneralUtility; |
| 25 | 25 | |
| 26 | -class SolrIndexingTest extends FunctionalTestCase |
|
| 27 | -{ |
|
| 26 | +class SolrIndexingTest extends FunctionalTestCase { |
|
| 28 | 27 | /** @var CollectionRepository */ |
| 29 | 28 | protected $collectionRepository; |
| 30 | 29 | |
@@ -53,8 +52,7 @@ discard block |
||
| 53 | 52 | /** |
| 54 | 53 | * @test |
| 55 | 54 | */ |
| 56 | - public function canCreateCore() |
|
| 57 | - { |
|
| 55 | + public function canCreateCore() { |
|
| 58 | 56 | $coreName = uniqid('testCore'); |
| 59 | 57 | $solr = Solr::getInstance($coreName); |
| 60 | 58 | self::assertNull($solr->core); |
@@ -69,8 +67,7 @@ discard block |
||
| 69 | 67 | /** |
| 70 | 68 | * @test |
| 71 | 69 | */ |
| 72 | - public function canIndexAndSearchDocument() |
|
| 73 | - { |
|
| 70 | + public function canIndexAndSearchDocument() { |
|
| 74 | 71 | $core = $this->createSolrCore(); |
| 75 | 72 | |
| 76 | 73 | $document = $this->documentRepository->findByUid(1001); |
@@ -124,8 +121,7 @@ discard block |
||
| 124 | 121 | /** |
| 125 | 122 | * @test |
| 126 | 123 | */ |
| 127 | - public function canSearchInCollections() |
|
| 128 | - { |
|
| 124 | + public function canSearchInCollections() { |
|
| 129 | 125 | $core = $this->createSolrCore(); |
| 130 | 126 | |
| 131 | 127 | $this->importCSVDataSet(__DIR__ . '/../../Fixtures/Common/documents_fulltext.csv'); |
@@ -165,8 +161,7 @@ discard block |
||
| 165 | 161 | /** |
| 166 | 162 | * @test |
| 167 | 163 | */ |
| 168 | - public function canGetIndexFieldName() |
|
| 169 | - { |
|
| 164 | + public function canGetIndexFieldName() { |
|
| 170 | 165 | $this->assertEquals('title_usi', Indexer::getIndexFieldName('title', 20000)); |
| 171 | 166 | $this->assertEquals('year_uuu', Indexer::getIndexFieldName('year', 20000)); |
| 172 | 167 | $this->assertEquals('', Indexer::getIndexFieldName('title')); |
@@ -18,8 +18,7 @@ discard block |
||
| 18 | 18 | use Kitodo\Dlf\Domain\Repository\SolrCoreRepository; |
| 19 | 19 | use Kitodo\Dlf\Tests\Functional\FunctionalTestCase; |
| 20 | 20 | |
| 21 | -class SolrSearchQueryTest extends FunctionalTestCase |
|
| 22 | -{ |
|
| 21 | +class SolrSearchQueryTest extends FunctionalTestCase { |
|
| 23 | 22 | private $solrCoreRepository; |
| 24 | 23 | |
| 25 | 24 | private static array $databaseFixtures = [ |
@@ -43,8 +42,7 @@ discard block |
||
| 43 | 42 | * @test |
| 44 | 43 | * @ignore |
| 45 | 44 | */ |
| 46 | - public function canExecute() |
|
| 47 | - { |
|
| 45 | + public function canExecute() { |
|
| 48 | 46 | $documentRepository = $this->initializeRepository(DocumentRepository::class, 0); |
| 49 | 47 | $settings = ['solrcore' => 4, 'storagePid' => 0]; |
| 50 | 48 | |
@@ -68,8 +66,7 @@ discard block |
||
| 68 | 66 | $this->initializeRepository(DocumentRepository::class, 0); |
| 69 | 67 | } |
| 70 | 68 | |
| 71 | - protected function setUpSolr($uid, $storagePid, $solrFixtures) |
|
| 72 | - { |
|
| 69 | + protected function setUpSolr($uid, $storagePid, $solrFixtures) { |
|
| 73 | 70 | $this->solrCoreRepository = $this->initializeRepository(SolrCoreRepository::class, $storagePid); |
| 74 | 71 | |
| 75 | 72 | // Setup Solr only once for all tests in this suite |
@@ -17,8 +17,7 @@ discard block |
||
| 17 | 17 | use Kitodo\Dlf\Domain\Repository\SolrCoreRepository; |
| 18 | 18 | use Kitodo\Dlf\Tests\Functional\FunctionalTestCase; |
| 19 | 19 | |
| 20 | -class SolrTest extends FunctionalTestCase |
|
| 21 | -{ |
|
| 20 | +class SolrTest extends FunctionalTestCase { |
|
| 22 | 21 | |
| 23 | 22 | private static array $databaseFixtures = [ |
| 24 | 23 | __DIR__ . '/../../Fixtures/Common/documents_1.csv', |
@@ -33,8 +32,7 @@ discard block |
||
| 33 | 32 | /** |
| 34 | 33 | * @test |
| 35 | 34 | */ |
| 36 | - public function canCreateCore() |
|
| 37 | - { |
|
| 35 | + public function canCreateCore() { |
|
| 38 | 36 | $this->assertEquals('newCoreName', Solr::createCore('newCoreName')); |
| 39 | 37 | $this->assertEquals('newCoreName', Solr::getInstance('newCoreName')->core); |
| 40 | 38 | } |
@@ -42,8 +40,7 @@ discard block |
||
| 42 | 40 | /** |
| 43 | 41 | * @test |
| 44 | 42 | */ |
| 45 | - public function canEscapeQuery() |
|
| 46 | - { |
|
| 43 | + public function canEscapeQuery() { |
|
| 47 | 44 | $query1 = Solr::escapeQuery('"custom query with special characters: "testvalue"\n"'); |
| 48 | 45 | $this->assertEquals('"custom query with special characters\: "testvalue"\\\\n"', $query1); |
| 49 | 46 | |
@@ -54,8 +51,7 @@ discard block |
||
| 54 | 51 | /** |
| 55 | 52 | * @test |
| 56 | 53 | */ |
| 57 | - public function canEscapeQueryKeepField() |
|
| 58 | - { |
|
| 54 | + public function canEscapeQueryKeepField() { |
|
| 59 | 55 | $query1 = Solr::escapeQueryKeepField('abc_uui:(abc)', 0); |
| 60 | 56 | $this->assertEquals('abc_uui\:(abc)', $query1); |
| 61 | 57 | } |
@@ -63,8 +59,7 @@ discard block |
||
| 63 | 59 | /** |
| 64 | 60 | * @test |
| 65 | 61 | */ |
| 66 | - public function canGetNextCoreNumber() |
|
| 67 | - { |
|
| 62 | + public function canGetNextCoreNumber() { |
|
| 68 | 63 | $this->assertEquals(5, Solr::getNextCoreNumber()); |
| 69 | 64 | $this->assertEquals(5, Solr::getNextCoreNumber()); |
| 70 | 65 | Solr::createCore(); |
@@ -74,8 +69,7 @@ discard block |
||
| 74 | 69 | /** |
| 75 | 70 | * @test |
| 76 | 71 | */ |
| 77 | - public function canSearchRaw() |
|
| 78 | - { |
|
| 72 | + public function canSearchRaw() { |
|
| 79 | 73 | $this->setUpData(self::$databaseFixtures); |
| 80 | 74 | $solr = $this->setUpSolr(4, 0, self::$solrFixtures); |
| 81 | 75 | $resultSet = $solr->searchRaw(['core' => 4, 'collection' => 1]); |
@@ -92,8 +86,7 @@ discard block |
||
| 92 | 86 | $this->initializeRepository(DocumentRepository::class, 0); |
| 93 | 87 | } |
| 94 | 88 | |
| 95 | - protected function setUpSolr($uid, $storagePid, $solrFixtures) |
|
| 96 | - { |
|
| 89 | + protected function setUpSolr($uid, $storagePid, $solrFixtures) { |
|
| 97 | 90 | $solrCoreRepository = $this->initializeRepository(SolrCoreRepository::class, $storagePid); |
| 98 | 91 | |
| 99 | 92 | // Setup Solr only once for all tests in this suite |
@@ -91,8 +91,7 @@ discard block |
||
| 91 | 91 | */ |
| 92 | 92 | protected $httpClient; |
| 93 | 93 | |
| 94 | - public function __construct() |
|
| 95 | - { |
|
| 94 | + public function __construct() { |
|
| 96 | 95 | parent::__construct(); |
| 97 | 96 | |
| 98 | 97 | $this->configurationToUseInTestInstance['EXTENSIONS']['dlf'] = $this->getDlfConfiguration(); |
@@ -120,8 +119,7 @@ discard block |
||
| 120 | 119 | $this->addSiteConfig('dlf-testing'); |
| 121 | 120 | } |
| 122 | 121 | |
| 123 | - protected function getDlfConfiguration() |
|
| 124 | - { |
|
| 122 | + protected function getDlfConfiguration() { |
|
| 125 | 123 | $dotenv = Dotenv::createImmutable('/home/runner/work/kitodo-presentation/kitodo-presentation/Build/Test/', 'test.env'); |
| 126 | 124 | $dotenv->load(); |
| 127 | 125 | |
@@ -162,8 +160,7 @@ discard block |
||
| 162 | 160 | ]; |
| 163 | 161 | } |
| 164 | 162 | |
| 165 | - protected function addSiteConfig($identifier) |
|
| 166 | - { |
|
| 163 | + protected function addSiteConfig($identifier) { |
|
| 167 | 164 | $siteConfig = Yaml::parseFile(__DIR__ . '/../Fixtures/siteconfig.yaml'); |
| 168 | 165 | $siteConfig['base'] = $this->baseUrl; |
| 169 | 166 | $siteConfig['languages'][0]['base'] = $this->baseUrl; |
@@ -173,8 +170,7 @@ discard block |
||
| 173 | 170 | file_put_contents($siteConfigPath . '/config.yaml', Yaml::dump($siteConfig)); |
| 174 | 171 | } |
| 175 | 172 | |
| 176 | - protected function initializeRepository(string $className, int $storagePid) |
|
| 177 | - { |
|
| 173 | + protected function initializeRepository(string $className, int $storagePid) { |
|
| 178 | 174 | $repository = $this->objectManager->get($className); |
| 179 | 175 | |
| 180 | 176 | $querySettings = $this->objectManager->get(Typo3QuerySettings::class); |
@@ -184,8 +180,7 @@ discard block |
||
| 184 | 180 | return $repository; |
| 185 | 181 | } |
| 186 | 182 | |
| 187 | - protected function importSolrDocuments(Solr $solr, string $path) |
|
| 188 | - { |
|
| 183 | + protected function importSolrDocuments(Solr $solr, string $path) { |
|
| 189 | 184 | $jsonDocuments = json_decode(file_get_contents($path), true); |
| 190 | 185 | |
| 191 | 186 | $updateQuery = $solr->service->createUpdate(); |
@@ -204,16 +199,14 @@ discard block |
||
| 204 | 199 | $solr->service->update($updateQuery); |
| 205 | 200 | } |
| 206 | 201 | |
| 207 | - protected function initLanguageService(string $locale) |
|
| 208 | - { |
|
| 202 | + protected function initLanguageService(string $locale) { |
|
| 209 | 203 | $GLOBALS['LANG'] = GeneralUtility::makeInstance(LanguageServiceFactory::class)->create($locale); |
| 210 | 204 | } |
| 211 | 205 | |
| 212 | 206 | /** |
| 213 | 207 | * Assert that $sub is recursively contained within $super. |
| 214 | 208 | */ |
| 215 | - protected function assertArrayMatches(array $sub, array $super, string $message = '') |
|
| 216 | - { |
|
| 209 | + protected function assertArrayMatches(array $sub, array $super, string $message = '') { |
|
| 217 | 210 | self::assertEquals($sub, ArrayUtility::intersectRecursive($super, $sub), $message); |
| 218 | 211 | } |
| 219 | 212 | } |
@@ -31,8 +31,7 @@ |
||
| 31 | 31 | * |
| 32 | 32 | * @access public |
| 33 | 33 | */ |
| 34 | -class DeleteCommand extends BaseCommand |
|
| 35 | -{ |
|
| 34 | +class DeleteCommand extends BaseCommand { |
|
| 36 | 35 | |
| 37 | 36 | /** |
| 38 | 37 | * Configure the command by defining the name, options and arguments |
@@ -75,8 +75,7 @@ discard block |
||
| 75 | 75 | * @property array $mimeTypes this holds the mime types of linked resources in the manifest (extracted during parsing) for later us |
| 76 | 76 | * |
| 77 | 77 | */ |
| 78 | -final class IiifManifest extends AbstractDocument |
|
| 79 | -{ |
|
| 78 | +final class IiifManifest extends AbstractDocument { |
|
| 80 | 79 | /** |
| 81 | 80 | * @access protected |
| 82 | 81 | * @var string This holds the manifest file as string for serialization purposes |
@@ -229,8 +228,7 @@ discard block |
||
| 229 | 228 | * |
| 230 | 229 | * @return array|string |
| 231 | 230 | */ |
| 232 | - protected function getUseGroups(string $use) |
|
| 233 | - { |
|
| 231 | + protected function getUseGroups(string $use) { |
|
| 234 | 232 | if (!$this->useGrpsLoaded) { |
| 235 | 233 | // Get configured USE attributes. |
| 236 | 234 | $extConf = GeneralUtility::makeInstance(ExtensionConfiguration::class)->get(self::$extKey, 'files'); |
@@ -34,8 +34,7 @@ discard block |
||
| 34 | 34 | * |
| 35 | 35 | * @access public |
| 36 | 36 | */ |
| 37 | -class PageViewProxy |
|
| 38 | -{ |
|
| 37 | +class PageViewProxy { |
|
| 39 | 38 | /** |
| 40 | 39 | * @access protected |
| 41 | 40 | * @var RequestFactory |
@@ -55,8 +54,7 @@ discard block |
||
| 55 | 54 | * |
| 56 | 55 | * @return void |
| 57 | 56 | */ |
| 58 | - public function __construct() |
|
| 59 | - { |
|
| 57 | + public function __construct() { |
|
| 60 | 58 | $this->requestFactory = GeneralUtility::makeInstance(RequestFactory::class); |
| 61 | 59 | $this->extConf = GeneralUtility::makeInstance(ExtensionConfiguration::class)->get('dlf', 'general'); |
| 62 | 60 | } |