@@ -6,8 +6,7 @@ discard block |
||
| 6 | 6 | use Kitodo\Dlf\Tests\Functional\FunctionalTestCase; |
| 7 | 7 | use TYPO3\CMS\Core\Localization\LanguageService; |
| 8 | 8 | |
| 9 | -class HelperTest extends FunctionalTestCase |
|
| 10 | -{ |
|
| 9 | +class HelperTest extends FunctionalTestCase { |
|
| 11 | 10 | public function setUp(): void |
| 12 | 11 | { |
| 13 | 12 | parent::setUp(); |
@@ -19,8 +18,7 @@ discard block |
||
| 19 | 18 | /** |
| 20 | 19 | * @test |
| 21 | 20 | */ |
| 22 | - public function canGetIndexNameFromUid() |
|
| 23 | - { |
|
| 21 | + public function canGetIndexNameFromUid() { |
|
| 24 | 22 | // Repeat to make sure caching isn't broken |
| 25 | 23 | for ($n = 0; $n < 2; $n++) { |
| 26 | 24 | // Good UID, no PID |
@@ -69,8 +67,7 @@ discard block |
||
| 69 | 67 | * @test |
| 70 | 68 | * @group getLanguageName |
| 71 | 69 | */ |
| 72 | - public function canTranslateLanguageNameToEnglish() |
|
| 73 | - { |
|
| 70 | + public function canTranslateLanguageNameToEnglish() { |
|
| 74 | 71 | // NOTE: This only tests in BE mode |
| 75 | 72 | |
| 76 | 73 | $this->initLanguageService('default'); |
@@ -84,8 +81,7 @@ discard block |
||
| 84 | 81 | * @test |
| 85 | 82 | * @group getLanguageName |
| 86 | 83 | */ |
| 87 | - public function canTranslateLanguageNameToGerman() |
|
| 88 | - { |
|
| 84 | + public function canTranslateLanguageNameToGerman() { |
|
| 89 | 85 | // NOTE: This only tests in BE mode |
| 90 | 86 | |
| 91 | 87 | $this->initLanguageService('de'); |
@@ -5,8 +5,7 @@ discard block |
||
| 5 | 5 | use Kitodo\Dlf\Common\Doc; |
| 6 | 6 | use Kitodo\Dlf\Tests\Functional\FunctionalTestCase; |
| 7 | 7 | |
| 8 | -class MetsDocumentTest extends FunctionalTestCase |
|
| 9 | -{ |
|
| 8 | +class MetsDocumentTest extends FunctionalTestCase { |
|
| 10 | 9 | public function setUp(): void |
| 11 | 10 | { |
| 12 | 11 | parent::setUp(); |
@@ -15,8 +14,7 @@ discard block |
||
| 15 | 14 | $this->importDataSet(__DIR__ . '/../../Fixtures/MetsDocument/metadata_mets.xml'); |
| 16 | 15 | } |
| 17 | 16 | |
| 18 | - protected function doc(string $file) |
|
| 19 | - { |
|
| 17 | + protected function doc(string $file) { |
|
| 20 | 18 | $url = 'http://web:8001/Tests/Fixtures/MetsDocument/' . $file; |
| 21 | 19 | $doc = Doc::getInstance($url); |
| 22 | 20 | $this->assertNotNull($doc); |
@@ -26,8 +24,7 @@ discard block |
||
| 26 | 24 | /** |
| 27 | 25 | * @test |
| 28 | 26 | */ |
| 29 | - public function canParseDmdAndAmdSec() |
|
| 30 | - { |
|
| 27 | + public function canParseDmdAndAmdSec() { |
|
| 31 | 28 | $doc = $this->doc('av_beispiel.xml'); |
| 32 | 29 | |
| 33 | 30 | $titledata = $doc->getTitledata(20000); |
@@ -45,8 +42,7 @@ discard block |
||
| 45 | 42 | /** |
| 46 | 43 | * @test |
| 47 | 44 | */ |
| 48 | - public function canReadFileMetadata() |
|
| 49 | - { |
|
| 45 | + public function canReadFileMetadata() { |
|
| 50 | 46 | $doc = $this->doc('av_beispiel.xml'); |
| 51 | 47 | |
| 52 | 48 | $thumbsMeta = $doc->getMetadata('FILE_0000_THUMBS', 20000); |
@@ -61,8 +57,7 @@ discard block |
||
| 61 | 57 | /** |
| 62 | 58 | * @test |
| 63 | 59 | */ |
| 64 | - public function canGetLogicalStructure() |
|
| 65 | - { |
|
| 60 | + public function canGetLogicalStructure() { |
|
| 66 | 61 | $doc = $this->doc('av_beispiel.xml'); |
| 67 | 62 | |
| 68 | 63 | $toc = $doc->tableOfContents[0] ?? []; |
@@ -98,8 +93,7 @@ discard block |
||
| 98 | 93 | /** |
| 99 | 94 | * @test |
| 100 | 95 | */ |
| 101 | - public function doesNotOverwriteFirstDmdSec() |
|
| 102 | - { |
|
| 96 | + public function doesNotOverwriteFirstDmdSec() { |
|
| 103 | 97 | $doc = $this->doc('two_dmdsec.xml'); |
| 104 | 98 | |
| 105 | 99 | $titledata = $doc->getTitledata(20000); |
@@ -112,8 +106,7 @@ discard block |
||
| 112 | 106 | /** |
| 113 | 107 | * @test |
| 114 | 108 | */ |
| 115 | - public function returnsEmptyMetadataWhenNoDmdSec() |
|
| 116 | - { |
|
| 109 | + public function returnsEmptyMetadataWhenNoDmdSec() { |
|
| 117 | 110 | $doc = $this->doc('two_dmdsec.xml'); |
| 118 | 111 | |
| 119 | 112 | // DMD and AMD works |
@@ -67,8 +67,7 @@ discard block |
||
| 67 | 67 | */ |
| 68 | 68 | protected $httpClient; |
| 69 | 69 | |
| 70 | - public function __construct() |
|
| 71 | - { |
|
| 70 | + public function __construct() { |
|
| 72 | 71 | parent::__construct(); |
| 73 | 72 | |
| 74 | 73 | $this->configurationToUseInTestInstance['EXTENSIONS']['dlf'] = $this->getDlfConfiguration(); |
@@ -95,8 +94,7 @@ discard block |
||
| 95 | 94 | $this->addSiteConfig('dlf-testing', $this->baseUrl); |
| 96 | 95 | } |
| 97 | 96 | |
| 98 | - protected function getDlfConfiguration() |
|
| 99 | - { |
|
| 97 | + protected function getDlfConfiguration() { |
|
| 100 | 98 | return [ |
| 101 | 99 | 'fileGrpImages' => 'DEFAULT,MAX', |
| 102 | 100 | 'fileGrpThumbs' => 'THUMBS', |
@@ -134,8 +132,7 @@ discard block |
||
| 134 | 132 | ]; |
| 135 | 133 | } |
| 136 | 134 | |
| 137 | - protected function addSiteConfig($identifier, $baseUrl) |
|
| 138 | - { |
|
| 135 | + protected function addSiteConfig($identifier, $baseUrl) { |
|
| 139 | 136 | $siteConfig = Yaml::parseFile(__DIR__ . '/../Fixtures/siteconfig.yaml'); |
| 140 | 137 | $siteConfig['base'] = $baseUrl; |
| 141 | 138 | $siteConfig['languages'][0]['base'] = $baseUrl; |
@@ -145,8 +142,7 @@ discard block |
||
| 145 | 142 | file_put_contents($siteConfigPath . '/config.yaml', Yaml::dump($siteConfig)); |
| 146 | 143 | } |
| 147 | 144 | |
| 148 | - protected function initializeRepository(string $className, int $storagePid) |
|
| 149 | - { |
|
| 145 | + protected function initializeRepository(string $className, int $storagePid) { |
|
| 150 | 146 | $repository = $this->objectManager->get($className); |
| 151 | 147 | |
| 152 | 148 | $querySettings = $this->objectManager->get(Typo3QuerySettings::class); |
@@ -156,8 +152,7 @@ discard block |
||
| 156 | 152 | return $repository; |
| 157 | 153 | } |
| 158 | 154 | |
| 159 | - protected function importSolrDocuments(Solr $solr, string $path) |
|
| 160 | - { |
|
| 155 | + protected function importSolrDocuments(Solr $solr, string $path) { |
|
| 161 | 156 | $jsonDocuments = json_decode(file_get_contents($path), true); |
| 162 | 157 | |
| 163 | 158 | $updateQuery = $solr->service->createUpdate(); |
@@ -176,8 +171,7 @@ discard block |
||
| 176 | 171 | $solr->service->update($updateQuery); |
| 177 | 172 | } |
| 178 | 173 | |
| 179 | - protected function initLanguageService(string $locale) |
|
| 180 | - { |
|
| 174 | + protected function initLanguageService(string $locale) { |
|
| 181 | 175 | if (class_exists(\TYPO3\CMS\Core\Localization\LanguageServiceFactory::class)) { |
| 182 | 176 | $GLOBALS['LANG'] = GeneralUtility::makeInstance(\TYPO3\CMS\Core\Localization\LanguageServiceFactory::class)->create($locale); |
| 183 | 177 | } else { |
@@ -193,8 +187,7 @@ discard block |
||
| 193 | 187 | /** |
| 194 | 188 | * Assert that $sub is recursively contained within $super. |
| 195 | 189 | */ |
| 196 | - protected function assertArrayMatches(array $sub, array $super, string $message = '') |
|
| 197 | - { |
|
| 190 | + protected function assertArrayMatches(array $sub, array $super, string $message = '') { |
|
| 198 | 191 | $this->assertEquals($sub, ArrayUtility::intersectRecursive($super, $sub), $message); |
| 199 | 192 | } |
| 200 | 193 | } |
@@ -28,8 +28,7 @@ discard block |
||
| 28 | 28 | * @subpackage dlf |
| 29 | 29 | * @access public |
| 30 | 30 | */ |
| 31 | -class ItemsProcFunc implements LoggerAwareInterface |
|
| 32 | -{ |
|
| 31 | +class ItemsProcFunc implements LoggerAwareInterface { |
|
| 33 | 32 | use LoggerAwareTrait; |
| 34 | 33 | |
| 35 | 34 | /** |
@@ -46,8 +45,7 @@ discard block |
||
| 46 | 45 | * |
| 47 | 46 | * @return void |
| 48 | 47 | */ |
| 49 | - public function toolList(&$params) |
|
| 50 | - { |
|
| 48 | + public function toolList(&$params) { |
|
| 51 | 49 | foreach ($GLOBALS['TYPO3_CONF_VARS']['SC_OPTIONS']['dlf/Classes/Plugin/Toolbox.php']['tools'] as $class => $label) { |
| 52 | 50 | $params['items'][] = [Helper::getLanguageService()->sL($label), $class]; |
| 53 | 51 | } |
@@ -97,8 +95,7 @@ discard block |
||
| 97 | 95 | * |
| 98 | 96 | * @return void |
| 99 | 97 | */ |
| 100 | - public function extendedSearchList(&$params) |
|
| 101 | - { |
|
| 98 | + public function extendedSearchList(&$params) { |
|
| 102 | 99 | $this->generateList( |
| 103 | 100 | $params, |
| 104 | 101 | 'label,index_name', |
@@ -139,8 +136,7 @@ discard block |
||
| 139 | 136 | * |
| 140 | 137 | * @return void |
| 141 | 138 | */ |
| 142 | - protected function generateList(&$params, $fields, $table, $sorting, $andWhere = '') |
|
| 143 | - { |
|
| 139 | + protected function generateList(&$params, $fields, $table, $sorting, $andWhere = '') { |
|
| 144 | 140 | $this->getTyposcriptConfigFromPluginSiteRoot($params); |
| 145 | 141 | |
| 146 | 142 | $queryBuilder = GeneralUtility::makeInstance(ConnectionPool::class) |
@@ -24,8 +24,7 @@ discard block |
||
| 24 | 24 | * @subpackage dlf |
| 25 | 25 | * @access public |
| 26 | 26 | */ |
| 27 | -class TableOfContentsController extends AbstractController |
|
| 28 | -{ |
|
| 27 | +class TableOfContentsController extends AbstractController { |
|
| 29 | 28 | /** |
| 30 | 29 | * This holds the active entries according to the currently selected page |
| 31 | 30 | * |
@@ -45,8 +44,7 @@ discard block |
||
| 45 | 44 | * |
| 46 | 45 | * @return void |
| 47 | 46 | */ |
| 48 | - public function filterAction() |
|
| 49 | - { |
|
| 47 | + public function filterAction() { |
|
| 50 | 48 | // if filter was triggered, get filter parameters from POST variables |
| 51 | 49 | $this->filterParams = $this->getParametersSafely('filterParameter'); |
| 52 | 50 | |
@@ -59,8 +57,7 @@ discard block |
||
| 59 | 57 | * |
| 60 | 58 | * @return void |
| 61 | 59 | */ |
| 62 | - public function mainAction() |
|
| 63 | - { |
|
| 60 | + public function mainAction() { |
|
| 64 | 61 | // Load current document. |
| 65 | 62 | $this->loadDocument($this->requestData); |
| 66 | 63 | if ( |
@@ -91,8 +88,7 @@ discard block |
||
| 91 | 88 | * @access protected |
| 92 | 89 | * @return array HMENU array |
| 93 | 90 | */ |
| 94 | - protected function makeMenuArray() |
|
| 95 | - { |
|
| 91 | + protected function makeMenuArray() { |
|
| 96 | 92 | // Set default values for page if not set. |
| 97 | 93 | // $this->requestData['page'] may be integer or string (physical structure @ID) |
| 98 | 94 | if ( |
@@ -168,8 +164,7 @@ discard block |
||
| 168 | 164 | * |
| 169 | 165 | * @return array HMENU array |
| 170 | 166 | */ |
| 171 | - protected function makeMenuFor3DObjects() |
|
| 172 | - { |
|
| 167 | + protected function makeMenuFor3DObjects() { |
|
| 173 | 168 | $menuArray = []; |
| 174 | 169 | |
| 175 | 170 | // Go through table of contents and create all menu entries. |
@@ -192,8 +187,7 @@ discard block |
||
| 192 | 187 | * |
| 193 | 188 | * @return array HMENU array for menu entry |
| 194 | 189 | */ |
| 195 | - protected function getMenuEntry(array $entry, $recursive = false) |
|
| 196 | - { |
|
| 190 | + protected function getMenuEntry(array $entry, $recursive = false) { |
|
| 197 | 191 | $entry = $this->resolveMenuEntry($entry); |
| 198 | 192 | |
| 199 | 193 | $entryArray = []; |
@@ -287,8 +281,7 @@ discard block |
||
| 287 | 281 | * @param array $entry |
| 288 | 282 | * @return array |
| 289 | 283 | */ |
| 290 | - protected function resolveMenuEntry($entry) |
|
| 291 | - { |
|
| 284 | + protected function resolveMenuEntry($entry) { |
|
| 292 | 285 | // If the menu entry points to the parent document, |
| 293 | 286 | // resolve to the parent UID set on indexation. |
| 294 | 287 | $doc = $this->document->getDoc(); |
@@ -304,8 +297,7 @@ discard block |
||
| 304 | 297 | return $entry; |
| 305 | 298 | } |
| 306 | 299 | |
| 307 | - protected function getMenuEntryWithImage(array $entry, $recursive = false) |
|
| 308 | - { |
|
| 300 | + protected function getMenuEntryWithImage(array $entry, $recursive = false) { |
|
| 309 | 301 | $entryArray = []; |
| 310 | 302 | |
| 311 | 303 | // don't filter if the entry type is collection or search params are empty |
@@ -31,8 +31,7 @@ discard block |
||
| 31 | 31 | * @subpackage dlf |
| 32 | 32 | * @access public |
| 33 | 33 | */ |
| 34 | -class BasketController extends AbstractController |
|
| 35 | -{ |
|
| 34 | +class BasketController extends AbstractController { |
|
| 36 | 35 | /** |
| 37 | 36 | * @var BasketRepository |
| 38 | 37 | */ |
@@ -41,8 +40,7 @@ discard block |
||
| 41 | 40 | /** |
| 42 | 41 | * @param BasketRepository $basketRepository |
| 43 | 42 | */ |
| 44 | - public function injectBasketRepository(BasketRepository $basketRepository) |
|
| 45 | - { |
|
| 43 | + public function injectBasketRepository(BasketRepository $basketRepository) { |
|
| 46 | 44 | $this->basketRepository = $basketRepository; |
| 47 | 45 | } |
| 48 | 46 | |
@@ -54,8 +52,7 @@ discard block |
||
| 54 | 52 | /** |
| 55 | 53 | * @param MailRepository $mailRepository |
| 56 | 54 | */ |
| 57 | - public function injectMailRepository(MailRepository $mailRepository) |
|
| 58 | - { |
|
| 55 | + public function injectMailRepository(MailRepository $mailRepository) { |
|
| 59 | 56 | $this->mailRepository = $mailRepository; |
| 60 | 57 | } |
| 61 | 58 | |
@@ -67,8 +64,7 @@ discard block |
||
| 67 | 64 | /** |
| 68 | 65 | * @param PrinterRepository $printerRepository |
| 69 | 66 | */ |
| 70 | - public function injectPrinterRepository(PrinterRepository $printerRepository) |
|
| 71 | - { |
|
| 67 | + public function injectPrinterRepository(PrinterRepository $printerRepository) { |
|
| 72 | 68 | $this->printerRepository = $printerRepository; |
| 73 | 69 | } |
| 74 | 70 | |
@@ -80,8 +76,7 @@ discard block |
||
| 80 | 76 | /** |
| 81 | 77 | * @param ActionLogRepository $actionLogRepository |
| 82 | 78 | */ |
| 83 | - public function injectActionLogRepository(ActionLogRepository $actionLogRepository) |
|
| 84 | - { |
|
| 79 | + public function injectActionLogRepository(ActionLogRepository $actionLogRepository) { |
|
| 85 | 80 | $this->actionLogRepository = $actionLogRepository; |
| 86 | 81 | } |
| 87 | 82 | |
@@ -90,8 +85,7 @@ discard block |
||
| 90 | 85 | * |
| 91 | 86 | * @return void |
| 92 | 87 | */ |
| 93 | - public function basketAction() |
|
| 94 | - { |
|
| 88 | + public function basketAction() { |
|
| 95 | 89 | $basket = $this->getBasketData(); |
| 96 | 90 | |
| 97 | 91 | // action remove from basket |
@@ -137,8 +131,7 @@ discard block |
||
| 137 | 131 | * |
| 138 | 132 | * @return void |
| 139 | 133 | */ |
| 140 | - public function addAction() |
|
| 141 | - { |
|
| 134 | + public function addAction() { |
|
| 142 | 135 | $basket = $this->getBasketData(); |
| 143 | 136 | |
| 144 | 137 | if ( |
@@ -156,8 +149,7 @@ discard block |
||
| 156 | 149 | * |
| 157 | 150 | * @return void |
| 158 | 151 | */ |
| 159 | - public function mainAction() |
|
| 160 | - { |
|
| 152 | + public function mainAction() { |
|
| 161 | 153 | $basket = $this->getBasketData(); |
| 162 | 154 | |
| 163 | 155 | $countDocs = 0; |
@@ -203,8 +195,7 @@ discard block |
||
| 203 | 195 | * |
| 204 | 196 | * @return Basket The found data from user session. |
| 205 | 197 | */ |
| 206 | - protected function getBasketData() |
|
| 207 | - { |
|
| 198 | + protected function getBasketData() { |
|
| 208 | 199 | // get user session |
| 209 | 200 | $sessionId = $GLOBALS['TSFE']->fe_user->id; |
| 210 | 201 | |
@@ -238,8 +229,7 @@ discard block |
||
| 238 | 229 | * |
| 239 | 230 | * @return string One basket entry |
| 240 | 231 | */ |
| 241 | - protected function getEntry($data) |
|
| 242 | - { |
|
| 232 | + protected function getEntry($data) { |
|
| 243 | 233 | if (is_object($data)) { |
| 244 | 234 | $data = get_object_vars($data); |
| 245 | 235 | } |
@@ -291,8 +281,7 @@ discard block |
||
| 291 | 281 | * |
| 292 | 282 | * @return mixed download url or false |
| 293 | 283 | */ |
| 294 | - protected function getDocumentData($id, $data) |
|
| 295 | - { |
|
| 284 | + protected function getDocumentData($id, $data) { |
|
| 296 | 285 | // get document instance to load further information |
| 297 | 286 | $this->loadDocument(['id' => $id]); |
| 298 | 287 | if ($this->document) { |
@@ -360,8 +349,7 @@ discard block |
||
| 360 | 349 | * |
| 361 | 350 | * @return array Basket data and JavaScript output |
| 362 | 351 | */ |
| 363 | - protected function addToBasket($_piVars, $basket) |
|
| 364 | - { |
|
| 352 | + protected function addToBasket($_piVars, $basket) { |
|
| 365 | 353 | $output = ''; |
| 366 | 354 | |
| 367 | 355 | if (!$_piVars['startpage']) { |
@@ -468,8 +456,7 @@ discard block |
||
| 468 | 456 | * |
| 469 | 457 | * @return Basket basket |
| 470 | 458 | */ |
| 471 | - protected function removeFromBasket($_piVars, $basket) |
|
| 472 | - { |
|
| 459 | + protected function removeFromBasket($_piVars, $basket) { |
|
| 473 | 460 | if (!empty($basket->getDocIds())) { |
| 474 | 461 | $items = json_decode($basket->getDocIds()); |
| 475 | 462 | $items = get_object_vars($items); |
@@ -507,8 +494,7 @@ discard block |
||
| 507 | 494 | * |
| 508 | 495 | * @return void |
| 509 | 496 | */ |
| 510 | - protected function sendMail() |
|
| 511 | - { |
|
| 497 | + protected function sendMail() { |
|
| 512 | 498 | // send mail |
| 513 | 499 | $mailId = $this->requestData['mail_action']; |
| 514 | 500 | |
@@ -585,8 +571,7 @@ discard block |
||
| 585 | 571 | * |
| 586 | 572 | * @return void |
| 587 | 573 | */ |
| 588 | - protected function printDocument($basket) |
|
| 589 | - { |
|
| 574 | + protected function printDocument($basket) { |
|
| 590 | 575 | $pdfUrl = $this->settings['pdfprint']; |
| 591 | 576 | $numberOfPages = 0; |
| 592 | 577 | foreach ($this->requestData['selected'] as $docId => $docValue) { |
@@ -46,8 +46,7 @@ |
||
| 46 | 46 | * |
| 47 | 47 | * @return void |
| 48 | 48 | */ |
| 49 | - public function extractMetadata(\SimpleXMLElement $xml, array &$metadata) |
|
| 50 | - { |
|
| 49 | + public function extractMetadata(\SimpleXMLElement $xml, array &$metadata) { |
|
| 51 | 50 | $this->xml = $xml; |
| 52 | 51 | $this->metadata = $metadata; |
| 53 | 52 | |