Erikmitk / kitodo-presentation

Classes/Common/FulltextInterface.php

Braces +1 added lines, -2 removed lines

@@ -21,8 +21,7 @@
  * @access public
  * @abstract
  */
-interface FulltextInterface
-{
+interface FulltextInterface {
     /**
      * This extracts raw fulltext data from XML
      *

Classes/Common/MetadataInterface.php

Braces +1 added lines, -2 removed lines

@@ -21,8 +21,7 @@
  * @access public
  * @abstract
  */
-interface MetadataInterface
-{
+interface MetadataInterface {
     /**
      * This extracts metadata from XML
      *

Classes/Common/IiifUrlReader.php

Braces +3 added lines, -6 removed lines

@@ -25,8 +25,7 @@ 
  * @subpackage dlf
  * @access public
  */
-class IiifUrlReader implements UrlReaderInterface
-{
+class IiifUrlReader implements UrlReaderInterface {
     /**
      * Singleton instance of the class
      *
@@ -40,8 +39,7 @@ 
      * {@inheritDoc}
      * @see \Ubl\Iiif\Tools\UrlReaderInterface::getContent()
      */
-    public function getContent($url)
-    {
+    public function getContent($url) {
         $fileContents = GeneralUtility::getUrl($url);
         if ($fileContents !== false) {
             return $fileContents;
@@ -57,8 +55,7 @@ 
      *
      * @return IiifUrlReader
      */
-    public static function getInstance()
-    {
+    public static function getInstance() {
         if (!isset(self::$instance)) {
             self::$instance = new IiifUrlReader();
         }

Upper-Lower-Casing +1 added lines, -1 removed lines

@@ -43,7 +43,7 @@
     public function getContent($url)
     {
         $fileContents = GeneralUtility::getUrl($url);
-        if ($fileContents !== false) {
+        if ($fileContents !== FALSE) {
             return $fileContents;
         } else {
             return '';

Classes/Common/DocumentList.php

Braces +30 added lines, -60 removed lines

@@ -97,8 +97,7 @@ 
      *
      * @return void
      */
-    public function add(array $elements, $position = -1)
-    {
+    public function add(array $elements, $position = -1) {
         $position = MathUtility::forceIntegerInRange($position, 0, $this->count, $this->count);
         if (!empty($elements)) {
             array_splice($this->elements, $position, 0, $elements);
@@ -114,8 +113,7 @@ 
      *
      * @return int The number of elements in the list
      */
-    public function count()
-    {
+    public function count() {
         return $this->count;
     }
 
@@ -127,8 +125,7 @@ 
      *
      * @return array The current element
      */
-    public function current()
-    {
+    public function current() {
         if ($this->valid()) {
             return $this->getRecord($this->elements[$this->position]);
         } else {
@@ -146,8 +143,7 @@ 
      *
      * @return mixed The element's full record
      */
-    protected function getRecord($element)
-    {
+    protected function getRecord($element) {
         if (
             is_array($element)
             && array_keys($element) == ['u', 'h', 's', 'p']
@@ -318,8 +314,7 @@ 
      *
      * @return int The current position
      */
-    public function key()
-    {
+    public function key() {
         return $this->position;
     }
 
@@ -333,8 +328,7 @@ 
      *
      * @return void
      */
-    public function move($position, $steps)
-    {
+    public function move($position, $steps) {
         $position = intval($position);
         // Check if list position is valid.
         if (
@@ -365,8 +359,7 @@ 
      *
      * @return void
      */
-    public function moveUp($position)
-    {
+    public function moveUp($position) {
         $this->move($position, -1);
     }
 
@@ -379,8 +372,7 @@ 
      *
      * @return void
      */
-    public function moveDown($position)
-    {
+    public function moveDown($position) {
         $this->move($position, 1);
     }
 
@@ -392,8 +384,7 @@ 
      *
      * @return void
      */
-    public function next()
-    {
+    public function next() {
         $this->position++;
     }
 
@@ -407,8 +398,7 @@ 
      *
      * @return bool Does the given offset exist?
      */
-    public function offsetExists($offset)
-    {
+    public function offsetExists($offset) {
         return isset($this->elements[$offset]);
     }
 
@@ -422,8 +412,7 @@ 
      *
      * @return array The element at the given offset
      */
-    public function offsetGet($offset)
-    {
+    public function offsetGet($offset) {
         if ($this->offsetExists($offset)) {
             return $this->getRecord($this->elements[$offset]);
         } else {
@@ -443,8 +432,7 @@ 
      *
      * @return void
      */
-    public function offsetSet($offset, $value)
-    {
+    public function offsetSet($offset, $value) {
         if (\TYPO3\CMS\Core\Utility\MathUtility::canBeInterpretedAsInteger($offset)) {
             $this->elements[$offset] = $value;
         } else {
@@ -464,8 +452,7 @@ 
      *
      * @return array The removed element
      */
-    public function remove($position)
-    {
+    public function remove($position) {
         $position = intval($position);
         if (
             $position < 0
@@ -489,8 +476,7 @@ 
      *
      * @return array The indizes of the removed elements
      */
-    public function removeRange($position, $length)
-    {
+    public function removeRange($position, $length) {
         $position = intval($position);
         if (
             $position < 0
@@ -511,8 +497,7 @@ 
      *
      * @return void
      */
-    public function reset()
-    {
+    public function reset() {
         $this->elements = [];
         $this->records = [];
         $this->metadata = [];
@@ -528,8 +513,7 @@ 
      *
      * @return void
      */
-    public function rewind()
-    {
+    public function rewind() {
         $this->position = 0;
     }
 
@@ -542,8 +526,7 @@ 
      *
      * @return void
      */
-    public function save($pid = 0)
-    {
+    public function save($pid = 0) {
         $pid = max(intval($pid), 0);
         // If no PID is given, save to the user's session instead
         if ($pid > 0) {
@@ -560,8 +543,7 @@ 
      *
      * @return bool true on success or false on failure
      */
-    protected function solrConnect()
-    {
+    protected function solrConnect() {
         // Get Solr instance.
         if (!$this->solr) {
             // Connect to Solr server.
@@ -607,8 +589,7 @@ 
      *
      * @return void
      */
-    public function sort($by, $asc = true)
-    {
+    public function sort($by, $asc = true) {
         $newOrder = [];
         $nonSortable = [];
         foreach ($this->elements as $num => $element) {
@@ -645,8 +626,7 @@ 
      *
      * @return void
      */
-    public function offsetUnset($offset)
-    {
+    public function offsetUnset($offset) {
         unset($this->elements[$offset]);
         // Re-number the elements.
         $this->elements = array_values($this->elements);
@@ -661,8 +641,7 @@ 
      *
      * @return bool Is the current list position valid?
      */
-    public function valid()
-    {
+    public function valid() {
         return isset($this->elements[$this->position]);
     }
 
@@ -673,8 +652,7 @@ 
      *
      * @return array The list's metadata
      */
-    protected function _getMetadata()
-    {
+    protected function _getMetadata() {
         return $this->metadata;
     }
 
@@ -687,8 +665,7 @@ 
      *
      * @return void
      */
-    protected function _setMetadata(array $metadata = [])
-    {
+    protected function _setMetadata(array $metadata = []) {
         $this->metadata = $metadata;
     }
 
@@ -702,8 +679,7 @@ 
      *
      * @return void
      */
-    public function __construct(array $elements = [], array $metadata = [])
-    {
+    public function __construct(array $elements = [], array $metadata = []) {
         if (
             empty($elements)
             && empty($metadata)
@@ -735,8 +711,7 @@ 
      *
      * @return void
      */
-    protected function __clone()
-    {
+    protected function __clone() {
         // This method is defined as protected because singleton objects should not be cloned.
     }
 
@@ -749,8 +724,7 @@ 
      *
      * @return mixed Value of $this->$var
      */
-    public function __get($var)
-    {
+    public function __get($var) {
         $method = '_get' . ucfirst($var);
         if (
             !property_exists($this, $var)
@@ -772,8 +746,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));
     }
 
@@ -787,8 +760,7 @@ 
      *
      * @return void
      */
-    public function __set($var, $value)
-    {
+    public function __set($var, $value) {
         $method = '_set' . ucfirst($var);
         if (
             !property_exists($this, $var)
@@ -808,8 +780,7 @@ 
      *
      * @return array Properties to be serialized
      */
-    public function __sleep()
-    {
+    public function __sleep() {
         return ['elements', 'metadata'];
     }
 
@@ -821,8 +792,7 @@ 
      *
      * @return void
      */
-    public function __wakeup()
-    {
+    public function __wakeup() {
         $this->count = count($this->elements);
     }
 }

Spacing +17 added lines, -17 removed lines

@@ -137,7 +137,7 @@ 
         if ($this->valid()) {
             return $this->getRecord($this->elements[$this->position]);
         } else {
-            $this->logger->notice('Invalid position "' . $this->position . '" for list element');
+            $this->logger->notice('Invalid position "'.$this->position.'" for list element');
             return;
         }
     }
@@ -240,9 +240,9 @@ 
                     $fields = Solr::getFields();
                     $params = [];
                     // Restrict the fields to the required ones
-                    $params['fields'] = $fields['uid'] . ',' . $fields['id'] . ',' . $fields['toplevel'] . ',' . $fields['thumbnail'] . ',' . $fields['page'];
+                    $params['fields'] = $fields['uid'].','.$fields['id'].','.$fields['toplevel'].','.$fields['thumbnail'].','.$fields['page'];
                     foreach ($this->solrConfig as $solr_name) {
-                        $params['fields'] .= ',' . $solr_name;
+                        $params['fields'] .= ','.$solr_name;
                     }
                     // If it is a fulltext search, enable highlighting.
                     if ($this->metadata['fulltextSearch']) {
@@ -264,15 +264,15 @@ 
                     // Extend filter query to get all documents with the same UID.
                     foreach ($params['filterquery'] as $key => $value) {
                         if (isset($value['query'])) {
-                            $params['filterquery'][$key]['query'] = $value['query'] . ' OR ' . $fields['toplevel'] . ':true';
+                            $params['filterquery'][$key]['query'] = $value['query'].' OR '.$fields['toplevel'].':true';
                         }
                     }
                     // Add filter query to get all documents with the required uid.
-                    $params['filterquery'][] = ['query' => $fields['uid'] . ':' . Solr::escapeQuery($record['uid'])];
+                    $params['filterquery'][] = ['query' => $fields['uid'].':'.Solr::escapeQuery($record['uid'])];
                     // Add sorting.
                     $params['sort'] = $this->metadata['options']['params']['sort'];
                     // Set query.
-                    $params['query'] = $this->metadata['options']['select'] . ' OR ' . $fields['toplevel'] . ':true';
+                    $params['query'] = $this->metadata['options']['select'].' OR '.$fields['toplevel'].':true';
                     // Perform search for all documents with the same uid that either fit to the search or marked as toplevel.
                     $selectQuery = $this->solr->service->createSelect($params);
                     $result = $this->solr->service->select($selectQuery);
@@ -347,7 +347,7 @@ 
             $position < 0
             || $position >= $this->count
         ) {
-            $this->logger->warning('Invalid position "' . $position . '" for element moving');
+            $this->logger->warning('Invalid position "'.$position.'" for element moving');
             return;
         }
         $steps = intval($steps);
@@ -355,7 +355,7 @@ 
         if (($position + $steps) < 0
             || ($position + $steps) >= $this->count
         ) {
-            $this->logger->warning('Invalid steps "' . $steps . '" for moving element at position "' . $position . '"');
+            $this->logger->warning('Invalid steps "'.$steps.'" for moving element at position "'.$position.'"');
             return;
         }
         $element = $this->remove($position);
@@ -433,7 +433,7 @@ 
         if ($this->offsetExists($offset)) {
             return $this->getRecord($this->elements[$offset]);
         } else {
-            $this->logger->notice('Invalid offset "' . $offset . '" for list element');
+            $this->logger->notice('Invalid offset "'.$offset.'" for list element');
             return;
         }
     }
@@ -477,7 +477,7 @@ 
             $position < 0
             || $position >= $this->count
         ) {
-            $this->logger->warning('Invalid position "' . $position . '" for element removing');
+            $this->logger->warning('Invalid position "'.$position.'" for element removing');
             return;
         }
         $removed = array_splice($this->elements, $position, 1);
@@ -502,7 +502,7 @@ 
             $position < 0
             || $position >= $this->count
         ) {
-            $this->logger->warning('Invalid position "' . $position . '" for element removing');
+            $this->logger->warning('Invalid position "'.$position.'" for element removing');
             return;
         }
         $removed = array_splice($this->elements, $position, $length);
@@ -595,7 +595,7 @@ 
                     ->execute();
 
                 while ($resArray = $result->fetch()) {
-                    $this->solrConfig[$resArray['index_name']] = $resArray['index_name'] . '_' . ($resArray['index_tokenized'] ? 't' : 'u') . 's' . ($resArray['index_indexed'] ? 'i' : 'u');
+                    $this->solrConfig[$resArray['index_name']] = $resArray['index_name'].'_'.($resArray['index_tokenized'] ? 't' : 'u').'s'.($resArray['index_indexed'] ? 'i' : 'u');
                 }
                 // Add static fields.
                 $this->solrConfig['type'] = 'type';
@@ -623,7 +623,7 @@ 
         foreach ($this->elements as $num => $element) {
             // Is this element sortable?
             if (!empty($element['s'][$by])) {
-                $newOrder[$element['s'][$by] . str_pad($num, 6, '0', STR_PAD_LEFT)] = $element;
+                $newOrder[$element['s'][$by].str_pad($num, 6, '0', STR_PAD_LEFT)] = $element;
             } else {
                 $nonSortable[] = $element;
             }
@@ -761,12 +761,12 @@ 
      */
     public function __get($var)
     {
-        $method = '_get' . ucfirst($var);
+        $method = '_get'.ucfirst($var);
         if (
             !property_exists($this, $var)
             || !method_exists($this, $method)
         ) {
-            $this->logger->warning('There is no getter function for property "' . $var . '"');
+            $this->logger->warning('There is no getter function for property "'.$var.'"');
             return;
         } else {
             return $this->$method();
@@ -799,12 +799,12 @@ 
      */
     public function __set($var, $value)
     {
-        $method = '_set' . ucfirst($var);
+        $method = '_set'.ucfirst($var);
         if (
             !property_exists($this, $var)
             || !method_exists($this, $method)
         ) {
-            $this->logger->warning('There is no setter function for property "' . $var . '"');
+            $this->logger->warning('There is no setter function for property "'.$var.'"');
         } else {
             $this->$method($value);
         }

Upper-Lower-Casing +6 added lines, -6 removed lines

@@ -222,7 +222,7 @@ 
                     if ($resArray['uid'] == $record['uid']) {
                         $record['thumbnail'] = $resArray['thumbnail'];
                         $record['metadata'] = $metadata;
-                    } elseif (($key = array_search(['u' => $resArray['uid']], $record['subparts'], true)) !== false) {
+                    } elseif (($key = array_search(['u' => $resArray['uid']], $record['subparts'], TRUE)) !== FALSE) {
                         $record['subparts'][$key] = [
                             'uid' => $resArray['uid'],
                             'page' => 1,
@@ -250,7 +250,7 @@ 
                             'highlighting' => [
                                 'query' => Solr::escapeQuery($this->metadata['searchString']),
                                 'field' => $fields['fulltext'],
-                                'usefastvectorhighlighter' => true
+                                'usefastvectorhighlighter' => TRUE
                             ]
                         ];
                     }
@@ -294,7 +294,7 @@ 
                             $record['thumbnail'] = $resArray->thumbnail;
                             $record['metadata'] = $metadata;
                         } else {
-                            $highlightedDoc = !empty($highlighting) ? $highlighting->getResult($resArray->id) : null;
+                            $highlightedDoc = !empty($highlighting) ? $highlighting->getResult($resArray->id) : NULL;
                             $highlight = !empty($highlightedDoc) ? $highlightedDoc->getField($fields['fulltext'])[0] : '';
                             $record['subparts'][$resArray->id] = [
                                 'uid' => $resArray->uid,
@@ -600,10 +600,10 @@ 
                 // Add static fields.
                 $this->solrConfig['type'] = 'type';
             } else {
-                return false;
+                return FALSE;
             }
         }
-        return true;
+        return TRUE;
     }
 
     /**
@@ -616,7 +616,7 @@ 
      *
      * @return void
      */
-    public function sort($by, $asc = true)
+    public function sort($by, $asc = TRUE)
     {
         $newOrder = [];
         $nonSortable = [];

Classes/Common/KitodoFlashMessageRenderer.php

Spacing +5 added lines, -5 removed lines

@@ -65,7 +65,7 @@ 
      */
     protected function getClass(FlashMessage $flashMessage): string
     {
-        return 'alert-' . self::$classes[$flashMessage->getSeverity()];
+        return 'alert-'.self::$classes[$flashMessage->getSeverity()];
     }
 
     /**
@@ -95,19 +95,19 @@ 
         $markup[] = '<div class="typo3-messages">';
         foreach ($flashMessages as $flashMessage) {
             $messageTitle = $flashMessage->getTitle();
-            $markup[] = '<div class="alert ' . htmlspecialchars($this->getClass($flashMessage)) . '">';
+            $markup[] = '<div class="alert '.htmlspecialchars($this->getClass($flashMessage)).'">';
             $markup[] = '  <div class="media">';
             $markup[] = '    <div class="media-left">';
             $markup[] = '      <span class="fa-stack fa-lg">';
             $markup[] = '        <i class="fa fa-circle fa-stack-2x"></i>';
-            $markup[] = '        <i class="fa fa-' . htmlspecialchars($this->getIconName($flashMessage)) . ' fa-stack-1x"></i>';
+            $markup[] = '        <i class="fa fa-'.htmlspecialchars($this->getIconName($flashMessage)).' fa-stack-1x"></i>';
             $markup[] = '      </span>';
             $markup[] = '    </div>';
             $markup[] = '    <div class="media-body">';
             if ($messageTitle !== '') {
-                $markup[] = '      <h4 class="alert-title">' . htmlspecialchars($messageTitle) . '</h4>';
+                $markup[] = '      <h4 class="alert-title">'.htmlspecialchars($messageTitle).'</h4>';
             }
-            $markup[] = '      <p class="alert-message">' . $flashMessage->getMessage() . '</p>';
+            $markup[] = '      <p class="alert-message">'.$flashMessage->getMessage().'</p>';
             $markup[] = '    </div>';
             $markup[] = '  </div>';
             $markup[] = '</div>';

Braces +1 added lines, -2 removed lines

@@ -21,8 +21,7 @@
  * The created output contains all classes which are required for
  * the TYPO3 backend. Any kind of message contains also a nice icon.
  */
-class KitodoFlashMessageRenderer implements \TYPO3\CMS\Core\Messaging\Renderer\FlashMessageRendererInterface
-{
+class KitodoFlashMessageRenderer implements \TYPO3\CMS\Core\Messaging\Renderer\FlashMessageRendererInterface {
     /**
      * @var string The message severity class names
      */

class.ext_update.php

Braces +1 added lines, -2 removed lines

@@ -23,8 +23,7 @@
  * @subpackage dlf
  * @access public
  */
-class ext_update
-{
+class ext_update {
     /**
      * This holds the output ready to return
      *

Upper-Lower-Casing +17 added lines, -17 removed lines

@@ -43,21 +43,21 @@ 
     public function access(): bool
     {
         if (count($this->getMetadataConfig())) {
-            return true;
+            return TRUE;
         }
         if ($this->oldIndexRelatedTableNames()) {
-            return true;
+            return TRUE;
         }
         if ($this->solariumSolrUpdateRequired()) {
-            return true;
+            return TRUE;
         }
         if (count($this->oldFormatClasses())) {
-            return true;
+            return TRUE;
         }
         if ($this->hasNoFormatForDocument()) {
-            return true;
+            return TRUE;
         }
-        return false;
+        return FALSE;
     }
 
     /**
@@ -142,10 +142,10 @@ 
             // Instantiate search object.
             $solr = Solr::getInstance($resArray['index_name']);
             if (!$solr->ready) {
-                return true;
+                return TRUE;
             }
         }
-        return false;
+        return FALSE;
     }
 
     /**
@@ -201,10 +201,10 @@ 
                 || $resArray['column_name'] === 'boost'
                 || $resArray['column_name'] === 'autocomplete'
             ) {
-                return true;
+                return TRUE;
             }
         }
-        return false;
+        return FALSE;
     }
 
     /**
@@ -214,7 +214,7 @@ 
      * @param bool $checkStructureOnly
      * @return bool
      */
-    protected function hasNoFormatForDocument($checkStructureOnly = false): bool
+    protected function hasNoFormatForDocument($checkStructureOnly = FALSE): bool
     {
         // Check if column "document_format" exists.
         $database = $GLOBALS['TYPO3_CONF_VARS']['DB']['Connections']['Default']['dbname'];
@@ -229,7 +229,7 @@ 
         while ($resArray = $result->fetch()) {
             if ($resArray['COLUMN_NAME'] === 'document_format') {
                 if ($checkStructureOnly) {
-                    return false;
+                    return FALSE;
                 }
                 // Check if column has empty fields.
                 $queryBuilder = GeneralUtility::makeInstance(ConnectionPool::class)->getQueryBuilderForTable('INFORMATION_SCHEMA.COLUMNS');
@@ -241,11 +241,11 @@ 
                     ->fetchColumn(0);
 
                 if ($count === 0) {
-                    return false;
+                    return FALSE;
                 }
             }
         }
-        return true;
+        return TRUE;
     }
 
     /**
@@ -395,7 +395,7 @@ 
      */
     protected function doSolariumSolrUpdate(): void
     {
-        $error = false;
+        $error = FALSE;
         // Get all Solr cores that were not deleted.
         $queryBuilder = GeneralUtility::makeInstance(ConnectionPool::class)->getQueryBuilderForTable('tx_dlf_solrcores');
         $result = $queryBuilder
@@ -412,7 +412,7 @@ 
                     \TYPO3\CMS\Core\Messaging\FlashMessage::ERROR
                 );
                 $this->content .= Helper::renderFlashMessages();
-                $error = true;
+                $error = TRUE;
             }
         }
         if (!$error) {
@@ -439,7 +439,7 @@ 
             ->update('tx_dlf_documents')
             ->where(
                 $queryBuilder->expr()->orX(
-                    $queryBuilder->expr()->eq('document_format', $queryBuilder->createNamedParameter(null)),
+                    $queryBuilder->expr()->eq('document_format', $queryBuilder->createNamedParameter(NULL)),
                     $queryBuilder->expr()->eq('document_format', $queryBuilder->createNamedParameter(''))
                 )
             )

Spacing +1 added lines, -1 removed lines

@@ -224,7 +224,7 @@
         $result = $queryBuilder
             ->select('COLUMN_NAME')
             ->from('INFORMATION_SCHEMA.COLUMNS')
-            ->where('TABLE_NAME="tx_dlf_documents" AND TABLE_SCHEMA="' . $database . '" AND COLUMN_NAME="document_format"')
+            ->where('TABLE_NAME="tx_dlf_documents" AND TABLE_SCHEMA="'.$database.'" AND COLUMN_NAME="document_format"')
             ->execute();
         while ($resArray = $result->fetch()) {
             if ($resArray['COLUMN_NAME'] === 'document_format') {

ext_emconf.php

Upper-Lower-Casing +2 added lines, -2 removed lines

@@ -24,8 +24,8 @@
         'suggests' => []
     ],
     'state' => 'stable',
-    'uploadfolder' => false,
-    'clearCacheOnLoad' => false,
+    'uploadfolder' => FALSE,
+    'clearCacheOnLoad' => FALSE,
     'author' => 'Sebastian Meyer (Maintainer)',
     'author_email' => 'contact@kitodo.org',
     'author_company' => 'Kitodo. Key to digital objects e. V.',

Classes/Plugin/Navigation.php

Spacing +17 added lines, -17 removed lines

@@ -69,18 +69,18 @@ 
             'forceAbsoluteUrl' => !empty($this->conf['forceAbsoluteUrl']) ? 1 : 0,
             'forceAbsoluteUrl.' => ['scheme' => !empty($this->conf['forceAbsoluteUrl']) && !empty($this->conf['forceAbsoluteUrlHttps']) ? 'https' : 'http']
         ];
-        $output = '<form action="' . $this->cObj->typoLink_URL($linkConf) . '" method="get"><div><input type="hidden" name="id" value="' . $GLOBALS['TSFE']->id . '" />';
+        $output = '<form action="'.$this->cObj->typoLink_URL($linkConf).'" method="get"><div><input type="hidden" name="id" value="'.$GLOBALS['TSFE']->id.'" />';
         // Add plugin variables.
         foreach ($this->piVars as $piVar => $value) {
             if ($piVar != 'page' && $piVar != 'DATA' && !empty($value)) {
-                $output .= '<input type="hidden" name="' . $this->prefixId . '[' . preg_replace('/[^A-Za-z0-9_-]/', '', $piVar) . ']" value="' . htmlspecialchars($value) . '" />';
+                $output .= '<input type="hidden" name="'.$this->prefixId.'['.preg_replace('/[^A-Za-z0-9_-]/', '', $piVar).']" value="'.htmlspecialchars($value).'" />';
             }
         }
         // Add page selector.
-        $uniqId = uniqid(Helper::getUnqualifiedClassName(get_class($this)) . '-');
-        $output .= '<label for="' . $uniqId . '">' . htmlspecialchars($this->pi_getLL('selectPage', '')) . '</label><select id="' . $uniqId . '" name="' . $this->prefixId . '[page]" onchange="javascript:this.form.submit();"' . ($this->doc->numPages < 1 ? ' disabled="disabled"' : '') . '>';
+        $uniqId = uniqid(Helper::getUnqualifiedClassName(get_class($this)).'-');
+        $output .= '<label for="'.$uniqId.'">'.htmlspecialchars($this->pi_getLL('selectPage', '')).'</label><select id="'.$uniqId.'" name="'.$this->prefixId.'[page]" onchange="javascript:this.form.submit();"'.($this->doc->numPages < 1 ? ' disabled="disabled"' : '').'>';
         for ($i = 1; $i <= $this->doc->numPages; $i++) {
-            $output .= '<option value="' . $i . '"' . ($this->piVars['page'] == $i ? ' selected="selected"' : '') . '>[' . $i . ']' . ($this->doc->physicalStructureInfo[$this->doc->physicalStructure[$i]]['orderlabel'] ? ' - ' . htmlspecialchars($this->doc->physicalStructureInfo[$this->doc->physicalStructure[$i]]['orderlabel']) : '') . '</option>';
+            $output .= '<option value="'.$i.'"'.($this->piVars['page'] == $i ? ' selected="selected"' : '').'>['.$i.']'.($this->doc->physicalStructureInfo[$this->doc->physicalStructure[$i]]['orderlabel'] ? ' - '.htmlspecialchars($this->doc->physicalStructureInfo[$this->doc->physicalStructure[$i]]['orderlabel']) : '').'</option>';
         }
         $output .= '</select></div></form>';
         return $output;
@@ -138,53 +138,53 @@ 
         if ($this->piVars['page'] > 1) {
             $markerArray['###FIRST###'] = $this->makeLink(htmlspecialchars($this->pi_getLL('firstPage', '')), ['page' => 1]);
         } else {
-            $markerArray['###FIRST###'] = '<span title="' . htmlspecialchars($this->pi_getLL('firstPage', '')) . '">' . htmlspecialchars($this->pi_getLL('firstPage', '')) . '</span>';
+            $markerArray['###FIRST###'] = '<span title="'.htmlspecialchars($this->pi_getLL('firstPage', '')).'">'.htmlspecialchars($this->pi_getLL('firstPage', '')).'</span>';
         }
         // Link back X pages.
         if ($this->piVars['page'] > $pageSteps) {
             $markerArray['###BACK###'] = $this->makeLink(htmlspecialchars(sprintf($this->pi_getLL('backXPages', ''), $pageSteps)), ['page' => $this->piVars['page'] - $pageSteps]);
         } else {
-            $markerArray['###BACK###'] = '<span title="' . htmlspecialchars(sprintf($this->pi_getLL('backXPages', ''), $pageSteps)) . '">' . htmlspecialchars(sprintf($this->pi_getLL('backXPages', ''), $pageSteps)) . '</span>';
+            $markerArray['###BACK###'] = '<span title="'.htmlspecialchars(sprintf($this->pi_getLL('backXPages', ''), $pageSteps)).'">'.htmlspecialchars(sprintf($this->pi_getLL('backXPages', ''), $pageSteps)).'</span>';
         }
         // Link to previous page.
         if ($this->piVars['page'] > (1 + $this->piVars['double'])) {
             $markerArray['###PREVIOUS###'] = $this->makeLink(htmlspecialchars($this->pi_getLL('prevPage', '')), ['page' => $this->piVars['page'] - (1 + $this->piVars['double'])]);
         } else {
-            $markerArray['###PREVIOUS###'] = '<span title="' . htmlspecialchars($this->pi_getLL('prevPage', '')) . '">' . htmlspecialchars($this->pi_getLL('prevPage', '')) . '</span>';
+            $markerArray['###PREVIOUS###'] = '<span title="'.htmlspecialchars($this->pi_getLL('prevPage', '')).'">'.htmlspecialchars($this->pi_getLL('prevPage', '')).'</span>';
         }
         // Link to next page.
         if ($this->piVars['page'] < ($this->doc->numPages - $this->piVars['double'])) {
             $markerArray['###NEXT###'] = $this->makeLink(htmlspecialchars($this->pi_getLL('nextPage', '')), ['page' => $this->piVars['page'] + (1 + $this->piVars['double'])]);
         } else {
-            $markerArray['###NEXT###'] = '<span title="' . htmlspecialchars($this->pi_getLL('nextPage', '')) . '">' . htmlspecialchars($this->pi_getLL('nextPage', '')) . '</span>';
+            $markerArray['###NEXT###'] = '<span title="'.htmlspecialchars($this->pi_getLL('nextPage', '')).'">'.htmlspecialchars($this->pi_getLL('nextPage', '')).'</span>';
         }
         // Link forward X pages.
         if ($this->piVars['page'] <= ($this->doc->numPages - $pageSteps)) {
             $markerArray['###FORWARD###'] = $this->makeLink(htmlspecialchars(sprintf($this->pi_getLL('forwardXPages', ''), $pageSteps)), ['page' => $this->piVars['page'] + $pageSteps]);
         } else {
-            $markerArray['###FORWARD###'] = '<span title="' . htmlspecialchars(sprintf($this->pi_getLL('forwardXPages', ''), $pageSteps)) . '">' . htmlspecialchars(sprintf($this->pi_getLL('forwardXPages', ''), $pageSteps)) . '</span>';
+            $markerArray['###FORWARD###'] = '<span title="'.htmlspecialchars(sprintf($this->pi_getLL('forwardXPages', ''), $pageSteps)).'">'.htmlspecialchars(sprintf($this->pi_getLL('forwardXPages', ''), $pageSteps)).'</span>';
         }
         // Link to last page.
         if ($this->piVars['page'] < $this->doc->numPages) {
             $markerArray['###LAST###'] = $this->makeLink(htmlspecialchars($this->pi_getLL('lastPage', '')), ['page' => $this->doc->numPages]);
         } else {
-            $markerArray['###LAST###'] = '<span title="' . htmlspecialchars($this->pi_getLL('lastPage', '')) . '">' . htmlspecialchars($this->pi_getLL('lastPage', '')) . '</span>';
+            $markerArray['###LAST###'] = '<span title="'.htmlspecialchars($this->pi_getLL('lastPage', '')).'">'.htmlspecialchars($this->pi_getLL('lastPage', '')).'</span>';
         }
         // Add double page switcher.
         if ($this->doc->numPages > 0) {
             if (!$this->piVars['double']) {
-                $markerArray['###DOUBLEPAGE###'] = $this->makeLink(htmlspecialchars($this->pi_getLL('doublePageOn', '')), ['double' => 1], 'class="tx-dlf-navigation-doubleOn" title="' . htmlspecialchars($this->pi_getLL('doublePageOn', '')) . '"');
+                $markerArray['###DOUBLEPAGE###'] = $this->makeLink(htmlspecialchars($this->pi_getLL('doublePageOn', '')), ['double' => 1], 'class="tx-dlf-navigation-doubleOn" title="'.htmlspecialchars($this->pi_getLL('doublePageOn', '')).'"');
             } else {
-                $markerArray['###DOUBLEPAGE###'] = $this->makeLink(htmlspecialchars($this->pi_getLL('doublePageOff', '')), ['double' => 0], 'class="tx-dlf-navigation-doubleOff" title="' . htmlspecialchars($this->pi_getLL('doublePageOff', '')) . '"');
+                $markerArray['###DOUBLEPAGE###'] = $this->makeLink(htmlspecialchars($this->pi_getLL('doublePageOff', '')), ['double' => 0], 'class="tx-dlf-navigation-doubleOff" title="'.htmlspecialchars($this->pi_getLL('doublePageOff', '')).'"');
             }
             if ($this->piVars['double'] && $this->piVars['page'] < $this->doc->numPages) {
-                $markerArray['###DOUBLEPAGE+1###'] = $this->makeLink(htmlspecialchars($this->pi_getLL('doublePage+1', '')), ['page' => $this->piVars['page'] + 1], 'title="' . htmlspecialchars($this->pi_getLL('doublePage+1', '')) . '"');
+                $markerArray['###DOUBLEPAGE+1###'] = $this->makeLink(htmlspecialchars($this->pi_getLL('doublePage+1', '')), ['page' => $this->piVars['page'] + 1], 'title="'.htmlspecialchars($this->pi_getLL('doublePage+1', '')).'"');
             } else {
-                $markerArray['###DOUBLEPAGE+1###'] = '<span title="' . htmlspecialchars($this->pi_getLL('doublePage+1', '')) . '">' . htmlspecialchars($this->pi_getLL('doublePage+1', '')) . '</span>';
+                $markerArray['###DOUBLEPAGE+1###'] = '<span title="'.htmlspecialchars($this->pi_getLL('doublePage+1', '')).'">'.htmlspecialchars($this->pi_getLL('doublePage+1', '')).'</span>';
             }
         } else {
-            $markerArray['###DOUBLEPAGE###'] = '<span title="' . htmlspecialchars($this->pi_getLL('doublePageOn', '')) . '">' . htmlspecialchars($this->pi_getLL('doublePageOn', '')) . '</span>';
-            $markerArray['###DOUBLEPAGE+1###'] = '<span title="' . htmlspecialchars($this->pi_getLL('doublePage+1', '')) . '">' . htmlspecialchars($this->pi_getLL('doublePage+1', '')) . '</span>';
+            $markerArray['###DOUBLEPAGE###'] = '<span title="'.htmlspecialchars($this->pi_getLL('doublePageOn', '')).'">'.htmlspecialchars($this->pi_getLL('doublePageOn', '')).'</span>';
+            $markerArray['###DOUBLEPAGE+1###'] = '<span title="'.htmlspecialchars($this->pi_getLL('doublePage+1', '')).'">'.htmlspecialchars($this->pi_getLL('doublePage+1', '')).'</span>';
         }
         // Add page selector.
         $markerArray['###PAGESELECT###'] = $this->getPageSelector();

Braces +5 added lines, -10 removed lines

@@ -25,8 +25,7 @@ 
  * @subpackage dlf
  * @access public
  */
-class Navigation extends \Kitodo\Dlf\Common\AbstractPlugin
-{
+class Navigation extends \Kitodo\Dlf\Common\AbstractPlugin {
     public $scriptRelPath = 'Classes/Plugin/Navigation.php';
 
     /**
@@ -36,8 +35,7 @@ 
      *
      * @return string Link to the list view ready to output
      */
-    protected function getLinkToListview()
-    {
+    protected function getLinkToListview() {
         if (!empty($this->conf['targetPid'])) {
             // Load the list.
             $list = GeneralUtility::makeInstance(DocumentList::class);
@@ -63,8 +61,7 @@ 
      *
      * @return string Page selector ready to output
      */
-    protected function getPageSelector()
-    {
+    protected function getPageSelector() {
         // Configure @action URL for form.
         $linkConf = [
             'parameter' => $GLOBALS['TSFE']->id,
@@ -98,8 +95,7 @@ 
      *
      * @return string The content that is displayed on the website
      */
-    public function main($content, $conf)
-    {
+    public function main($content, $conf) {
         $this->init($conf);
         // Turn cache on.
         $this->setCache(true);
@@ -214,8 +210,7 @@ 
      *
      * @return string Typolink ready to output
      */
-    protected function makeLink($label, array $overrulePIvars = [], $aTagParams = '')
-    {
+    protected function makeLink($label, array $overrulePIvars = [], $aTagParams = '') {
         // Merge plugin variables with new set of values.
         if (is_array($this->piVars)) {
             $piVars = $this->piVars;

Upper-Lower-Casing +3 added lines, -3 removed lines

@@ -102,10 +102,10 @@ 
     {
         $this->init($conf);
         // Turn cache on.
-        $this->setCache(true);
+        $this->setCache(TRUE);
         // Load current document.
         $this->loadDocument();
-        if ($this->doc === null) {
+        if ($this->doc === NULL) {
             // Quit without doing anything if required variables are not set.
             return $content;
         } else {
@@ -229,7 +229,7 @@ 
             'forceAbsoluteUrl' => !empty($this->conf['forceAbsoluteUrl']) ? 1 : 0,
             'forceAbsoluteUrl.' => ['scheme' => !empty($this->conf['forceAbsoluteUrl']) && !empty($this->conf['forceAbsoluteUrlHttps']) ? 'https' : 'http'],
             'ATagParams' => $aTagParams,
-            'additionalParams' => GeneralUtility::implodeArrayForUrl($this->prefixId, $overrulePIvars, '', true, false),
+            'additionalParams' => GeneralUtility::implodeArrayForUrl($this->prefixId, $overrulePIvars, '', TRUE, FALSE),
             'title' => $label
         ];
         return $this->cObj->typoLink($label, $conf);

Classes/ExpressionLanguage/DocumentTypeProvider.php

Braces +2 added lines, -4 removed lines

@@ -23,10 +23,8 @@
  * @subpackage dlf
  * @access public
  */
-class DocumentTypeProvider extends AbstractProvider
-{
-    public function __construct()
-    {
+class DocumentTypeProvider extends AbstractProvider {
+    public function __construct() {
         $this->expressionLanguageProviders = [
             DocumentTypeFunctionProvider::class
         ];