Erikmitk / kitodo-presentation

Classes/ViewHelpers/JsFooterViewHelper.php

Braces +2 added lines, -4 removed lines

@@ -19,13 +19,11 @@
 /**
  * Add inline JavaScript code to footer *
  */
-class JsFooterViewHelper extends AbstractViewHelper
-{
+class JsFooterViewHelper extends AbstractViewHelper {
     /**
      * Initialize arguments.
      */
-    public function initializeArguments()
-    {
+    public function initializeArguments() {
         parent::initializeArguments();
         $this->registerArgument('inlineCode', 'string', 'Inline JavaScript', true);
     }

Classes/Controller/PageViewController.php

Braces +6 added lines, -12 removed lines

@@ -26,8 +26,7 @@ 
  * @subpackage dlf
  * @access public
  */
-class PageViewController extends AbstractController
-{
+class PageViewController extends AbstractController {
     /**
      * Holds the controls to add to the map
      *
@@ -65,8 +64,7 @@ 
      *
      * @return void
      */
-    public function mainAction()
-    {
+    public function mainAction() {
         // Load current document.
         $this->loadDocument($this->requestData);
         if (
@@ -121,8 +119,7 @@ 
      *
      * @return array URL and MIME type of fulltext file
      */
-    protected function getFulltext($page)
-    {
+    protected function getFulltext($page) {
         $fulltext = [];
         // Get fulltext link.
         $fileGrpsFulltext = GeneralUtility::trimExplode(',', $this->extConf['fileGrpFulltext']);
@@ -162,8 +159,7 @@ 
      *
      * @return void
      */
-    protected function addViewerJS()
-    {
+    protected function addViewerJS() {
         // Viewer configuration.
         $viewerConfiguration = '$(document).ready(function() {
                 if (dlfUtils.exists(dlfViewer)) {
@@ -189,8 +185,7 @@ 
      * @return array An array containing the IRIs of the AnnotationLists / AnnotationPages as well as
      *               some information about the canvas.
      */
-    protected function getAnnotationContainers($page)
-    {
+    protected function getAnnotationContainers($page) {
         if ($this->document->getDoc() instanceof IiifManifest) {
             $canvasId = $this->document->getDoc()->physicalStructure[$page];
             $iiif = $this->document->getDoc()->getIiif();
@@ -246,8 +241,7 @@ 
      *
      * @return array URL and MIME type of image file
      */
-    protected function getImage($page)
-    {
+    protected function getImage($page) {
         $image = [];
         // Get @USE value of METS fileGrp.
         $fileGrpsImages = GeneralUtility::trimExplode(',', $this->extConf['fileGrpImages']);

Classes/Common/Helper.php

Braces +24 added lines, -48 removed lines

@@ -31,8 +31,7 @@ 
  * @subpackage dlf
  * @access public
  */
-class Helper
-{
+class Helper {
     /**
      * The extension key
      *
@@ -80,8 +79,7 @@ 
      *
      * @return \TYPO3\CMS\Core\Messaging\FlashMessageQueue The queue the message was added to
      */
-    public static function addMessage($message, $title, $severity, $session = false, $queue = 'kitodo.default.flashMessages')
-    {
+    public static function addMessage($message, $title, $severity, $session = false, $queue = 'kitodo.default.flashMessages') {
         $flashMessageService = GeneralUtility::makeInstance(\TYPO3\CMS\Core\Messaging\FlashMessageService::class);
         $flashMessageQueue = $flashMessageService->getMessageQueueByIdentifier($queue);
         $flashMessage = GeneralUtility::makeInstance(
@@ -106,8 +104,7 @@ 
      *
      * @return bool Is $id a valid GNL identifier of the given $type?
      */
-    public static function checkIdentifier($id, $type)
-    {
+    public static function checkIdentifier($id, $type) {
         $digits = substr($id, 0, 8);
         $checksum = 0;
         for ($i = 0, $j = strlen($digits); $i < $j; $i++) {
@@ -171,8 +168,7 @@ 
      *
      * @return mixed The decrypted value or false on error
      */
-    public static function decrypt($encrypted)
-    {
+    public static function decrypt($encrypted) {
         if (
             !in_array(self::$cipherAlgorithm, openssl_get_cipher_methods(true))
             || !in_array(self::$hashAlgorithm, openssl_get_md_methods(true))
@@ -211,8 +207,7 @@ 
      *
      * @return \SimpleXMLElement|false
      */
-    public static function getXmlFileAsString($content)
-    {
+    public static function getXmlFileAsString($content) {
         // Don't make simplexml_load_string throw (when $content is an array
         // or object)
         if (!is_string($content)) {
@@ -243,8 +238,7 @@ 
      *
      * @return void
      */
-    public static function log($message, $severity = 0)
-    {
+    public static function log($message, $severity = 0) {
         $logger = GeneralUtility::makeInstance(LogManager::class)->getLogger(get_called_class());
 
         switch ($severity) {
@@ -274,8 +268,7 @@ 
      *
      * @return mixed Hashed string or false on error
      */
-    public static function digest($string)
-    {
+    public static function digest($string) {
         if (!in_array(self::$hashAlgorithm, openssl_get_md_methods(true))) {
             self::log('OpenSSL library doesn\'t support hash algorithm', LOG_SEVERITY_ERROR);
             return false;
@@ -294,8 +287,7 @@ 
      *
      * @return mixed Encrypted string or false on error
      */
-    public static function encrypt($string)
-    {
+    public static function encrypt($string) {
         if (
             !in_array(self::$cipherAlgorithm, openssl_get_cipher_methods(true))
             || !in_array(self::$hashAlgorithm, openssl_get_md_methods(true))
@@ -328,8 +320,7 @@ 
      *
      * @return string The unqualified class name
      */
-    public static function getUnqualifiedClassName($qualifiedClassname)
-    {
+    public static function getUnqualifiedClassName($qualifiedClassname) {
         $nameParts = explode('\\', $qualifiedClassname);
         return end($nameParts);
     }
@@ -343,8 +334,7 @@ 
      *
      * @return string The cleaned up string
      */
-    public static function getCleanString($string)
-    {
+    public static function getCleanString($string) {
         // Convert to lowercase.
         $string = strtolower($string);
         // Remove non-alphanumeric characters.
@@ -365,8 +355,7 @@ 
      *
      * @return array Array of hook objects for the class
      */
-    public static function getHookObjects($scriptRelPath)
-    {
+    public static function getHookObjects($scriptRelPath) {
         $hookObjects = [];
         if (is_array($GLOBALS['TYPO3_CONF_VARS']['SC_OPTIONS'][self::$extKey . '/' . $scriptRelPath]['hookClass'])) {
             foreach ($GLOBALS['TYPO3_CONF_VARS']['SC_OPTIONS'][self::$extKey . '/' . $scriptRelPath]['hookClass'] as $classRef) {
@@ -387,8 +376,7 @@ 
      *
      * @return string "index_name" for the given UID
      */
-    public static function getIndexNameFromUid($uid, $table, $pid = -1)
-    {
+    public static function getIndexNameFromUid($uid, $table, $pid = -1) {
         // Sanitize input.
         $uid = max(intval($uid), 0);
         if (
@@ -438,8 +426,7 @@ 
      *
      * @return string Localized full name of language or unchanged input
      */
-    public static function getLanguageName($code)
-    {
+    public static function getLanguageName($code) {
         // Analyze code and set appropriate ISO table.
         $isoCode = strtolower(trim($code));
         if (preg_match('/^[a-z]{3}$/', $isoCode)) {
@@ -481,8 +468,7 @@ 
      *
      * @return array
      */
-    public static function getDocumentStructures($pid = -1)
-    {
+    public static function getDocumentStructures($pid = -1) {
         $connectionPool = GeneralUtility::makeInstance(ConnectionPool::class);
         $queryBuilder = $connectionPool->getQueryBuilderForTable('tx_dlf_structures');
 
@@ -522,8 +508,7 @@ 
      *
      * @return string Uniform Resource Name as string
      */
-    public static function getURN($base, $id)
-    {
+    public static function getURN($base, $id) {
         $concordance = [
             '0' => 1,
             '1' => 2,
@@ -590,8 +575,7 @@ 
      *
      * @return bool Is $id a valid PPN?
      */
-    public static function isPPN($id)
-    {
+    public static function isPPN($id) {
         return self::checkIdentifier($id, 'PPN');
     }
 
@@ -602,8 +586,7 @@ 
      *
      * @return bool
      */
-    public static function isValidHttpUrl($url)
-    {
+    public static function isValidHttpUrl($url) {
         if (!GeneralUtility::isValidUrl($url)) {
             return false;
         }
@@ -629,8 +612,7 @@ 
      *
      * @return array Merged array
      */
-    public static function mergeRecursiveWithOverrule(array $original, array $overrule, $addKeys = true, $includeEmptyValues = true, $enableUnsetFeature = true)
-    {
+    public static function mergeRecursiveWithOverrule(array $original, array $overrule, $addKeys = true, $includeEmptyValues = true, $enableUnsetFeature = true) {
         \TYPO3\CMS\Core\Utility\ArrayUtility::mergeRecursiveWithOverrule($original, $overrule, $addKeys, $includeEmptyValues, $enableUnsetFeature);
         return $original;
     }
@@ -644,8 +626,7 @@ 
      *
      * @return string All flash messages in the queue rendered as HTML.
      */
-    public static function renderFlashMessages($queue = 'kitodo.default.flashMessages')
-    {
+    public static function renderFlashMessages($queue = 'kitodo.default.flashMessages') {
         $flashMessageService = GeneralUtility::makeInstance(\TYPO3\CMS\Core\Messaging\FlashMessageService::class);
         $flashMessageQueue = $flashMessageService->getMessageQueueByIdentifier($queue);
         $flashMessages = $flashMessageQueue->getAllMessagesAndFlush();
@@ -665,8 +646,7 @@ 
      *
      * @return string Localized label for $index_name
      */
-    public static function translate($index_name, $table, $pid)
-    {
+    public static function translate($index_name, $table, $pid) {
         // Load labels into static variable for future use.
         static $labels = [];
         // Sanitize input.
@@ -794,8 +774,7 @@ 
      *
      * @return string Additional WHERE expression
      */
-    public static function whereExpression($table, $showHidden = false)
-    {
+    public static function whereExpression($table, $showHidden = false) {
         if (\TYPO3_MODE === 'FE') {
             // Should we ignore the record's hidden flag?
             $ignoreHide = 0;
@@ -827,8 +806,7 @@ 
      *
      * @access private
      */
-    private function __construct()
-    {
+    private function __construct() {
         // This is a static class, thus no instances should be created.
     }
 
@@ -854,8 +832,7 @@ 
      *
      * @access public
      */
-    public static function polyfillExtbaseClassesForTYPO3v9()
-    {
+    public static function polyfillExtbaseClassesForTYPO3v9() {
         $classes = require __DIR__ . '/../../Configuration/Extbase/Persistence/Classes.php';
 
         $objectManager = GeneralUtility::makeInstance(ObjectManager::class);
@@ -892,8 +869,7 @@ 
      *
      * @return string|bool
      */
-    public static function getUrl(string $url)
-    {
+    public static function getUrl(string $url) {
         if (!Helper::isValidHttpUrl($url)) {
             return false;
         }

Classes/Controller/SearchController.php

Braces +9 added lines, -18 removed lines

@@ -32,8 +32,7 @@ 
  * @subpackage dlf
  * @access public
  */
-class SearchController extends AbstractController
-{
+class SearchController extends AbstractController {
     /**
      * @var CollectionRepository
      */
@@ -42,8 +41,7 @@ 
     /**
      * @param CollectionRepository $collectionRepository
      */
-    public function injectCollectionRepository(CollectionRepository $collectionRepository)
-    {
+    public function injectCollectionRepository(CollectionRepository $collectionRepository) {
         $this->collectionRepository = $collectionRepository;
     }
 
@@ -55,8 +53,7 @@ 
     /**
      * @param MetadataRepository $metadataRepository
      */
-    public function injectMetadataRepository(MetadataRepository $metadataRepository)
-    {
+    public function injectMetadataRepository(MetadataRepository $metadataRepository) {
         $this->metadataRepository = $metadataRepository;
     }
 
@@ -71,8 +68,7 @@ 
      *
      * @return void
      */
-    public function searchAction()
-    {
+    public function searchAction() {
         // if search was triggered, get search parameters from POST variables
         $this->searchParams = $this->getParametersSafely('searchParameter');
 
@@ -87,8 +83,7 @@ 
      *
      * @return void
      */
-    public function mainAction()
-    {
+    public function mainAction() {
         $listViewSearch = false;
         // Quit without doing anything if required variables are not set.
         if (empty($this->settings['solrcore'])) {
@@ -174,8 +169,7 @@ 
      *
      * @return string HTML output of facets menu
      */
-    protected function addFacetsMenu()
-    {
+    protected function addFacetsMenu() {
         // Quit without doing anything if no facets are configured.
         if (empty($this->settings['facets']) && empty($this->settings['facetCollections'])) {
             return '';
@@ -200,8 +194,7 @@ 
      *
      * @return array HMENU array
      */
-    public function makeFacetsMenuArray($facets)
-    {
+    public function makeFacetsMenuArray($facets) {
         $menuArray = [];
         // Set default value for facet search.
         $search = [
@@ -360,8 +353,7 @@ 
      *
      * @return array The array for the facet's menu entry
      */
-    protected function getFacetsMenuEntry($field, $value, $count, $search, &$state)
-    {
+    protected function getFacetsMenuEntry($field, $value, $count, $search, &$state) {
         $entryArray = [];
         // Translate value.
         if ($field == 'owner_faceting') {
@@ -412,8 +404,7 @@ 
      *
      * @return string The extended search form or an empty string
      */
-    protected function addExtendedSearch()
-    {
+    protected function addExtendedSearch() {
         // Quit without doing anything if no fields for extended search are selected.
         if (
             empty($this->settings['extendedSlotCount'])

Tests/Unit/Common/HelperTest.php

Braces +2 added lines, -4 removed lines

@@ -5,10 +5,8 @@
 use Kitodo\Dlf\Common\Helper;
 use TYPO3\TestingFramework\Core\Unit\UnitTestCase;
 
-class HelperTest extends UnitTestCase
-{
-    public function assertInvalidXml($xml)
-    {
+class HelperTest extends UnitTestCase {
+    public function assertInvalidXml($xml) {
         $result = Helper::getXmlFileAsString($xml);
         $this->assertEquals(false, $result);
     }

Tests/Functional/FunctionalTestCase.php

Braces +5 added lines, -10 removed lines

@@ -12,8 +12,7 @@ 
  * Base class for functional test cases. This provides some common configuration
  * and collects utility methods for functional tests.
  */
-class FunctionalTestCase extends \TYPO3\TestingFramework\Core\Functional\FunctionalTestCase
-{
+class FunctionalTestCase extends \TYPO3\TestingFramework\Core\Functional\FunctionalTestCase {
     protected $testExtensionsToLoad = [
         'typo3conf/ext/dlf',
     ];
@@ -63,8 +62,7 @@ 
      */
     protected $httpClient;
 
-    public function __construct()
-    {
+    public function __construct() {
         parent::__construct();
 
         $this->configurationToUseInTestInstance['EXTENSIONS']['dlf'] = $this->getDlfConfiguration();
@@ -91,8 +89,7 @@ 
         $this->addSiteConfig('dlf-testing', $this->baseUrl);
     }
 
-    protected function getDlfConfiguration()
-    {
+    protected function getDlfConfiguration() {
         return [
             'solrFieldAutocomplete' => 'autocomplete',
             'solrFieldCollection' => 'collection',
@@ -124,8 +121,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;
@@ -135,8 +131,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);

Tests/Functional/Api/PageViewProxyTest.php

Braces +3 added lines, -6 removed lines

@@ -6,19 +6,16 @@
 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(), [
             'enableInternalProxy' => true,
         ]);
     }
 
-    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/Api/PageViewProxyDisabledTest.php

Braces +2 added lines, -4 removed lines

@@ -5,12 +5,10 @@
 use Kitodo\Dlf\Tests\Functional\FunctionalTestCase;
 use TYPO3\CMS\Core\Utility\GeneralUtility;
 
-class PageViewProxyDisabledTest extends FunctionalTestCase
-{
+class PageViewProxyDisabledTest extends FunctionalTestCase {
     protected $disableJsonWrappedResponse = true;
 
-    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/Api/OaiPmhTest.php

Braces +15 added lines, -30 removed lines

@@ -12,8 +12,7 @@ 
 use SimpleXMLElement;
 use TYPO3\CMS\Extbase\Persistence\Generic\PersistenceManager;
 
-class OaiPmhTest extends FunctionalTestCase
-{
+class OaiPmhTest extends FunctionalTestCase {
     protected $disableJsonWrappedResponse = true;
 
     protected $coreExtensionsToLoad = [
@@ -53,8 +52,7 @@ 
         $this->setUpOaiSolr();
     }
 
-    protected function setUpOaiSolr()
-    {
+    protected function setUpOaiSolr() {
         // Setup Solr only once for all tests in this suite
         static $solr = null;
 
@@ -71,8 +69,7 @@ 
         $this->persistenceManager->persistAll();
     }
 
-    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();
@@ -91,8 +88,7 @@ 
     /**
      * @test
      */
-    public function correctlyRespondsOnBadVerb()
-    {
+    public function correctlyRespondsOnBadVerb() {
         $client = new HttpClient();
         $response = $client->get($this->baseUrl, [
             'query' => [
@@ -117,8 +113,7 @@ 
     /**
      * @test
      */
-    public function canIdentify()
-    {
+    public function canIdentify() {
         $oai = Endpoint::build($this->oaiUrl);
         $identity = $oai->identify();
 
@@ -131,8 +126,7 @@ 
     /**
      * @test
      */
-    public function identifyGivesFallbackDatestampWhenNoDocuments()
-    {
+    public function identifyGivesFallbackDatestampWhenNoDocuments() {
         $oai = Endpoint::build($this->oaiUrlNoStoragePid);
         $identity = $oai->identify();
 
@@ -142,8 +136,7 @@ 
     /**
      * @test
      */
-    public function canListMetadataFormats()
-    {
+    public function canListMetadataFormats() {
         $oai = Endpoint::build($this->oaiUrl);
         $formats = $oai->listMetadataFormats();
 
@@ -158,8 +151,7 @@ 
     /**
      * @test
      */
-    public function canListRecords()
-    {
+    public function canListRecords() {
         $oai = Endpoint::build($this->oaiUrl);
         $result = $oai->listRecords('mets');
 
@@ -172,8 +164,7 @@ 
     /**
      * @test
      */
-    public function noRecordsUntil1900()
-    {
+    public function noRecordsUntil1900() {
         $this->expectException(OaipmhException::class);
         $this->expectExceptionMessage('empty list');
 
@@ -186,8 +177,7 @@ 
     /**
      * @test
      */
-    public function canUseResumptionToken()
-    {
+    public function canUseResumptionToken() {
         // NOTE: cursor and expirationDate are optional by the specification,
         //       but we include them in our implementation
 
@@ -245,8 +235,7 @@ 
     /**
      * @test
      */
-    public function noResumptionTokenForCompleteList()
-    {
+    public function noResumptionTokenForCompleteList() {
         $client = new HttpClient();
 
         foreach (['ListIdentifiers', 'ListRecords'] as $verb) {
@@ -268,8 +257,7 @@ 
     /**
      * @test
      */
-    public function canListAndResumeIdentifiers()
-    {
+    public function canListAndResumeIdentifiers() {
         $oai = Endpoint::build($this->oaiUrl);
         $result = $oai->listIdentifiers('mets');
 
@@ -282,18 +270,15 @@ 
         $this->assertEquals('oai:de:slub-dresden:db:id-476248086', $record->identifier);
     }
 
-    protected function parseUtc(string $dateTime)
-    {
+    protected function parseUtc(string $dateTime) {
         return DateTime::createFromFormat('Y-m-d\TH:i:s\Z', $dateTime);
     }
 
-    protected function assertUtcDateString(string $dateTime)
-    {
+    protected function assertUtcDateString(string $dateTime) {
         $this->assertInstanceOf(DateTime::class, $this->parseUtc($dateTime));
     }
 
-    protected function assertInFuture(string $dateTime)
-    {
+    protected function assertInFuture(string $dateTime) {
         $this->assertGreaterThan(new DateTime(), $this->parseUtc($dateTime));
     }
 }