Erikmitk / kitodo-presentation

Classes/Common/Helper.php

Braces +8 added lines, -16 removed lines

@@ -37,8 +37,7 @@ 
  *
  * @access public
  */
-class Helper
-{
+class Helper {
     /**
      * @access public
      * @static
@@ -198,8 +197,7 @@ 
      *
      * @return mixed The decrypted value or false on error
      */
-    public static function decrypt(string $encrypted)
-    {
+    public static function decrypt(string $encrypted) {
         if (
             !in_array(self::$cipherAlgorithm, openssl_get_cipher_methods(true))
             || !in_array(self::$hashAlgorithm, openssl_get_md_methods(true))
@@ -239,8 +237,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)) {
@@ -305,8 +302,7 @@ 
      *
      * @return mixed Hashed string or false on error
      */
-    public static function digest(string $string)
-    {
+    public static function digest(string $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;
@@ -326,8 +322,7 @@ 
      *
      * @return mixed Encrypted string or false on error
      */
-    public static function encrypt(string $string)
-    {
+    public static function encrypt(string $string) {
         if (
             !in_array(self::$cipherAlgorithm, openssl_get_cipher_methods(true))
             || !in_array(self::$hashAlgorithm, openssl_get_md_methods(true))
@@ -697,8 +692,7 @@ 
      *
      * @return array Array of substituted "NEW..." identifiers and their actual UIDs.
      */
-    public static function processDatabaseAsAdmin(array $data = [], array $cmd = [], $reverseOrder = false, $cmdFirst = false)
-    {
+    public static function processDatabaseAsAdmin(array $data = [], array $cmd = [], $reverseOrder = false, $cmdFirst = false) {
         $context = GeneralUtility::makeInstance(Context::class);
 
         if (
@@ -937,8 +931,7 @@ 
      *
      * @return void
      */
-    private function __construct()
-    {
+    private function __construct() {
         // This is a static class, thus no instances should be created.
     }
 
@@ -969,8 +962,7 @@ 
      *
      * @return string|bool
      */
-    public static function getUrl(string $url)
-    {
+    public static function getUrl(string $url) {
         if (!Helper::isValidHttpUrl($url)) {
             return false;
         }

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/MetsDocument.php

Braces +5 added lines, -10 removed lines

@@ -63,8 +63,7 @@ 
  * @property-read \SimpleXMLElement $mets this holds the XML file's METS part as \SimpleXMLElement object
  * @property-read string $parentHref URL of the parent document (determined via mptr element), or empty string if none is available
  */
-final class MetsDocument extends AbstractDocument
-{
+final class MetsDocument extends AbstractDocument {
     /**
      * @access protected
      * @var string[] Subsections / tags that may occur within `<mets:amdSec>`
@@ -397,8 +396,7 @@ 
      *
      * @return ?string thumbnail or null if not found
      */
-    private function getThumbnail(string $id = '')
-    {
+    private function getThumbnail(string $id = '') {
         // Load plugin configuration.
         $extConf = GeneralUtility::makeInstance(ExtensionConfiguration::class)->get(self::$extKey, 'files');
         $fileGrpsThumb = GeneralUtility::trimExplode(',', $extConf['fileGrpThumbs']);
@@ -726,8 +724,7 @@ 
      *
      * @return bool true if extraction successful, false otherwise
      */
-    private function extractMetadataIfTypeSupported(string $dmdId, string $mdSectionType, array &$metadata)
-    {
+    private function extractMetadataIfTypeSupported(string $dmdId, string $mdSectionType, array &$metadata) {
         // Is this metadata format supported?
         if (!empty($this->formats[$this->mdSec[$dmdId]['type']])) {
             if (!empty($this->formats[$this->mdSec[$dmdId]['type']]['class'])) {
@@ -759,8 +756,7 @@ 
      *
      * @return array additional metadata data queried from database
      */
-    private function getAdditionalMetadataFromDatabase(int $cPid, string $dmdId)
-    {
+    private function getAdditionalMetadataFromDatabase(int $cPid, string $dmdId) {
         $queryBuilder = GeneralUtility::makeInstance(ConnectionPool::class)
             ->getQueryBuilderForTable('tx_dlf_metadata');
         // Get hidden records, too.
@@ -905,8 +901,7 @@ 
     /**
      * @see AbstractDocument::getStructureDepth()
      */
-    public function getStructureDepth(string $logId)
-    {
+    public function getStructureDepth(string $logId) {
         $ancestors = $this->mets->xpath('./mets:structMap[@TYPE="LOGICAL"]//mets:div[@ID="' . $logId . '"]/ancestor::*');
         if (!empty($ancestors)) {
             return count($ancestors);

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;

Tests/Unit/Validation/DocumentValidatorTest.php

Braces +7 added lines, -14 removed lines

@@ -15,8 +15,7 @@ 
 use SimpleXMLElement;
 use TYPO3\TestingFramework\Core\Unit\UnitTestCase;
 
-class DocumentValidatorTest extends UnitTestCase
-{
+class DocumentValidatorTest extends UnitTestCase {
     public function setUp(): void
     {
         parent::setUp();
@@ -27,8 +26,7 @@ 
     /**
      * @test
      */
-    public function passesHasAllMandatoryMetadataFields()
-    {
+    public function passesHasAllMandatoryMetadataFields() {
         $metadata = [
             'record_id' => [
                 'xyz'
@@ -41,8 +39,7 @@ 
     /**
      * @test
      */
-    public function notPassesHasAllMandatoryMetadataFields()
-    {
+    public function notPassesHasAllMandatoryMetadataFields() {
         $metadata = [
             'document_format' => [
                 'METS'
@@ -55,8 +52,7 @@ 
     /**
      * @test
      */
-    public function passesHasCorrectLogicalStructure()
-    {
+    public function passesHasCorrectLogicalStructure() {
         $xml = $this->getXml('av_beispiel.xml');
 
         $documentValidator = new DocumentValidator([], [], $xml);
@@ -66,8 +62,7 @@ 
     /**
      * @test
      */
-    public function notPassesHasCorrectLogicalStructure()
-    {
+    public function notPassesHasCorrectLogicalStructure() {
         $xml = $this->getXml('av_beispiel.xml');
 
         $documentValidator = new DocumentValidator([], [], $xml);
@@ -77,8 +72,7 @@ 
     /**
      * @test
      */
-    public function passesHasCorrectPhysicalStructure()
-    {
+    public function passesHasCorrectPhysicalStructure() {
         $xml = $this->getXml('av_beispiel.xml');
 
         $documentValidator = new DocumentValidator([], [], $xml);
@@ -88,8 +82,7 @@ 
     /**
      * @test
      */
-    public function notPassesHasCorrectPhysicalStructure()
-    {
+    public function notPassesHasCorrectPhysicalStructure() {
         $xml = $this->getXml('two_dmdsec.xml');
 
         $documentValidator = new DocumentValidator([], [], $xml);