Erikmitk / kitodo-presentation

Classes/Hooks/DataHandler.php

Braces +4 added lines, -8 removed lines

@@ -31,8 +31,7 @@ 
  * @subpackage dlf
  * @access public
  */
-class DataHandler implements LoggerAwareInterface
-{
+class DataHandler implements LoggerAwareInterface {
     use LoggerAwareTrait;
 
     /**
@@ -47,8 +46,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".
@@ -179,8 +177,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".
@@ -260,8 +257,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/UserFunc.php

Braces +4 added lines, -8 removed lines

@@ -30,8 +30,7 @@ 
  * @subpackage dlf
  * @access public
  */
-class UserFunc implements LoggerAwareInterface
-{
+class UserFunc implements LoggerAwareInterface {
     use LoggerAwareTrait;
 
     /**
@@ -53,8 +52,7 @@ 
      *
      * @return string HTML <img> tag for thumbnail
      */
-    public function displayThumbnail(&$params)
-    {
+    public function displayThumbnail(&$params) {
         // Simulate TCA field type "passthrough".
         $output = '<input type="hidden" name="' . $params['itemFormElName'] . '" value="' . $params['itemFormElValue'] . '" />';
         if (!empty($params['itemFormElValue'])) {
@@ -73,8 +71,7 @@ 
      *
      * @return string The type of the current document or 'undefined'
      */
-    public function getDocumentType(int $cPid)
-    {
+    public function getDocumentType(int $cPid) {
         $type = 'undefined';
         // Load document with current plugin parameters.
         $doc = $this->loadDocument(GeneralUtility::_GPmerged($this->prefixId));
@@ -105,8 +102,7 @@ 
      *
      * @return \Kitodo\Dlf\Common\Document Instance of the current document
      */
-    protected function loadDocument(array $piVars)
-    {
+    protected function loadDocument(array $piVars) {
         // Check for required variable.
         if (!empty($piVars['id'])) {
             // Get instance of document.

Classes/ExpressionLanguage/DocumentTypeFunctionProvider.php

Braces +2 added lines, -4 removed lines

@@ -46,8 +46,7 @@ 
     /**
      * @return ExpressionFunction[] An array of Function instances
      */
-    public function getFunctions()
-    {
+    public function getFunctions() {
         return [
             $this->getDocumentTypeFunction(),
         ];
@@ -102,8 +101,7 @@ 
      *
      * @return \Kitodo\Dlf\Common\Document Instance of the current document
      */
-    protected function loadDocument(array $piVars)
-    {
+    protected function loadDocument(array $piVars) {
         // Check for required variable.
         if (!empty($piVars['id'])) {
             // Get instance of document.

Classes/Plugin/Search.php

Braces +12 added lines, -24 removed lines

@@ -31,8 +31,7 @@ 
  * @subpackage dlf
  * @access public
  */
-class Search extends \Kitodo\Dlf\Common\AbstractPlugin
-{
+class Search extends \Kitodo\Dlf\Common\AbstractPlugin {
     public $scriptRelPath = 'Classes/Plugin/Search.php';
 
     /**
@@ -42,8 +41,7 @@ 
      *
      * @return void
      */
-    protected function addAutocompleteJS()
-    {
+    protected function addAutocompleteJS() {
         $queryBuilder = GeneralUtility::makeInstance(ConnectionPool::class)
             ->getQueryBuilderForTable('tx_dlf_documents');
 
@@ -74,8 +72,7 @@ 
      *
      * @return string HTML input fields with current document's UID and parent ID
      */
-    protected function addCurrentCollection()
-    {
+    protected function addCurrentCollection() {
         // Load current collection.
         $list = GeneralUtility::makeInstance(DocumentList::class);
         if (
@@ -107,8 +104,7 @@ 
      *
      * @return string HTML input fields with current document's UID
      */
-    protected function addCurrentDocument()
-    {
+    protected function addCurrentDocument() {
         // Load current list object.
         $list = GeneralUtility::makeInstance(DocumentList::class);
         // Load current document.
@@ -147,8 +143,7 @@ 
      *
      * @return string HTML input fields with encrypted core name and hash
      */
-    protected function addEncryptedCoreName()
-    {
+    protected function addEncryptedCoreName() {
         // Get core name.
         $name = Helper::getIndexNameFromUid($this->conf['solrcore'], 'tx_dlf_solrcores');
         // Encrypt core name.
@@ -170,8 +165,7 @@ 
      *
      * @return string The extended search form or an empty string
      */
-    protected function addExtendedSearch()
-    {
+    protected function addExtendedSearch() {
         $extendedSearch = '';
         // Quit without doing anything if no fields for extended search are selected.
         if (
@@ -209,8 +203,7 @@ 
      *
      * @return string HTML output of facets menu
      */
-    protected function addFacetsMenu()
-    {
+    protected function addFacetsMenu() {
         // Check for typoscript configuration to prevent fatal error.
         if (empty($this->conf['facetsConf.'])) {
             $this->logger->warning('Incomplete plugin configuration');
@@ -244,8 +237,7 @@ 
      *
      * @return string HTML output of fulltext switch
      */
-    protected function addFulltextSwitch($isFulltextSearch = 0)
-    {
+    protected function addFulltextSwitch($isFulltextSearch = 0) {
         $output = '';
         // Check for plugin configuration.
         if (!empty($this->conf['fulltext'])) {
@@ -264,8 +256,7 @@ 
      *
      * @return string HTML output of logical page field
      */
-    protected function addLogicalPage()
-    {
+    protected function addLogicalPage() {
         $output = '';
         // Check for plugin configuration.
         if (!empty($this->conf['showLogicalPageField'])) {
@@ -288,8 +279,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') {
@@ -345,8 +335,7 @@ 
      *
      * @return string The content that is displayed on the website
      */
-    public function main($content, $conf)
-    {
+    public function main($content, $conf) {
         $this->init($conf);
         // Disable caching for this plugin.
         $this->setCache(false);
@@ -553,8 +542,7 @@ 
      *
      * @return array HMENU array
      */
-    public function makeFacetsMenuArray($content, $conf)
-    {
+    public function makeFacetsMenuArray($content, $conf) {
         $this->init($conf);
         $menuArray = [];
         // Set default value for facet search.

Classes/Common/Document.php

Braces +30 added lines, -60 removed lines

@@ -47,8 +47,7 @@ 
  * @property-read mixed $uid This holds the UID or the URL of the document
  * @abstract
  */
-abstract class Document
-{
+abstract class Document {
     /**
      * This holds the logger
      *
@@ -340,8 +339,7 @@ 
      *
      * @return void
      */
-    public static function clearRegistry()
-    {
+    public static function clearRegistry() {
         // Reset registry array.
         self::$registry = [];
     }
@@ -616,8 +614,7 @@ 
      *
      * @return int The physical page number
      */
-    public function getPhysicalPage($logicalPage)
-    {
+    public function getPhysicalPage($logicalPage) {
         if (
             !empty($this->lastSearchedPhysicalPage['logicalPage'])
             && $this->lastSearchedPhysicalPage['logicalPage'] == $logicalPage
@@ -664,8 +661,7 @@ 
      *
      * @return string The physical structure node's / IIIF resource's raw text from XML
      */
-    protected function getRawTextFromXml($id)
-    {
+    protected function getRawTextFromXml($id) {
         $rawText = '';
         // Load available text formats, ...
         $this->loadFormats();
@@ -739,8 +735,7 @@ 
      *
      * @return string The title of the document itself or a parent document
      */
-    public static function getTitle($uid, $recursive = false)
-    {
+    public static function getTitle($uid, $recursive = false) {
         $logger = GeneralUtility::makeInstance(LogManager::class)->getLogger(__CLASS__);
 
         $title = '';
@@ -794,8 +789,7 @@ 
      *
      * @return array The logical structure node's / resource's parsed metadata array
      */
-    public function getTitledata($cPid = 0)
-    {
+    public function getTitledata($cPid = 0) {
         $titledata = $this->getMetadata($this->_getToplevelId(), $cPid);
         // Add information from METS structural map to titledata array.
         if ($this instanceof MetsDocument) {
@@ -828,8 +822,7 @@ 
      * @return int|bool: false if structure with $logId is not a child of this substructure,
      * or the actual depth.
      */
-    protected function getTreeDepth($structure, $depth, $logId)
-    {
+    protected function getTreeDepth($structure, $depth, $logId) {
         foreach ($structure as $element) {
             if ($element['id'] == $logId) {
                 return $depth;
@@ -851,8 +844,7 @@ 
      * @param string $logId: The id of the logical structure element whose depth is requested
      * @return int|bool tree depth as integer or false if no element with $logId exists within the TOC.
      */
-    public function getStructureDepth($logId)
-    {
+    public function getStructureDepth($logId) {
         return $this->getTreeDepth($this->_getTableOfContents(), 1, $logId);
     }
 
@@ -902,8 +894,7 @@ 
      *
      * @return bool true on success or false on failure
      */
-    protected function load($location)
-    {
+    protected function load($location) {
         // Load XML / JSON-LD file.
         if (\TYPO3\CMS\Core\Utility\GeneralUtility::isValidUrl($location)) {
             // Load extension configuration
@@ -936,8 +927,7 @@ 
      *
      * @return void
      */
-    protected function loadFormats()
-    {
+    protected function loadFormats() {
         if (!$this->formatsLoaded) {
             $queryBuilder = GeneralUtility::makeInstance(ConnectionPool::class)
                 ->getQueryBuilderForTable('tx_dlf_formats');
@@ -977,8 +967,7 @@ 
      *
      * @return void
      */
-    public function registerNamespaces(&$obj)
-    {
+    public function registerNamespaces(&$obj) {
         // TODO Check usage. XML specific method does not seem to be used anywhere outside this class within the project, but it is public and may be used by extensions.
         $this->loadFormats();
         // Do we have a \SimpleXMLElement or \DOMXPath object?
@@ -1006,8 +995,7 @@ 
      *
      * @return bool true on success or false on failure
      */
-    public function save($pid = 0, $core = 0)
-    {
+    public function save($pid = 0, $core = 0) {
         if (\TYPO3_MODE !== 'BE') {
             $this->logger->error('Saving a document is only allowed in the backend');
             return false;
@@ -1328,8 +1316,7 @@ 
      *
      * @return bool Are there any fulltext files available?
      */
-    protected function _getHasFulltext()
-    {
+    protected function _getHasFulltext() {
         $this->ensureHasFulltextIsSet();
         return $this->hasFulltext;
     }
@@ -1341,8 +1328,7 @@ 
      *
      * @return string The location of the document
      */
-    protected function _getLocation()
-    {
+    protected function _getLocation() {
         return $this->location;
     }
 
@@ -1364,8 +1350,7 @@ 
      *
      * @return array Array of metadata with their corresponding logical structure node ID as key
      */
-    protected function _getMetadataArray()
-    {
+    protected function _getMetadataArray() {
         // Set metadata definitions' PID.
         $cPid = ($this->cPid ? $this->cPid : $this->pid);
         if (!$cPid) {
@@ -1390,8 +1375,7 @@ 
      *
      * @return int The total number of pages and/or tracks
      */
-    protected function _getNumPages()
-    {
+    protected function _getNumPages() {
         $this->_getPhysicalStructure();
         return $this->numPages;
     }
@@ -1403,8 +1387,7 @@ 
      *
      * @return int The UID of the parent document or zero if not applicable
      */
-    protected function _getParentId()
-    {
+    protected function _getParentId() {
         return $this->parentId;
     }
 
@@ -1427,8 +1410,7 @@ 
      *
      * @return array Array of elements' type, label and file representations ordered by @ID attribute / Canvas order
      */
-    protected function _getPhysicalStructureInfo()
-    {
+    protected function _getPhysicalStructureInfo() {
         // Is there no physical structure array yet?
         if (!$this->physicalStructureLoaded) {
             // Build physical structure array.
@@ -1444,8 +1426,7 @@ 
      *
      * @return int The PID of the document or zero if not in database
      */
-    protected function _getPid()
-    {
+    protected function _getPid() {
         return $this->pid;
     }
 
@@ -1456,8 +1437,7 @@ 
      *
      * @return bool Is the document instantiated successfully?
      */
-    protected function _getReady()
-    {
+    protected function _getReady() {
         return $this->ready;
     }
 
@@ -1468,8 +1448,7 @@ 
      *
      * @return mixed The METS file's / IIIF manifest's record identifier
      */
-    protected function _getRecordId()
-    {
+    protected function _getRecordId() {
         return $this->recordId;
     }
 
@@ -1480,8 +1459,7 @@ 
      *
      * @return int The UID of the root document or zero if not applicable
      */
-    protected function _getRootId()
-    {
+    protected function _getRootId() {
         if (!$this->rootIdLoaded) {
             if ($this->parentId) {
                 $parent = self::getInstance($this->parentId, $this->pid);
@@ -1511,8 +1489,7 @@ 
      *
      * @return array Array of structure nodes' id, label, type and physical page indexes/mptr / Canvas link with original hierarchy preserved
      */
-    protected function _getTableOfContents()
-    {
+    protected function _getTableOfContents() {
         // Is there no logical structure array yet?
         if (!$this->tableOfContentsLoaded) {
             // Get all logical structures.
@@ -1553,8 +1530,7 @@ 
      *
      * @return mixed The UID or the URL of the document
      */
-    protected function _getUid()
-    {
+    protected function _getUid() {
         return $this->uid;
     }
 
@@ -1567,8 +1543,7 @@ 
      *
      * @return void
      */
-    protected function _setCPid($value)
-    {
+    protected function _setCPid($value) {
         $this->cPid = max(intval($value), 0);
     }
 
@@ -1579,8 +1554,7 @@ 
      *
      * @return void
      */
-    protected function __clone()
-    {
+    protected function __clone() {
         // This method is defined as protected because singleton objects should not be cloned.
     }
 
@@ -1597,8 +1571,7 @@ 
      *
      * @return void
      */
-    protected function __construct($uid, $pid, $preloadedDocument)
-    {
+    protected function __construct($uid, $pid, $preloadedDocument) {
         $queryBuilder = GeneralUtility::makeInstance(ConnectionPool::class)
             ->getQueryBuilderForTable('tx_dlf_documents');
         $location = '';
@@ -1710,8 +1683,7 @@ 
      *
      * @return mixed Value of $this->$var
      */
-    public function __get($var)
-    {
+    public function __get($var) {
         $method = '_get' . ucfirst($var);
         if (
             !property_exists($this, $var)
@@ -1733,8 +1705,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));
     }
 
@@ -1748,8 +1719,7 @@ 
      *
      * @return void
      */
-    public function __set($var, $value)
-    {
+    public function __set($var, $value) {
         $method = '_set' . ucfirst($var);
         if (
             !property_exists($this, $var)

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)
@@ -255,8 +251,7 @@ 
      *
      * @return \Kitodo\Dlf\Common\Solr Instance of this class
      */
-    public static function getInstance($core = null)
-    {
+    public static function getInstance($core = null) {
         $logger = GeneralUtility::makeInstance(LogManager::class)->getLogger(__CLASS__);
 
         // Get core name if UID is given.
@@ -298,8 +293,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);
@@ -317,8 +311,7 @@ 
      *
      * @return void
      */
-    protected function loadSolrConnectionInfo()
-    {
+    protected function loadSolrConnectionInfo() {
         if (empty($this->config)) {
             $config = [];
             // Extract extension configuration.
@@ -356,8 +349,7 @@ 
      *
      * @return \Kitodo\Dlf\Common\DocumentList The result list
      */
-    public function search()
-    {
+    public function search() {
         $toplevel = [];
         // Take over query parameters.
         $params = $this->params;
@@ -426,8 +418,7 @@ 
      *
      * @return array The Apache Solr Documents that were fetched
      */
-    public function search_raw($query = '', $parameters = [])
-    {
+    public function search_raw($query = '', $parameters = []) {
         // Set additional query parameters.
         $parameters['start'] = 0;
         $parameters['rows'] = $this->limit;
@@ -459,8 +450,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;
     }
 
@@ -471,8 +461,7 @@ 
      *
      * @return int The max number of results
      */
-    protected function _getLimit()
-    {
+    protected function _getLimit() {
         return $this->limit;
     }
 
@@ -483,8 +472,7 @@ 
      *
      * @return int Total number of hits for last search
      */
-    protected function _getNumberOfHits()
-    {
+    protected function _getNumberOfHits() {
         return $this->numberOfHits;
     }
 
@@ -495,8 +483,7 @@ 
      *
      * @return bool Is the search instantiated successfully?
      */
-    protected function _getReady()
-    {
+    protected function _getReady() {
         return $this->ready;
     }
 
@@ -507,8 +494,7 @@ 
      *
      * @return \Solarium\Client Apache Solr service object
      */
-    protected function _getService()
-    {
+    protected function _getService() {
         return $this->service;
     }
 
@@ -521,8 +507,7 @@ 
      *
      * @return void
      */
-    protected function _setCPid($value)
-    {
+    protected function _setCPid($value) {
         $this->cPid = max(intval($value), 0);
     }
 
@@ -535,8 +520,7 @@ 
      *
      * @return void
      */
-    protected function _setLimit($value)
-    {
+    protected function _setLimit($value) {
         $this->limit = max(intval($value), 0);
     }
 
@@ -549,8 +533,7 @@ 
      *
      * @return void
      */
-    protected function _setParams(array $value)
-    {
+    protected function _setParams(array $value) {
         $this->params = $value;
     }
 
@@ -563,8 +546,7 @@ 
      *
      * @return mixed Value of $this->$var
      */
-    public function __get($var)
-    {
+    public function __get($var) {
         $method = '_get' . ucfirst($var);
         if (
             !property_exists($this, $var)
@@ -586,8 +568,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));
     }
 
@@ -601,8 +582,7 @@ 
      *
      * @return void
      */
-    public function __set($var, $value)
-    {
+    public function __set($var, $value) {
         $method = '_set' . ucfirst($var);
         if (
             !property_exists($this, $var)
@@ -623,8 +603,7 @@ 
      *
      * @return void
      */
-    protected function __construct($core)
-    {
+    protected function __construct($core) {
         // Get Solr connection parameters from configuration.
         $this->loadSolrConnectionInfo();
         // Configure connection adapter.

Classes/Common/Indexer.php

Braces +8 added lines, -16 removed lines

@@ -29,8 +29,7 @@ 
  * @subpackage dlf
  * @access public
  */
-class Indexer
-{
+class Indexer {
     /**
      * The extension key
      *
@@ -91,8 +90,7 @@ 
      *
      * @return int 0 on success or 1 on failure
      */
-    public static function add(Document &$doc, $core = 0)
-    {
+    public static function add(Document &$doc, $core = 0) {
         $logger = GeneralUtility::makeInstance(LogManager::class)->getLogger(__CLASS__);
 
         if (in_array($doc->uid, self::$processedDocs)) {
@@ -213,8 +211,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) {
         $logger = GeneralUtility::makeInstance(LogManager::class)->getLogger(__CLASS__);
 
         // Sanitize input.
@@ -242,8 +239,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');
@@ -313,8 +309,7 @@ 
      *
      * @return int 0 on success or 1 on failure
      */
-    protected static function processLogical(Document &$doc, array $logicalUnit)
-    {
+    protected static function processLogical(Document &$doc, array $logicalUnit) {
         $errors = 0;
         // Get metadata for logical unit.
         $metadata = $doc->metadataArray[$logicalUnit['id']];
@@ -434,8 +429,7 @@ 
      *
      * @return int 0 on success or 1 on failure
      */
-    protected static function processPhysical(Document &$doc, $page, array $physicalUnit)
-    {
+    protected static function processPhysical(Document &$doc, $page, array $physicalUnit) {
         if (
             $doc->hasFulltext
             && $fulltext = $doc->getRawText($physicalUnit['id'])
@@ -520,8 +514,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.
@@ -544,8 +537,7 @@ 
      *
      * @access private
      */
-    private function __construct()
-    {
+    private function __construct() {
         // This is a static class, thus no instances should be created.
     }
 }

Classes/Common/Helper.php

Braces +24 added lines, -48 removed lines

@@ -25,8 +25,7 @@ 
  * @subpackage dlf
  * @access public
  */
-class Helper
-{
+class Helper {
     /**
      * The extension key
      *
@@ -74,8 +73,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(
@@ -100,8 +98,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++) {
@@ -165,8 +162,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))
@@ -207,8 +203,7 @@ 
      * @return void
      */
     //TODO: find better way to handle logger in static class
-    public static function log($message, $severity = 0)
-    {
+    public static function log($message, $severity = 0) {
         $logger = GeneralUtility::makeInstance(LogManager::class)->getLogger(__CLASS__);
 
         switch ($severity) {
@@ -238,8 +233,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;
@@ -258,8 +252,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))
@@ -292,8 +285,7 @@ 
      *
      * @return string The unqualified class name
      */
-    public static function getUnqualifiedClassName($qualifiedClassname)
-    {
+    public static function getUnqualifiedClassName($qualifiedClassname) {
         $nameParts = explode('\\', $qualifiedClassname);
         return end($nameParts);
     }
@@ -307,8 +299,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.
@@ -329,8 +320,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) {
@@ -351,8 +341,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 (
@@ -402,8 +391,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)) {
@@ -448,8 +436,7 @@ 
      *
      * @return string The translated string or the given key on failure
      */
-    public static function getMessage($key, $hsc = false, $default = '')
-    {
+    public static function getMessage($key, $hsc = false, $default = '') {
         // Set initial output to default value.
         $translated = (string) $default;
         // Load common messages file.
@@ -491,8 +478,7 @@ 
      *
      * @return string "uid" for the given index_name
      */
-    public static function getUidFromIndexName($index_name, $table, $pid = -1)
-    {
+    public static function getUidFromIndexName($index_name, $table, $pid = -1) {
         if (
             !$index_name
             || !in_array($table, ['tx_dlf_collections', 'tx_dlf_libraries', 'tx_dlf_metadata', 'tx_dlf_structures', 'tx_dlf_solrcores'])
@@ -543,8 +529,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,
@@ -611,8 +596,7 @@ 
      *
      * @return bool Is $id a valid PPN?
      */
-    public static function isPPN($id)
-    {
+    public static function isPPN($id) {
         return self::checkIdentifier($id, 'PPN');
     }
 
@@ -625,8 +609,7 @@ 
      *
      * @return mixed Session value for given key or null on failure
      */
-    public static function loadFromSession($key)
-    {
+    public static function loadFromSession($key) {
         // Cast to string for security reasons.
         $key = (string) $key;
         if (!$key) {
@@ -658,8 +641,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;
     }
@@ -676,8 +658,7 @@ 
      *
      * @return array Array of substituted "NEW..." identifiers and their actual UIDs.
      */
-    public static function processDBasAdmin(array $data = [], array $cmd = [], $reverseOrder = false, $cmdFirst = false)
-    {
+    public static function processDBasAdmin(array $data = [], array $cmd = [], $reverseOrder = false, $cmdFirst = false) {
         if (
             \TYPO3_MODE === 'BE'
             && $GLOBALS['BE_USER']->isAdmin()
@@ -723,8 +704,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();
@@ -743,8 +723,7 @@ 
      *
      * @return bool true on success, false on failure
      */
-    public static function saveToSession($value, $key)
-    {
+    public static function saveToSession($value, $key) {
         // Cast to string for security reasons.
         $key = (string) $key;
         if (!$key) {
@@ -776,8 +755,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.
@@ -900,8 +878,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;
@@ -930,8 +907,7 @@ 
      *
      * @access private
      */
-    private function __construct()
-    {
+    private function __construct() {
         // This is a static class, thus no instances should be created.
     }
 }

Classes/Common/AbstractPlugin.php

Braces +9 added lines, -18 removed lines

@@ -29,8 +29,7 @@ 
  * @access public
  * @abstract
  */
-abstract class AbstractPlugin extends \TYPO3\CMS\Frontend\Plugin\AbstractPlugin implements LoggerAwareInterface
-{
+abstract class AbstractPlugin extends \TYPO3\CMS\Frontend\Plugin\AbstractPlugin implements LoggerAwareInterface {
     use LoggerAwareTrait;
 
     public $extKey = 'dlf';
@@ -73,8 +72,7 @@ 
      *
      * @return void
      */
-    protected function getTemplate($part = '###TEMPLATE###')
-    {
+    protected function getTemplate($part = '###TEMPLATE###') {
         $this->templateService = GeneralUtility::makeInstance(MarkerBasedTemplateService::class);
         if (!empty($this->conf['templateFile'])) {
             // Load template file from configuration.
@@ -98,8 +96,7 @@ 
      *
      * @return void
      */
-    protected function init(array $conf)
-    {
+    protected function init(array $conf) {
         // Read FlexForm configuration.
         $flexFormConf = [];
         $this->cObj->readFlexformIntoConf($this->cObj->data['pi_flexform'], $flexFormConf);
@@ -137,8 +134,7 @@ 
      *
      * @return void
      */
-    protected function loadDocument()
-    {
+    protected function loadDocument() {
         // Check for required variable.
         if (
             !empty($this->piVars['id'])
@@ -209,8 +205,7 @@ 
      *
      * @return array The resulting typoscript array
      */
-    protected function parseTS($string = '')
-    {
+    protected function parseTS($string = '') {
         $parser = GeneralUtility::makeInstance(\TYPO3\CMS\Core\TypoScript\Parser\TypoScriptParser::class);
         $parser->parse($string);
         return $parser->setup;
@@ -229,8 +224,7 @@ 
      *
      * @return string The input string wrapped in <a> tags
      */
-    public function pi_linkTP($str, $urlParameters = [], $cache = false, $altPageId = 0)
-    {
+    public function pi_linkTP($str, $urlParameters = [], $cache = false, $altPageId = 0) {
         // Remove when we don't need to support TYPO3 8.7 anymore.
         if (version_compare(\TYPO3\CMS\Core\Utility\VersionNumberUtility::getNumericTypo3Version(), '9.0.0', '<')) {
             return $this->pi_linkTP_fallback($str, $urlParameters, $cache, $altPageId);
@@ -263,8 +257,7 @@ 
      *
      * @return string The input string wrapped in <a> tags
      */
-    public function pi_linkTP_fallback($str, $urlParameters = [], $cache = false, $altPageId = 0)
-    {
+    public function pi_linkTP_fallback($str, $urlParameters = [], $cache = false, $altPageId = 0) {
         $conf = [];
         $conf['useCacheHash'] = $this->pi_USER_INT_obj ? 0 : $cache;
         $conf['no_cache'] = $this->pi_USER_INT_obj ? 0 : !$cache;
@@ -286,8 +279,7 @@ 
      *
      * @return string HTML content wrapped, ready to return to the parent object.
      */
-    public function pi_wrapInBaseClass($content)
-    {
+    public function pi_wrapInBaseClass($content) {
         if (!$this->frontendController->config['config']['disableWrapInBaseClass']) {
             // Use class name instead of $this->prefixId for content wrapping because $this->prefixId is the same for all plugins.
             $content = '<div class="tx-dlf-' . strtolower(Helper::getUnqualifiedClassName(get_class($this))) . '">' . $content . '</div>';
@@ -307,8 +299,7 @@ 
      *
      * @return void
      */
-    protected function setCache($cache = true)
-    {
+    protected function setCache($cache = true) {
         if ($cache) {
             // Set cObject type to "USER" (default).
             $this->pi_USER_INT_obj = false;