Erikmitk / kitodo-presentation

Classes/Controller/ToolboxController.php

Braces +14 added lines, -28 removed lines

@@ -23,15 +23,13 @@ 
  * @subpackage dlf
  * @access public
  */
-class ToolboxController extends AbstractController
-{
+class ToolboxController extends AbstractController {
     /**
      * The main method of the plugin
      *
      * @return void
      */
-    public function mainAction()
-    {
+    public function mainAction() {
         // Load current document.
         $this->loadDocument($this->requestData);
 
@@ -52,8 +50,7 @@ 
      *
      * @return void
      */
-    public function annotationtool()
-    {
+    public function annotationtool() {
         if (
             $this->document === null
             || $this->document->getDoc()->numPages < 1
@@ -94,8 +91,7 @@ 
      *
      * @return void
      */
-    public function fulltextdownloadtool()
-    {
+    public function fulltextdownloadtool() {
         if (
             $this->document === null
             || $this->document->getDoc()->numPages < 1
@@ -140,8 +136,7 @@ 
      *
      * @return void
      */
-    public function fulltexttool()
-    {
+    public function fulltexttool() {
         if (
             $this->document === null
             || $this->document->getDoc()->numPages < 1
@@ -186,8 +181,7 @@ 
      *
      * @return void
      */
-    public function imagedownloadtool()
-    {
+    public function imagedownloadtool() {
         if (
             $this->document === null
             || $this->document->getDoc()->numPages < 1
@@ -230,8 +224,7 @@ 
      *
      * @return array Array of image links and image format information
      */
-    protected function getImage($page)
-    {
+    protected function getImage($page) {
         $image = [];
         // Get @USE value of METS fileGrp.
         $fileGrps = \TYPO3\CMS\Core\Utility\GeneralUtility::trimExplode(',', $this->settings['fileGrpsImageDownload']);
@@ -264,8 +257,7 @@ 
      *
      * @return void
      */
-    public function imagemanipulationtool()
-    {
+    public function imagemanipulationtool() {
         // Set parent element for initialization.
         $parentContainer = !empty($this->settings['parentContainer']) ? $this->settings['parentContainer'] : '.tx-dlf-imagemanipulationtool';
 
@@ -278,8 +270,7 @@ 
      *
      * @return void
      */
-    public function pdfdownloadtool()
-    {
+    public function pdfdownloadtool() {
         if (
             $this->document === null
             || $this->document->getDoc() === null
@@ -318,8 +309,7 @@ 
      *
      * @return array Link to downloadable page
      */
-    protected function getPageLink()
-    {
+    protected function getPageLink() {
         $page1Link = '';
         $page2Link = '';
         $pageLinkArray = [];
@@ -363,8 +353,7 @@ 
      *
      * @return string Link to downloadable work
      */
-    protected function getWorkLink()
-    {
+    protected function getWorkLink() {
         $workLink = '';
         $fileGrpsDownload = GeneralUtility::trimExplode(',', $this->extConf['fileGrpDownload']);
         // Get work link.
@@ -393,8 +382,7 @@ 
      *
      * @return void
      */
-    public function searchindocumenttool()
-    {
+    public function searchindocumenttool() {
         if (
             $this->document === null
             || $this->document->getDoc()->numPages < 1
@@ -457,8 +445,7 @@ 
      *
      * @return string with current document id
      */
-    protected function getCurrentDocumentId()
-    {
+    protected function getCurrentDocumentId() {
         $id = $this->document->getUid();
 
         if ($id !== null && $id > 0) {
@@ -493,8 +480,7 @@ 
      *
      * @return string with encrypted core name
      */
-    protected function getEncryptedCoreName()
-    {
+    protected function getEncryptedCoreName() {
         // Get core name.
         $name = Helper::getIndexNameFromUid($this->settings['solrcore'], 'tx_dlf_solrcores');
         // Encrypt core name.

Classes/Controller/NavigationController.php

Braces +2 added lines, -4 removed lines

@@ -23,15 +23,13 @@
  * @subpackage dlf
  * @access public
  */
-class NavigationController extends AbstractController
-{
+class NavigationController extends AbstractController {
     /**
      * The main method of the plugin
      *
      * @return void
      */
-    public function mainAction()
-    {
+    public function mainAction() {
         // Load current document.
         $this->loadDocument($this->requestData);
         if (

Classes/Hooks/DataHandler.php

Braces +5 added lines, -10 removed lines

@@ -34,8 +34,7 @@ 
  * @subpackage dlf
  * @access public
  */
-class DataHandler implements LoggerAwareInterface
-{
+class DataHandler implements LoggerAwareInterface {
     use LoggerAwareTrait;
 
     /**
@@ -43,8 +42,7 @@ 
      */
     protected $documentRepository;
 
-    protected function getDocumentRepository()
-    {
+    protected function getDocumentRepository() {
         if ($this->documentRepository === null) {
             $objectManager = GeneralUtility::makeInstance(ObjectManager::class);
             $this->documentRepository = $objectManager->get(DocumentRepository::class);
@@ -65,8 +63,7 @@ 
      *
      * @return void
      */
-    public function processDatamap_postProcessFieldArray($status, $table, $id, &$fieldArray)
-    {
+    public function processDatamap_postProcessFieldArray($status, $table, $id, &$fieldArray) {
         if ($status == 'new') {
             switch ($table) {
                     // Field post-processing for table "tx_dlf_documents".
@@ -195,8 +192,7 @@ 
      *
      * @return void
      */
-    public function processDatamap_afterDatabaseOperations($status, $table, $id, &$fieldArray)
-    {
+    public function processDatamap_afterDatabaseOperations($status, $table, $id, &$fieldArray) {
         if ($status == 'update') {
             switch ($table) {
                     // After database operations for table "tx_dlf_documents".
@@ -275,8 +271,7 @@ 
      *
      * @return void
      */
-    public function processCmdmap_postProcess($command, $table, $id)
-    {
+    public function processCmdmap_postProcess($command, $table, $id) {
         if (
             in_array($command, ['move', 'delete', 'undelete'])
             && $table == 'tx_dlf_documents'

Classes/Hooks/ThumbnailCustomElement.php

Braces +2 added lines, -4 removed lines

@@ -14,10 +14,8 @@
 
 use TYPO3\CMS\Backend\Form\Element\AbstractFormElement;
 
-class ThumbnailCustomElement extends AbstractFormElement
-{
-    public function render()
-    {
+class ThumbnailCustomElement extends AbstractFormElement {
+    public function render() {
         // Custom TCA properties and other data can be found in $this->data, for example the above
         // parameters are available in $this->data['parameterArray']['fieldConf']['config']['parameters']
         $result = $this->initializeResultArray();

Classes/Hooks/ConfigurationForm.php

Braces +3 added lines, -6 removed lines

@@ -29,8 +29,7 @@ 
  * @subpackage dlf
  * @access public
  */
-class ConfigurationForm
-{
+class ConfigurationForm {
 
     /**
      * Check if a connection to a Solr server could be established with the given credentials.
@@ -39,8 +38,7 @@ 
      *
      * @return string Message informing the user of success or failure
      */
-    public function checkSolrConnection()
-    {
+    public function checkSolrConnection() {
         $solr = Solr::getInstance();
         if ($solr->ready) {
             Helper::addMessage(
@@ -65,8 +63,7 @@ 
      *
      * @return void
      */
-    public function __construct()
-    {
+    public function __construct() {
         // Load backend localization file.
         Helper::getLanguageService()->includeLLFile('EXT:dlf/Resources/Private/Language/locallang_be.xlf');
     }

Classes/ExpressionLanguage/DocumentTypeFunctionProvider.php

Braces +5 added lines, -10 removed lines

@@ -41,8 +41,7 @@ 
     /**
      * @return ExpressionFunction[] An array of Function instances
      */
-    public function getFunctions()
-    {
+    public function getFunctions() {
         return [
             $this->getDocumentTypeFunction(),
         ];
@@ -68,8 +67,7 @@ 
      *
      * @return void
      */
-    protected function initializeRepositories($storagePid)
-    {
+    protected function initializeRepositories($storagePid) {
         Helper::polyfillExtbaseClassesForTYPO3v9();
 
         // TODO: When we drop support for TYPO3v9, we needn't/shouldn't use ObjectManager anymore
@@ -92,12 +90,10 @@ 
     {
         return new ExpressionFunction(
             'getDocumentType',
-            function()
-            {
+            function() {
                 // Not implemented, we only use the evaluator
             },
-            function($arguments, $cPid)
-            {
+            function($arguments, $cPid) {
                 /** @var RequestWrapper $requestWrapper */
                 $requestWrapper = $arguments['request'];
                 $queryParams = $requestWrapper->getQueryParams();
@@ -143,8 +139,7 @@ 
      *
      * @return void
      */
-    protected function loadDocument($requestData, int $pid)
-    {
+    protected function loadDocument($requestData, int $pid) {
         // Try to get document format from database
         if (!empty($requestData['id'])) {
 

Classes/Common/Solr.php

Braces +21 added lines, -42 removed lines

@@ -37,8 +37,7 @@ 
  * @property-read bool $ready Is the Solr service instantiated successfully?
  * @property-read \Solarium\Client $service This holds the Solr service object
  */
-class Solr implements LoggerAwareInterface
-{
+class Solr implements LoggerAwareInterface {
     use LoggerAwareTrait;
 
     /**
@@ -130,8 +129,7 @@ 
      *
      * @return string The name of the new core
      */
-    public static function createCore($core = '')
-    {
+    public static function createCore($core = '') {
         // Get next available core name if none given.
         if (empty($core)) {
             $core = 'dlfCore' . self::getNextCoreNumber();
@@ -178,8 +176,7 @@ 
      *
      * @return string The escaped query string
      */
-    public static function escapeQuery($query)
-    {
+    public static function escapeQuery($query) {
         $helper = GeneralUtility::makeInstance(\Solarium\Core\Query\Helper::class);
         // Escape query phrase or term.
         if (preg_match('/^".*"$/', $query)) {
@@ -202,8 +199,7 @@ 
      *
      * @return string The escaped query string
      */
-    public static function escapeQueryKeepField($query, $pid)
-    {
+    public static function escapeQueryKeepField($query, $pid) {
         // Is there a field query?
         if (preg_match('/^[[:alnum:]]+_[tu][su]i:\(?.*\)?$/', $query)) {
             $queryBuilder = GeneralUtility::makeInstance(ConnectionPool::class)
@@ -253,8 +249,7 @@ 
      *
      * @return array fields
      */
-    public static function getFields()
-    {
+    public static function getFields() {
         $conf = GeneralUtility::makeInstance(ExtensionConfiguration::class)->get(self::$extKey);
 
         $fields = [];
@@ -296,8 +291,7 @@ 
      *
      * @return \Kitodo\Dlf\Common\Solr Instance of this class
      */
-    public static function getInstance($core = null)
-    {
+    public static function getInstance($core = null) {
         // Get core name if UID is given.
         if (MathUtility::canBeInterpretedAsInteger($core)) {
             $core = Helper::getIndexNameFromUid($core, 'tx_dlf_solrcores');
@@ -337,8 +331,7 @@ 
      *
      * @return int First unused core number found
      */
-    public static function getNextCoreNumber($number = 0)
-    {
+    public static function getNextCoreNumber($number = 0) {
         $number = max(intval($number), 0);
         // Check if core already exists.
         $solr = self::getInstance('dlfCore' . $number);
@@ -356,8 +349,7 @@ 
      *
      * @return void
      */
-    protected function loadSolrConnectionInfo()
-    {
+    protected function loadSolrConnectionInfo() {
         if (empty($this->config)) {
             $config = [];
             // Extract extension configuration.
@@ -397,8 +389,7 @@ 
      *
      * @return array The Apache Solr Documents that were fetched
      */
-    public function search_raw($parameters = [])
-    {
+    public function search_raw($parameters = []) {
         // Set additional query parameters.
         $parameters['start'] = 0;
         $parameters['rows'] = $this->limit;
@@ -428,8 +419,7 @@ 
      *
      * @return string|null The core name of the current query endpoint or null if core admin endpoint
      */
-    protected function _getCore()
-    {
+    protected function _getCore() {
         return $this->core;
     }
 
@@ -440,8 +430,7 @@ 
      *
      * @return int The max number of results
      */
-    protected function _getLimit()
-    {
+    protected function _getLimit() {
         return $this->limit;
     }
 
@@ -452,8 +441,7 @@ 
      *
      * @return int Total number of hits for last search
      */
-    protected function _getNumberOfHits()
-    {
+    protected function _getNumberOfHits() {
         return $this->numberOfHits;
     }
 
@@ -464,8 +452,7 @@ 
      *
      * @return bool Is the search instantiated successfully?
      */
-    protected function _getReady()
-    {
+    protected function _getReady() {
         return $this->ready;
     }
 
@@ -476,8 +463,7 @@ 
      *
      * @return \Solarium\Client Apache Solr service object
      */
-    protected function _getService()
-    {
+    protected function _getService() {
         return $this->service;
     }
 
@@ -490,8 +476,7 @@ 
      *
      * @return void
      */
-    protected function _setCPid($value)
-    {
+    protected function _setCPid($value) {
         $this->cPid = max(intval($value), 0);
     }
 
@@ -504,8 +489,7 @@ 
      *
      * @return void
      */
-    protected function _setLimit($value)
-    {
+    protected function _setLimit($value) {
         $this->limit = max(intval($value), 0);
     }
 
@@ -518,8 +502,7 @@ 
      *
      * @return void
      */
-    protected function _setParams(array $value)
-    {
+    protected function _setParams(array $value) {
         $this->params = $value;
     }
 
@@ -532,8 +515,7 @@ 
      *
      * @return mixed Value of $this->$var
      */
-    public function __get($var)
-    {
+    public function __get($var) {
         $method = '_get' . ucfirst($var);
         if (
             !property_exists($this, $var)
@@ -555,8 +537,7 @@ 
      *
      * @return bool true if variable is set and not empty, false otherwise
      */
-    public function __isset($var)
-    {
+    public function __isset($var) {
         return !empty($this->__get($var));
     }
 
@@ -570,8 +551,7 @@ 
      *
      * @return void
      */
-    public function __set($var, $value)
-    {
+    public function __set($var, $value) {
         $method = '_set' . ucfirst($var);
         if (
             !property_exists($this, $var)
@@ -592,8 +572,7 @@ 
      *
      * @return void
      */
-    protected function __construct($core)
-    {
+    protected function __construct($core) {
         // Get Solr connection parameters from configuration.
         $this->loadSolrConnectionInfo();
         // Configure connection adapter.

Classes/Common/SolrSearchResult/ResultDocument.php

Braces +19 added lines, -38 removed lines

@@ -24,8 +24,7 @@ 
  * @subpackage dlf
  * @access public
  */
-class ResultDocument
-{
+class ResultDocument {
 
     /**
      * The identifier
@@ -134,8 +133,7 @@ 
      *
      * @return void
      */
-    public function __construct($record, $highlighting, $fields)
-    {
+    public function __construct($record, $highlighting, $fields) {
         $this->id = $record[$fields['id']];
         $this->uid = $record[$fields['uid']];
         $this->page = $record[$fields['page']];
@@ -160,8 +158,7 @@ 
      *
      * @return string The result's record identifier
      */
-    public function getId()
-    {
+    public function getId() {
         return $this->id;
     }
 
@@ -172,8 +169,7 @@ 
      *
      * @return string|null The result's record unified identifier
      */
-    public function getUid()
-    {
+    public function getUid() {
         return $this->uid;
     }
 
@@ -184,8 +180,7 @@ 
      *
      * @return int The result's record page
      */
-    public function getPage()
-    {
+    public function getPage() {
         return $this->page;
     }
 
@@ -196,8 +191,7 @@ 
      *
      * @return string All result's record snippets imploded to one string
      */
-    public function getSnippets()
-    {
+    public function getSnippets() {
         return $this->snippets;
     }
 
@@ -208,8 +202,7 @@ 
      *
      * @return string
      */
-    public function getThumbnail()
-    {
+    public function getThumbnail() {
         return $this->thumbnail;
     }
 
@@ -220,8 +213,7 @@ 
      *
      * @return string
      */
-    public function getTitle()
-    {
+    public function getTitle() {
         return $this->title;
     }
 
@@ -232,8 +224,7 @@ 
      *
      * @return boolean
      */
-    public function getToplevel()
-    {
+    public function getToplevel() {
         return $this->toplevel;
     }
 
@@ -244,8 +235,7 @@ 
      *
      * @return string
      */
-    public function getType()
-    {
+    public function getType() {
         return $this->type;
     }
 
@@ -256,8 +246,7 @@ 
      *
      * @return array(Page) All result's pages which contain search phrase
      */
-    public function getPages()
-    {
+    public function getPages() {
         return $this->pages;
     }
 
@@ -268,8 +257,7 @@ 
      *
      * @return array(Region) All result's regions which contain search phrase
      */
-    public function getRegions()
-    {
+    public function getRegions() {
         return $this->regions;
     }
 
@@ -280,8 +268,7 @@ 
      *
      * @return array(Highlight) All result's highlights of search phrase
      */
-    public function getHighlights()
-    {
+    public function getHighlights() {
         return $this->highlights;
     }
 
@@ -292,8 +279,7 @@ 
      *
      * @return array(string) All result's highlights of search phrase
      */
-    public function getHighlightsIds()
-    {
+    public function getHighlightsIds() {
         $highlightsIds = [];
         foreach ($this->highlights as $highlight) {
             array_push($highlightsIds, $highlight->getId());
@@ -309,8 +295,7 @@ 
      *
      * @return void
      */
-    private function parseSnippets()
-    {
+    private function parseSnippets() {
         $snippetArray = $this->getArrayByIndex('text');
 
         $this->snippets = !empty($snippetArray) ? implode(' [...] ', $snippetArray) : '';
@@ -324,8 +309,7 @@ 
      *
      * @return void
      */
-    private function parsePages()
-    {
+    private function parsePages() {
         $pageArray = $this->getArrayByIndex('pages');
 
         $i = 0;
@@ -345,8 +329,7 @@ 
      *
      * @return void
      */
-    private function parseRegions()
-    {
+    private function parseRegions() {
         $regionArray = $this->getArrayByIndex('regions');
 
         $i = 0;
@@ -366,8 +349,7 @@ 
      *
      * @return void
      */
-    private function parseHighlights()
-    {
+    private function parseHighlights() {
         $highlightArray = $this->getArrayByIndex('highlights');
 
         foreach ($highlightArray as $highlights) {
@@ -388,8 +370,7 @@ 
      *
      * @return array
      */
-    private function getArrayByIndex($index)
-    {
+    private function getArrayByIndex($index) {
         $objectArray = [];
         foreach ($this->snippetsForRecord as $snippet) {
             if (!empty($snippet[$index])) {

Classes/Common/Indexer.php

Braces +8 added lines, -16 removed lines

@@ -32,8 +32,7 @@ 
  * @subpackage dlf
  * @access public
  */
-class Indexer
-{
+class Indexer {
     /**
      * The extension key
      *
@@ -93,8 +92,7 @@ 
      *
      * @return bool true on success or false on failure
      */
-    public static function add(Document $document)
-    {
+    public static function add(Document $document) {
         if (in_array($document->getUid(), self::$processedDocs)) {
             return true;
         } elseif (self::solrConnect($document->getSolrcore(), $document->getPid())) {
@@ -209,8 +207,7 @@ 
      *
      * @return string The field's dynamic index name
      */
-    public static function getIndexFieldName($index_name, $pid = 0)
-    {
+    public static function getIndexFieldName($index_name, $pid = 0) {
         // Sanitize input.
         $pid = max(intval($pid), 0);
         if (!$pid) {
@@ -236,8 +233,7 @@ 
      *
      * @return void
      */
-    protected static function loadIndexConf($pid)
-    {
+    protected static function loadIndexConf($pid) {
         if (!self::$fieldsLoaded) {
             $queryBuilder = GeneralUtility::makeInstance(ConnectionPool::class)
                 ->getQueryBuilderForTable('tx_dlf_metadata');
@@ -307,8 +303,7 @@ 
      *
      * @return bool true on success or false on failure
      */
-    protected static function processLogical(Document $document, array $logicalUnit)
-    {
+    protected static function processLogical(Document $document, array $logicalUnit) {
         $success = true;
         $doc = $document->getDoc();
         $doc->cPid = $document->getPid();
@@ -436,8 +431,7 @@ 
      *
      * @return bool true on success or false on failure
      */
-    protected static function processPhysical(Document $document, $page, array $physicalUnit)
-    {
+    protected static function processPhysical(Document $document, $page, array $physicalUnit) {
         $doc = $document->getDoc();
         $doc->cPid = $document->getPid();
         if ($doc->hasFulltext && $fullText = $doc->getFullText($physicalUnit['id'])) {
@@ -525,8 +519,7 @@ 
      *
      * @return bool true on success or false on failure
      */
-    protected static function solrConnect($core, $pid = 0)
-    {
+    protected static function solrConnect($core, $pid = 0) {
         // Get Solr instance.
         if (!self::$solr) {
             // Connect to Solr server.
@@ -549,8 +542,7 @@ 
      *
      * @access private
      */
-    private function __construct()
-    {
+    private function __construct() {
         // This is a static class, thus no instances should be created.
     }
 }