Erikmitk / kitodo-presentation

Classes/ViewHelpers/IsInArrayViewHelper.php

Braces +3 added lines, -6 removed lines

@@ -13,10 +13,8 @@ 
 
 use TYPO3Fluid\Fluid\Core\ViewHelper\AbstractViewHelper;
 
-class IsInArrayViewHelper extends AbstractViewHelper
-{
-    public function initializeArguments()
-    {
+class IsInArrayViewHelper extends AbstractViewHelper {
+    public function initializeArguments() {
         parent::initializeArguments();
         $this->registerArgument('needle', 'mixed', 'The searched value', true);
         $this->registerArgument('haystack', 'array', 'The array', true);
@@ -27,8 +25,7 @@ 
      *
      * @return bool
      */
-    public function render()
-    {
+    public function render() {
         $needle = $this->arguments['needle'];
         $haystack = $this->arguments['haystack'];
 

Classes/ViewHelpers/ImplodeViewHelper.php

Braces +3 added lines, -6 removed lines

@@ -13,10 +13,8 @@ 
 
 use TYPO3Fluid\Fluid\Core\ViewHelper\AbstractViewHelper;
 
-class ImplodeViewHelper extends AbstractViewHelper
-{
-    public function initializeArguments()
-    {
+class ImplodeViewHelper extends AbstractViewHelper {
+    public function initializeArguments() {
         parent::initializeArguments();
         $this->registerArgument('value', 'array', 'The array to be imploded', true);
         $this->registerArgument('delimiter', 'string', 'The delimiter ', true);
@@ -27,8 +25,7 @@ 
      *
      * @return string
      */
-    public function render()
-    {
+    public function render() {
         $value = $this->arguments['value'];
         $delimiter = $this->arguments['delimiter'];
 

Classes/Common/AnnotationRequest.php

Braces +3 added lines, -6 removed lines

@@ -12,8 +12,7 @@ 
  * LICENSE.txt file that was distributed with this source code.
  */
 
-class AnnotationRequest
-{
+class AnnotationRequest {
     /**
      * @var string
      */
@@ -22,8 +21,7 @@ 
     /**
      * @param string $apiUrl The url of the annotation server api.
      */
-    public function __construct($apiUrl)
-    {
+    public function __construct($apiUrl) {
         $this->apiUrl =  trim($apiUrl, "/ ");
     }
 
@@ -55,8 +53,7 @@ 
      * @param string $id Document id (purl)
      * @return array
      */
-    public function getAll($id)
-    {
+    public function getAll($id) {
         $annotations = [];
 
         $annotationData = $this->requestAnnotions($this->apiUrl . '?target=' . urlencode($id . '/*'));

Classes/Common/MetsDocument.php

Braces +8 added lines, -16 removed lines

@@ -72,8 +72,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>`
@@ -286,8 +285,7 @@ 
     /**
      * This gets the measure beginning of a page
      */
-    public function getPageBeginning($pageId, $fileId)
-    {
+    public function getPageBeginning($pageId, $fileId) {
         $mets = $this->mets
             ->xpath(
                 './mets:structMap[@TYPE="PHYSICAL"]' .
@@ -482,8 +480,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']);
@@ -624,8 +621,7 @@ 
      * @param DOMNode $parentNode
      * @return array|false
      */
-    private function getSubentries($allSubentries, string $parentIndex, DOMNode $parentNode)
-    {
+    private function getSubentries($allSubentries, string $parentIndex, DOMNode $parentNode) {
         $domXPath = new DOMXPath($parentNode->ownerDocument);
         $this->registerNamespaces($domXPath);
         $theseSubentries = [];
@@ -655,8 +651,7 @@ 
      * @param $subentry
      * @return array
      */
-    private function getSubentryValue($values, $subentry)
-    {
+    private function getSubentryValue($values, $subentry) {
         $theseSubentries = [];
         if (
             ($values instanceof DOMNodeList
@@ -906,8 +901,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'])) {
@@ -939,8 +933,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.
@@ -1131,8 +1124,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/DocumentAnnotation.php

Braces +11 added lines, -22 removed lines

@@ -28,8 +28,7 @@ 
  *
  * @access public
  */
-class DocumentAnnotation
-{
+class DocumentAnnotation {
     /**
      * @var null|DocumentAnnotation
      */
@@ -55,8 +54,7 @@ 
      * @param array $annotationData
      * @param Document $document
      */
-    private function __construct($annotationData, $document)
-    {
+    private function __construct($annotationData, $document) {
         $this->annotationData = $annotationData;
         $this->document = $document;
         $this->logger = GeneralUtility::makeInstance(LogManager::class)->getLogger(static::class);
@@ -67,8 +65,7 @@ 
      *
      * @return Annotation[]|array
      */
-    public function getAnnotations()
-    {
+    public function getAnnotations() {
         if (empty($this->annotationData)) {
             return [];
         }
@@ -168,8 +165,7 @@ 
      * @param string $logicalId
      * @return array
      */
-    protected function getPagesByLogicalId($logicalId)
-    {
+    protected function getPagesByLogicalId($logicalId) {
         $pages = [];
         if (
             array_key_exists('l2p', $this->document->getCurrentDocument()->smLinks) &&
@@ -193,8 +189,7 @@ 
      * @param string $physicalId
      * @return array
      */
-    protected function getPagesByPhysicalId($physicalId)
-    {
+    protected function getPagesByPhysicalId($physicalId) {
         $pages = [];
         foreach ($this->document->getCurrentDocument()->physicalStructureInfo as $physicalInfo) {
             $order = $physicalInfo['order'];
@@ -217,8 +212,7 @@ 
      * @param string $fileId
      * @return array
      */
-    protected function getPagesByFileId($fileId)
-    {
+    protected function getPagesByFileId($fileId) {
         $pages = [];
         foreach ($this->document->getCurrentDocument()->physicalStructureInfo as $physicalInfo) {
             if (
@@ -243,8 +237,7 @@ 
      * @param string $range
      * @return array
      */
-    protected function getAudioPagesByFileId($fileId, $range = null)
-    {
+    protected function getAudioPagesByFileId($fileId, $range = null) {
         $tracks = [];
         foreach ($this->document->getCurrentDocument()->physicalStructureInfo as $physicalInfo) {
             if (array_key_exists('tracks', $physicalInfo) && is_array($physicalInfo['tracks'])) {
@@ -299,8 +292,7 @@ 
      * @param string $range
      * @return array
      */
-    protected function getMeasurePagesByFileId($fileId, $range = null)
-    {
+    protected function getMeasurePagesByFileId($fileId, $range = null) {
         // Get all measures referencing the fileid
         $measures = [];
         // Get the related page numbers
@@ -355,8 +347,7 @@ 
      *
      * @return array
      */
-    public function getVerovioRelevantAnnotations()
-    {
+    public function getVerovioRelevantAnnotations() {
         $annotations = [];
         /** @var Annotation $annotation */
         foreach ($this->getAnnotations() as $annotation) {
@@ -373,8 +364,7 @@ 
      * @param Document $document
      * @return array
      */
-    protected static function loadData($document)
-    {
+    protected static function loadData($document) {
         $annotationData = [];
         $conf = GeneralUtility::makeInstance(ExtensionConfiguration::class)->get('dlf');
         $apiBaseUrl = $conf['annotationServerUrl'];
@@ -393,8 +383,7 @@ 
      * @return DocumentAnnotation|null
      *
      */
-    public static function getInstance($document)
-    {
+    public static function getInstance($document) {
         if (self::$instance == null) {
             $annotationData = self::loadData($document);
             self::$instance = new DocumentAnnotation($annotationData, $document);

Classes/Controller/AbstractController.php

Braces +9 added lines, -12 removed lines

@@ -35,8 +35,7 @@ 
  *
  * @abstract
  */
-abstract class AbstractController extends ActionController implements LoggerAwareInterface
-{
+abstract class AbstractController extends ActionController implements LoggerAwareInterface {
     use LoggerAwareTrait;
 
     /**
@@ -236,8 +235,7 @@ 
      *
      * @return null|string|array
      */
-    protected function getParametersSafely(string $parameterName)
-    {
+    protected function getParametersSafely(string $parameterName) {
         if ($this->request->hasArgument($parameterName)) {
             return $this->request->getArgument($parameterName);
         }
@@ -333,8 +331,7 @@ 
      *
      * @return void
      */
-    public function __construct()
-    {
+    public function __construct() {
         $this->initialize();
     }
 
@@ -375,7 +372,8 @@ 
         $lastStartRecordNumberGrid = 0; // due to validity outside the loop
         foreach (range($firstPage, $lastPage) as $i) {
             // detect which pagination is active: ListView or GridView
-            if (get_class($pagination) == 'TYPO3\CMS\Core\Pagination\SimplePagination') {  // ListView
+            if (get_class($pagination) == 'TYPO3\CMS\Core\Pagination\SimplePagination') {
+// ListView
                 $lastStartRecordNumberGrid = $i; // save last $startRecordNumber for LastPage button
 
                 $pages[$i] = [
@@ -388,7 +386,8 @@ 
                 if (in_array($i, $aRange)) {
                     array_push($pagesSect, ['label' => $i, 'startRecordNumber' => $i]);
                 };
-            } else { // GridView
+            } else {
+// GridView
                 // to calculate the values for generation the links for the pagination pages
                 /** @var \Kitodo\Dlf\Pagination\PageGridPaginator $paginator */
                 $itemsPerPage = $paginator->getPublicItemsPerPage();
@@ -468,8 +467,7 @@ 
      *
      * @return AbstractDocument
      */
-    private function getDocumentByUid(int $documentId)
-    {
+    private function getDocumentByUid(int $documentId) {
         $doc = null;
         $this->document = $this->documentRepository->findOneByIdAndSettings($documentId);
 
@@ -491,8 +489,7 @@ 
      *
      * @return AbstractDocument
      */
-    protected function getDocumentByUrl(string $documentId)
-    {
+    protected function getDocumentByUrl(string $documentId) {
         $doc = AbstractDocument::getInstance($documentId, $this->settings, true);
 
         if (isset($this->settings['multiViewType']) && $doc->tableOfContents[0]['type'] === $this->settings['multiViewType']) {

Classes/Controller/Embedded3dViewerController.php

Braces +1 added lines, -2 removed lines

@@ -21,8 +21,7 @@
  *
  * @access public
  */
-class Embedded3dViewerController extends AbstractController
-{
+class Embedded3dViewerController extends AbstractController {
 
     const MIDDLEWARE_DLF_EMBEDDED_3D_VIEWER_PREFIX = '/?middleware=dlf/embedded3dviewer';
 

Classes/Command/OptimizeCommand.php

Braces +1 added lines, -2 removed lines

@@ -27,8 +27,7 @@
  *
  * @access public
  */
-class OptimizeCommand extends Command
-{
+class OptimizeCommand extends Command {
 
     /**
      * Configure the command by defining the name, options and arguments

Classes/Task/DeleteTask.php

Braces +2 added lines, -4 removed lines

@@ -23,10 +23,8 @@
  *
  * @access public
  */
-class DeleteTask extends BaseTask
-{
-    public function execute()
-    {
+class DeleteTask extends BaseTask {
+    public function execute() {
         $inputArray = [];
         $inputArray['-d'] = $this->doc;
         $inputArray['-p'] = $this->pid;