Erikmitk / kitodo-presentation

Classes/Domain/Model/Document.php

Braces +4 added lines, -8 removed lines

@@ -192,14 +192,12 @@ 
     /**
      * constructor
      */
-    public function __construct()
-    {
+    public function __construct() {
         // Do not remove the next line: It would break the functionality
         $this->initStorageObjects();
     }
 
-    protected function initStorageObjects()
-    {
+    protected function initStorageObjects() {
         $this->collections = new ObjectStorage();
     }
 
@@ -577,8 +575,7 @@ 
      *
      * @return \TYPO3\CMS\Extbase\Persistence\ObjectStorage<\Kitodo\Dlf\Domain\Model\Collection> $collections
      */
-    public function getCollections()
-    {
+    public function getCollections() {
         return $this->collections;
     }
 
@@ -607,8 +604,7 @@ 
      *
      * @return \TYPO3\CMS\Extbase\Persistence\ObjectStorage<\Kitodo\Dlf\Domain\Model\Collection> collections
      */
-    public function removeCollection(Collection $collection)
-    {
+    public function removeCollection(Collection $collection) {
         $this->collections->detach($collection);
     }
 

Classes/Controller/MetadataController.php

Braces +9 added lines, -18 removed lines

@@ -29,8 +29,7 @@ 
  * @subpackage dlf
  * @access public
  */
-class MetadataController extends AbstractController
-{
+class MetadataController extends AbstractController {
     /**
      * @var CollectionRepository
      */
@@ -39,8 +38,7 @@ 
     /**
      * @param CollectionRepository $collectionRepository
      */
-    public function injectCollectionRepository(CollectionRepository $collectionRepository)
-    {
+    public function injectCollectionRepository(CollectionRepository $collectionRepository) {
         $this->collectionRepository = $collectionRepository;
     }
 
@@ -52,8 +50,7 @@ 
     /**
      * @param MetadataRepository $metadataRepository
      */
-    public function injectMetadataRepository(MetadataRepository $metadataRepository)
-    {
+    public function injectMetadataRepository(MetadataRepository $metadataRepository) {
         $this->metadataRepository = $metadataRepository;
     }
 
@@ -65,16 +62,14 @@ 
     /**
      * @param StructureRepository $structureRepository
      */
-    public function injectStructureRepository(StructureRepository $structureRepository)
-    {
+    public function injectStructureRepository(StructureRepository $structureRepository) {
         $this->structureRepository = $structureRepository;
     }
 
     /**
      * @return string|void
      */
-    public function mainAction()
-    {
+    public function mainAction() {
         $this->cObj = $this->configurationManager->getContentObject();
 
         // Load current document.
@@ -130,8 +125,7 @@ 
      *
      * @return string The metadata array ready for output
      */
-    protected function printMetadata(array $metadataArray, $useOriginalIiifManifestMetadata = false)
-    {
+    protected function printMetadata(array $metadataArray, $useOriginalIiifManifestMetadata = false) {
         if ($useOriginalIiifManifestMetadata) {
             $iiifData = [];
             foreach ($metadataArray as $metadata) {
@@ -250,8 +244,7 @@ 
                     }
 
                     if (is_array($metadataArray[$i][$metadataName])) {
-                        $metadataArray[$i][$metadataName] = array_values(array_filter($metadataArray[$i][$metadataName], function($value)
-                        {
+                        $metadataArray[$i][$metadataName] = array_values(array_filter($metadataArray[$i][$metadataName], function($value) {
                             return !empty($value);
                         }));
                     }
@@ -273,8 +266,7 @@ 
      *
      * @return array metadata
      */
-    private function getMetadata()
-    {
+    private function getMetadata() {
         $metadata = [];
         if ($this->settings['rootline'] < 2) {
             // Get current structure's @ID.
@@ -312,8 +304,7 @@ 
      *
      * @return array metadata
      */
-    private function getMetadataForIds($id, $metadata)
-    {
+    private function getMetadataForIds($id, $metadata) {
         $useOriginalIiifManifestMetadata = $this->settings['originalIiifMetadata'] == 1 && $this->document->getDoc() instanceof IiifManifest;
         foreach ($id as $sid) {
             if ($useOriginalIiifManifestMetadata) {

Classes/Controller/TableOfContentsController.php

Braces +4 added lines, -8 removed lines

@@ -23,8 +23,7 @@ 
  * @subpackage dlf
  * @access public
  */
-class TableOfContentsController extends AbstractController
-{
+class TableOfContentsController extends AbstractController {
     /**
      * This holds the active entries according to the currently selected page
      *
@@ -43,8 +42,7 @@ 
      *
      * @return array HMENU array for menu entry
      */
-    protected function getMenuEntry(array $entry, $recursive = false)
-    {
+    protected function getMenuEntry(array $entry, $recursive = false) {
         $entryArray = [];
         // Set "title", "volume", "type" and "pagination" from $entry array.
         $entryArray['title'] = !empty($entry['label']) ? $entry['label'] : $entry['orderlabel'];
@@ -131,8 +129,7 @@ 
      *
      * @return void
      */
-    public function mainAction()
-    {
+    public function mainAction() {
         $this->view->assign('toc', $this->makeMenuArray());
     }
 
@@ -142,8 +139,7 @@ 
      * @access public
      * @return array HMENU array
      */
-    public function makeMenuArray()
-    {
+    public function makeMenuArray() {
         // Load current document.
         $this->loadDocument($this->requestData);
         if (

Classes/Controller/AbstractController.php

Braces +5 added lines, -10 removed lines

@@ -44,8 +44,7 @@ 
     /**
      * @param DocumentRepository $documentRepository
      */
-    public function injectDocumentRepository(DocumentRepository $documentRepository)
-    {
+    public function injectDocumentRepository(DocumentRepository $documentRepository) {
         $this->documentRepository = $documentRepository;
     }
 
@@ -85,8 +84,7 @@ 
      * @access protected
      * @return void
      */
-    protected function initialize()
-    {
+    protected function initialize() {
         $this->requestData = GeneralUtility::_GPmerged('tx_dlf');
         if (empty($this->requestData['page'])) {
             $this->requestData['page'] = 1;
@@ -112,8 +110,7 @@ 
      *
      * @return void
      */
-    protected function loadDocument($requestData)
-    {
+    protected function loadDocument($requestData) {
         // Try to get document format from database
         if (!empty($requestData['id'])) {
 
@@ -186,8 +183,7 @@ 
      *
      * @return null|string|array
      */
-    protected function getParametersSafely($parameterName)
-    {
+    protected function getParametersSafely($parameterName) {
         if ($this->request->hasArgument($parameterName)) {
             return $this->request->getArgument($parameterName);
         }
@@ -201,8 +197,7 @@ 
      *
      * @return void
      */
-    public function __construct()
-    {
+    public function __construct() {
         $this->initialize();
     }
 }

Classes/Format/TeiHeader.php

Braces +1 added lines, -2 removed lines

@@ -32,8 +32,7 @@
      *
      * @return void
      */
-    public function extractMetadata(\SimpleXMLElement $xml, array &$metadata)
-    {
+    public function extractMetadata(\SimpleXMLElement $xml, array &$metadata) {
         $xml->registerXPathNamespace('teihdr', 'http://www.tei-c.org/ns/1.0');
     }
 }

Classes/Format/Alto.php

Braces +4 added lines, -8 removed lines

@@ -33,8 +33,7 @@ 
      *
      * @return string The raw unformatted fulltext
      */
-    public function getRawText(\SimpleXMLElement $xml)
-    {
+    public function getRawText(\SimpleXMLElement $xml) {
         $rawText = '';
         $xml->registerXPathNamespace('alto', 'http://www.loc.gov/standards/alto/ns-v2#');
         // Get all (presumed) words of the text.
@@ -54,8 +53,7 @@ 
      *
      * @return string The unformatted fulltext in MiniOCR format
      */
-    public function getTextAsMiniOcr(\SimpleXMLElement $xml)
-    {
+    public function getTextAsMiniOcr(\SimpleXMLElement $xml) {
         $xml->registerXPathNamespace('alto', 'http://www.loc.gov/standards/alto/ns-v2#');
 
         // get all text blocks
@@ -99,8 +97,7 @@ 
      *
      * @return string The parsed word extracted from attribute
      */
-    private function getWord($attributes)
-    {
+    private function getWord($attributes) {
         return htmlspecialchars((string) $attributes['CONTENT']) . ' ';
     }
 
@@ -113,8 +110,7 @@ 
      *
      * @return string The parsed word coordinates extracted from attribute
      */
-    private function getCoordinates($attributes)
-    {
+    private function getCoordinates($attributes) {
         return (string) $attributes['HPOS'] . ' ' . (string) $attributes['VPOS'] . ' ' . (string) $attributes['WIDTH'] . ' ' . (string) $attributes['HEIGHT'];
     }
 }

Classes/Format/Mods.php

Braces +1 added lines, -2 removed lines

@@ -32,8 +32,7 @@
      *
      * @return void
      */
-    public function extractMetadata(\SimpleXMLElement $xml, array &$metadata)
-    {
+    public function extractMetadata(\SimpleXMLElement $xml, array &$metadata) {
         $xml->registerXPathNamespace('mods', 'http://www.loc.gov/mods/v3');
         // Get "author" and "author_sorting".
         $authors = $xml->xpath('./mods:name[./mods:role/mods:roleTerm[@type="code" and @authority="marcrelator"]="aut"]');

Classes/Controller/Backend/NewTenantController.php

Braces +14 added lines, -28 removed lines

@@ -44,8 +44,7 @@ 
  * @subpackage dlf
  * @access public
  */
-class NewTenantController extends AbstractController
-{
+class NewTenantController extends AbstractController {
     /**
      * @var int
      */
@@ -85,8 +84,7 @@ 
     /**
      * @param FormatRepository $formatRepository
      */
-    public function injectFormatRepository(FormatRepository $formatRepository)
-    {
+    public function injectFormatRepository(FormatRepository $formatRepository) {
         $this->formatRepository = $formatRepository;
     }
 
@@ -98,8 +96,7 @@ 
     /**
      * @param MetadataRepository $metadataRepository
      */
-    public function injectMetadataRepository(MetadataRepository $metadataRepository)
-    {
+    public function injectMetadataRepository(MetadataRepository $metadataRepository) {
         $this->metadataRepository = $metadataRepository;
     }
 
@@ -111,8 +108,7 @@ 
     /**
      * @param StructureRepository $structureRepository
      */
-    public function injectStructureRepository(StructureRepository $structureRepository)
-    {
+    public function injectStructureRepository(StructureRepository $structureRepository) {
         $this->structureRepository = $structureRepository;
     }
 
@@ -124,8 +120,7 @@ 
     /**
      * @param SolrCoreRepository $solrCoreRepository
      */
-    public function injectSolrCoreRepository(SolrCoreRepository $solrCoreRepository)
-    {
+    public function injectSolrCoreRepository(SolrCoreRepository $solrCoreRepository) {
         $this->solrCoreRepository = $solrCoreRepository;
     }
 
@@ -133,8 +128,7 @@ 
      * Initialization for all actions
      *
      */
-    protected function initializeAction()
-    {
+    protected function initializeAction() {
         $this->pid = (int) GeneralUtility::_GP('id');
 
         $frameworkConfiguration = $this->configurationManager->getConfiguration($this->configurationManager::CONFIGURATION_TYPE_FRAMEWORK);
@@ -155,8 +149,7 @@ 
     /**
      * Action adding formats records
      */
-    public function addFormatAction()
-    {
+    public function addFormatAction() {
         // Include formats definition file.
         $formatsDefaults = include(ExtensionManagementUtility::extPath('dlf') . 'Resources/Private/Data/FormatDefaults.php');
 
@@ -193,8 +186,7 @@ 
     /**
      * Action adding metadata records
      */
-    public function addMetadataAction()
-    {
+    public function addMetadataAction() {
         // Include metadata definition file.
         $metadataDefaults = include(ExtensionManagementUtility::extPath('dlf') . 'Resources/Private/Data/MetadataDefaults.php');
 
@@ -268,8 +260,7 @@ 
     /**
      * Action adding Solr core records
      */
-    public function addSolrCoreAction()
-    {
+    public function addSolrCoreAction() {
         $doPersist = false;
 
         // load language file in own array
@@ -298,8 +289,7 @@ 
     /**
      * Action adding structure records
      */
-    public function addStructureAction()
-    {
+    public function addStructureAction() {
         // Include structure definition file.
         $structureDefaults = include(ExtensionManagementUtility::extPath('dlf') . 'Resources/Private/Data/StructureDefaults.php');
 
@@ -351,8 +341,7 @@ 
      * @param ViewInterface $view
      * @return void
      */
-    protected function initializeView(ViewInterface $view)
-    {
+    protected function initializeView(ViewInterface $view) {
         /** @var BackendTemplateView $view */
         parent::initializeView($view);
         if ($this->actionMethodName == 'indexAction') {
@@ -370,8 +359,7 @@ 
      * @access public
      *
      */
-    public function indexAction()
-    {
+    public function indexAction() {
         $recordInfos = [];
 
         if ($this->pageInfo['doktype'] != 254) {
@@ -401,8 +389,7 @@ 
      * @access public
      *
      */
-    public function errorAction()
-    {
+    public function errorAction() {
     }
 
     /**
@@ -414,8 +401,7 @@ 
      *
      * @access public
      */
-    protected function getLLL($index, $lang, $langArray)
-    {
+    protected function getLLL($index, $lang, $langArray) {
         if (isset($langArray[$lang][$index][0]['target'])) {
             return $langArray[$lang][$index][0]['target'];
         } else {

Classes/Eid/SearchInDocument.php

Braces +4 added lines, -8 removed lines

@@ -28,16 +28,14 @@ 
  * @subpackage dlf
  * @access public
  */
-class SearchInDocument
-{
+class SearchInDocument {
     /**
      * The main method of the eID script
      *
      * @param ServerRequestInterface $request
      * @return ResponseInterface JSON response of search suggestions
      */
-    public function main(ServerRequestInterface $request)
-    {
+    public function main(ServerRequestInterface $request) {
         $output = [
             'documents' => [],
             'numFound' => 0
@@ -118,8 +116,7 @@ 
      *
      * @return string SOLR query
      */
-    private function getQuery($fields, $parameters)
-    {
+    private function getQuery($fields, $parameters) {
         return $fields['fulltext'] . ':(' . Solr::escapeQuery((string) $parameters['q']) . ') AND ' . $fields['uid'] . ':' . $this->getUid($parameters['uid']);
     }
 
@@ -133,8 +130,7 @@ 
      *
      * @return int|string uid of the document
      */
-    private function getUid($uid)
-    {
+    private function getUid($uid) {
         return is_numeric($uid) ? intval($uid) : $uid;
     }
 }