Erikmitk / kitodo-presentation

Classes/Hooks/ConfigurationForm.php

Braces +4 added lines, -8 removed lines

@@ -28,8 +28,7 @@ 
  * @subpackage dlf
  * @access public
  */
-class ConfigurationForm
-{
+class ConfigurationForm {
     /**
      * This holds the current configuration
      *
@@ -45,8 +44,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(
@@ -71,8 +69,7 @@ 
      *
      * @return string Message informing the user of success or failure
      */
-    public function checkMetadataFormats()
-    {
+    public function checkMetadataFormats() {
         // We need to do some bootstrapping manually as of TYPO3 9.
         // Load table configuration array into $GLOBALS['TCA'].
         ExtensionManagementUtility::loadBaseTca(false);
@@ -201,8 +198,7 @@ 
      *
      * @return void
      */
-    public function __construct()
-    {
+    public function __construct() {
         // Load localization file.
         $GLOBALS['LANG']->includeLLFile('EXT:dlf/Resources/Private/Language/FlashMessages.xml');
         // Get current configuration.

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

@@ -75,21 +75,21 @@ 
     {
         // We need to do some bootstrapping manually as of TYPO3 9.
         // Load table configuration array into $GLOBALS['TCA'].
-        ExtensionManagementUtility::loadBaseTca(false);
+        ExtensionManagementUtility::loadBaseTca(FALSE);
         // Get extension configuration from dlf/ext_localconf.php.
-        ExtensionManagementUtility::loadExtLocalconf(false);
+        ExtensionManagementUtility::loadExtLocalconf(FALSE);
         // Initialize backend user into $GLOBALS['BE_USER'].
         Bootstrap::initializeBackendUser();
         // Initialize backend and ensure authenticated access.
         Bootstrap::initializeBackendAuthentication();
 
         $nsDefined = [
-            'MODS' => false,
-            'TEIHDR' => false,
-            'ALTO' => false,
-            'IIIF1' => false,
-            'IIIF2' => false,
-            'IIIF3' => false
+            'MODS' => FALSE,
+            'TEIHDR' => FALSE,
+            'ALTO' => FALSE,
+            'IIIF1' => FALSE,
+            'IIIF2' => FALSE,
+            'IIIF3' => FALSE
         ];
         $queryBuilder = GeneralUtility::makeInstance(ConnectionPool::class)
             ->getQueryBuilderForTable('tx_dlf_formats');
@@ -104,7 +104,7 @@ 
             ->execute();
 
         while ($resArray = $result->fetch()) {
-            $nsDefined[$resArray['type']] = true;
+            $nsDefined[$resArray['type']] = TRUE;
         }
         // Build data array.
         $data = [];

Classes/Common/AbstractPlugin.php

Braces +8 added lines, -16 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) {
         $conf = [];
         if (!$cache) {
             $conf['no_cache'] = true;
@@ -253,8 +247,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>';
@@ -274,8 +267,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;

Spacing +10 added lines, -10 removed lines

@@ -81,7 +81,7 @@ 
             $templateFile = $this->conf['templateFile'];
         } else {
             // Load default template from extension.
-            $templateFile = 'EXT:' . $this->extKey . '/Resources/Private/Templates/' . Helper::getUnqualifiedClassName(get_class($this)) . '.tmpl';
+            $templateFile = 'EXT:'.$this->extKey.'/Resources/Private/Templates/'.Helper::getUnqualifiedClassName(get_class($this)).'.tmpl';
         }
         // Substitute strings like "EXT:" in given template file location.
         $fileResource = $GLOBALS['TSFE']->tmpl->getFileName($templateFile);
@@ -107,12 +107,12 @@ 
             $conf = Helper::mergeRecursiveWithOverrule($flexFormConf, $conf);
         }
         // Read plugin TS configuration.
-        $pluginConf = $GLOBALS['TSFE']->tmpl->setup['plugin.']['tx_dlf_' . strtolower(Helper::getUnqualifiedClassName(get_class($this))) . '.'];
+        $pluginConf = $GLOBALS['TSFE']->tmpl->setup['plugin.']['tx_dlf_'.strtolower(Helper::getUnqualifiedClassName(get_class($this))).'.'];
         if (is_array($pluginConf)) {
             $conf = Helper::mergeRecursiveWithOverrule($pluginConf, $conf);
         }
         // Read general TS configuration.
-        $generalConf = $GLOBALS['TSFE']->tmpl->setup['plugin.'][$this->prefixId . '.'];
+        $generalConf = $GLOBALS['TSFE']->tmpl->setup['plugin.'][$this->prefixId.'.'];
         if (is_array($generalConf)) {
             $conf = Helper::mergeRecursiveWithOverrule($generalConf, $conf);
         }
@@ -127,7 +127,7 @@ 
         // Set default plugin variables.
         $this->pi_setPiVarDefaults();
         // Load translation files.
-        $this->pi_loadLL('EXT:' . $this->extKey . '/Resources/Private/Language/' . Helper::getUnqualifiedClassName(get_class($this)) . '.xml');
+        $this->pi_loadLL('EXT:'.$this->extKey.'/Resources/Private/Language/'.Helper::getUnqualifiedClassName(get_class($this)).'.xml');
     }
 
     /**
@@ -151,7 +151,7 @@ 
             if (!$this->doc->ready) {
                 // Destroy the incomplete object.
                 $this->doc = null;
-                $this->logger->error('Failed to load document with UID ' . $this->piVars['id']);
+                $this->logger->error('Failed to load document with UID '.$this->piVars['id']);
             } else {
                 // Set configuration PID.
                 $this->doc->cPid = $this->conf['pages'];
@@ -179,10 +179,10 @@ 
                 // Try to load document.
                 $this->loadDocument();
             } else {
-                $this->logger->error('Failed to load document with record ID "' . $this->piVars['recordId'] . '"');
+                $this->logger->error('Failed to load document with record ID "'.$this->piVars['recordId'].'"');
             }
         } else {
-            $this->logger->error('Invalid UID ' . $this->piVars['id'] . ' or PID ' . $this->conf['pages'] . ' for document loading');
+            $this->logger->error('Invalid UID '.$this->piVars['id'].' or PID '.$this->conf['pages'].' for document loading');
         }
     }
 
@@ -236,7 +236,7 @@ 
             $conf['no_cache'] = true;
         }
         $conf['parameter'] = $altPageId ? : ($this->pi_tmpPageId ? : 'current');
-        $conf['additionalParams'] = $this->conf['parent.']['addParams'] . HttpUtility::buildQueryString($urlParameters, '&', true) . $this->pi_moreParams;
+        $conf['additionalParams'] = $this->conf['parent.']['addParams'].HttpUtility::buildQueryString($urlParameters, '&', true).$this->pi_moreParams;
         // Add additional configuration for absolute URLs.
         $conf['forceAbsoluteUrl'] = !empty($this->conf['forceAbsoluteUrl']) ? 1 : 0;
         $conf['forceAbsoluteUrl.']['scheme'] = !empty($this->conf['forceAbsoluteUrl']) && !empty($this->conf['forceAbsoluteUrlHttps']) ? 'https' : 'http';
@@ -257,9 +257,9 @@ 
     {
         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>';
+            $content = '<div class="tx-dlf-'.strtolower(Helper::getUnqualifiedClassName(get_class($this))).'">'.$content.'</div>';
             if (!$this->frontendController->config['config']['disablePrefixComment']) {
-                $content = "\n\n<!-- BEGIN: Content of extension '" . $this->extKey . "', plugin '" . Helper::getUnqualifiedClassName(get_class($this)) . "' -->\n\n" . $content . "\n\n<!-- END: Content of extension '" . $this->extKey . "', plugin '" . Helper::getUnqualifiedClassName(get_class($this)) . "' -->\n\n";
+                $content = "\n\n<!-- BEGIN: Content of extension '".$this->extKey."', plugin '".Helper::getUnqualifiedClassName(get_class($this))."' -->\n\n".$content."\n\n<!-- END: Content of extension '".$this->extKey."', plugin '".Helper::getUnqualifiedClassName(get_class($this))."' -->\n\n";
             }
         }
         return $content;

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

@@ -37,8 +37,8 @@ 
     public $prefixId = 'tx_dlf';
     public $scriptRelPath = 'Classes/Common/AbstractPlugin.php';
     // Plugins are cached by default (@see setCache()).
-    public $pi_USER_INT_obj = false;
-    public $pi_checkCHash = true;
+    public $pi_USER_INT_obj = FALSE;
+    public $pi_checkCHash = TRUE;
 
     /**
      * This holds the current document
@@ -150,7 +150,7 @@ 
             $this->doc = Document::getInstance($this->piVars['id'], $pid);
             if (!$this->doc->ready) {
                 // Destroy the incomplete object.
-                $this->doc = null;
+                $this->doc = NULL;
                 $this->logger->error('Failed to load document with UID ' . $this->piVars['id']);
             } else {
                 // Set configuration PID.
@@ -229,14 +229,14 @@ 
      *
      * @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)
     {
         $conf = [];
         if (!$cache) {
-            $conf['no_cache'] = true;
+            $conf['no_cache'] = TRUE;
         }
         $conf['parameter'] = $altPageId ? : ($this->pi_tmpPageId ? : 'current');
-        $conf['additionalParams'] = $this->conf['parent.']['addParams'] . HttpUtility::buildQueryString($urlParameters, '&', true) . $this->pi_moreParams;
+        $conf['additionalParams'] = $this->conf['parent.']['addParams'] . HttpUtility::buildQueryString($urlParameters, '&', TRUE) . $this->pi_moreParams;
         // Add additional configuration for absolute URLs.
         $conf['forceAbsoluteUrl'] = !empty($this->conf['forceAbsoluteUrl']) ? 1 : 0;
         $conf['forceAbsoluteUrl.']['scheme'] = !empty($this->conf['forceAbsoluteUrl']) && !empty($this->conf['forceAbsoluteUrlHttps']) ? 'https' : 'http';
@@ -274,20 +274,20 @@ 
      *
      * @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;
-            $this->pi_checkCHash = true;
+            $this->pi_USER_INT_obj = FALSE;
+            $this->pi_checkCHash = TRUE;
             if (count($this->piVars)) {
                 // Check cHash or disable caching.
                 $GLOBALS['TSFE']->reqCHash();
             }
         } else {
             // Set cObject type to "USER_INT".
-            $this->pi_USER_INT_obj = true;
-            $this->pi_checkCHash = false;
+            $this->pi_USER_INT_obj = TRUE;
+            $this->pi_checkCHash = FALSE;
             // Plugins are of type "USER" by default, so convert it to "USER_INT".
             $this->cObj->convertToUserIntObject();
         }

Classes/Common/SolrSearchResult/Region.php

Braces +11 added lines, -22 removed lines

@@ -20,8 +20,7 @@ 
  * @subpackage dlf
  * @access public
  */
-class Region
-{
+class Region {
 
     /**
      * The identifier of the region
@@ -105,8 +104,7 @@ 
      *
      * @return void
      */
-    public function __construct($id, $region)
-    {
+    public function __construct($id, $region) {
         $this->id = $id;
         $this->pageId = $region['pageIdx'];
         $this->xBeginPosition = $region['ulx'];
@@ -125,8 +123,7 @@ 
      *
      * @return int The region's identifier
      */
-    public function getId()
-    {
+    public function getId() {
         return $this->id;
     }
 
@@ -137,8 +134,7 @@ 
      *
      * @return int The region's page identifier
      */
-    public function getPageId()
-    {
+    public function getPageId() {
         return $this->pageId;
     }
 
@@ -149,8 +145,7 @@ 
      *
      * @return int The region's horizontal beginning position
      */
-    public function getXBeginPosition()
-    {
+    public function getXBeginPosition() {
         return $this->xBeginPosition;
     }
 
@@ -161,8 +156,7 @@ 
      *
      * @return int The region's horizontal ending position
      */
-    public function getXEndPosition()
-    {
+    public function getXEndPosition() {
         return $this->xEndPosition;
     }
 
@@ -173,8 +167,7 @@ 
      *
      * @return int The region's vertical beginning position
      */
-    public function getYBeginPosition()
-    {
+    public function getYBeginPosition() {
         return $this->yBeginPosition;
     }
 
@@ -185,8 +178,7 @@ 
      *
      * @return int The region's vertical ending position
      */
-    public function getYEndPosition()
-    {
+    public function getYEndPosition() {
         return $this->yEndPosition;
     }
 
@@ -197,8 +189,7 @@ 
      *
      * @return int The region's width
      */
-    public function getWidth()
-    {
+    public function getWidth() {
         return $this->width;
     }
 
@@ -209,8 +200,7 @@ 
      *
      * @return int The region's height
      */
-    public function getHeight()
-    {
+    public function getHeight() {
         return $this->height;
     }
 
@@ -221,8 +211,7 @@ 
      *
      * @return string The region's text
      */
-    public function getText()
-    {
+    public function getText() {
         return $this->text;
     }
 }

Classes/Common/SolrSearchResult/Page.php

Braces +6 added lines, -12 removed lines

@@ -20,8 +20,7 @@ 
  * @subpackage dlf
  * @access public
  */
-class Page
-{
+class Page {
 
     /**
      * The identifier of the page
@@ -65,8 +64,7 @@ 
      *
      * @return void
      */
-    public function __construct($id, $page)
-    {
+    public function __construct($id, $page) {
         $this->id = $id;
         $this->name = $page['id'];
         $this->width = $page['width'];
@@ -80,8 +78,7 @@ 
      *
      * @return int The page's identifier
      */
-    public function getId()
-    {
+    public function getId() {
         return $this->id;
     }
 
@@ -92,8 +89,7 @@ 
      *
      * @return string The page's name
      */
-    public function getName()
-    {
+    public function getName() {
         return $this->name;
     }
 
@@ -104,8 +100,7 @@ 
      *
      * @return int The page's width
      */
-    public function getWidth()
-    {
+    public function getWidth() {
         return $this->width;
     }
 
@@ -116,8 +111,7 @@ 
      *
      * @return int The page's height
      */
-    public function getHeight()
-    {
+    public function getHeight() {
         return $this->height;
     }
 }

Classes/Plugin/Eid/SearchSuggest.php

Braces +2 added lines, -4 removed lines

@@ -28,16 +28,14 @@
  * @subpackage dlf
  * @access public
  */
-class SearchSuggest
-{
+class SearchSuggest {
     /**
      * The main method of the eID script
      *
      *  @param ServerRequestInterface $request
      * @return ResponseInterface XML response of search suggestions
      */
-    public function main(ServerRequestInterface $request)
-    {
+    public function main(ServerRequestInterface $request) {
         $output = [];
         // Get input parameters and decrypt core name.
         $parameters = $request->getParsedBody();

Classes/Common/Solr.php

Spacing +11 added lines, -11 removed lines

@@ -134,7 +134,7 @@ 
     {
         // Get next available core name if none given.
         if (empty($core)) {
-            $core = 'dlfCore' . self::getNextCoreNumber();
+            $core = 'dlfCore'.self::getNextCoreNumber();
         }
         // Get Solr service instance.
         $solr = self::getInstance($core);
@@ -230,13 +230,13 @@ 
                 ->execute();
 
             while ($resArray = $result->fetch()) {
-                $fields[] = $resArray['index_name'] . '_' . ($resArray['index_tokenized'] ? 't' : 'u') . ($resArray['index_stored'] ? 's' : 'u') . 'i';
+                $fields[] = $resArray['index_name'].'_'.($resArray['index_tokenized'] ? 't' : 'u').($resArray['index_stored'] ? 's' : 'u').'i';
             }
 
             // Check if queried field is valid.
             $splitQuery = explode(':', $query, 2);
             if (in_array($splitQuery[0], $fields)) {
-                $query = $splitQuery[0] . ':(' . self::escapeQuery(trim($splitQuery[1], '()')) . ')';
+                $query = $splitQuery[0].':('.self::escapeQuery(trim($splitQuery[1], '()')).')';
             } else {
                 $query = self::escapeQuery($query);
             }
@@ -343,7 +343,7 @@ 
     {
         $number = max(intval($number), 0);
         // Check if core already exists.
-        $solr = self::getInstance('dlfCore' . $number);
+        $solr = self::getInstance('dlfCore'.$number);
         if (!$solr->ready) {
             return $number;
         } else {
@@ -418,7 +418,7 @@ 
         // Set filter query to just get toplevel documents.
         $params['filterquery'][] = ['query' => 'toplevel:true'];
         // Set join query to get all documents with the same uids.
-        $params['query'] = '{!join from=uid to=uid}' . $params['query'];
+        $params['query'] = '{!join from=uid to=uid}'.$params['query'];
         // Perform search to determine the total number of toplevel hits and fetch the required rows.
         $selectQuery = $this->service->createSelect($params);
         $results = $this->service->select($selectQuery);
@@ -475,7 +475,7 @@ 
         // Set query.
         $parameters['query'] = $query;
         // Calculate cache identifier.
-        $cacheIdentifier = Helper::digest($this->core . print_r(array_merge($this->params, $parameters), true));
+        $cacheIdentifier = Helper::digest($this->core.print_r(array_merge($this->params, $parameters), true));
         $cache = GeneralUtility::makeInstance(CacheManager::class)->getCache('tx_dlf_solr');
         $resultSet = [];
         if (($entry = $cache->get($cacheIdentifier)) === false) {
@@ -606,12 +606,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();
@@ -644,12 +644,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);
         }
@@ -686,7 +686,7 @@ 
                     'scheme' => $this->config['scheme'],
                     'host' => $this->config['host'],
                     'port' => $this->config['port'],
-                    'path' => '/' . $this->config['path'],
+                    'path' => '/'.$this->config['path'],
                     'core' => $core,
                     'username' => $this->config['username'],
                     'password' => $this->config['password'],

Braces +22 added lines, -44 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.
@@ -395,8 +387,7 @@ 
      *
      * @return \Kitodo\Dlf\Common\DocumentList The result list
      */
-    public function search()
-    {
+    public function search() {
         $toplevel = [];
         // Take over query parameters.
         $params = $this->params;
@@ -465,8 +456,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;
@@ -498,8 +488,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;
     }
 
@@ -510,8 +499,7 @@ 
      *
      * @return int The max number of results
      */
-    protected function _getLimit()
-    {
+    protected function _getLimit() {
         return $this->limit;
     }
 
@@ -522,8 +510,7 @@ 
      *
      * @return int Total number of hits for last search
      */
-    protected function _getNumberOfHits()
-    {
+    protected function _getNumberOfHits() {
         return $this->numberOfHits;
     }
 
@@ -534,8 +521,7 @@ 
      *
      * @return bool Is the search instantiated successfully?
      */
-    protected function _getReady()
-    {
+    protected function _getReady() {
         return $this->ready;
     }
 
@@ -546,8 +532,7 @@ 
      *
      * @return \Solarium\Client Apache Solr service object
      */
-    protected function _getService()
-    {
+    protected function _getService() {
         return $this->service;
     }
 
@@ -560,8 +545,7 @@ 
      *
      * @return void
      */
-    protected function _setCPid($value)
-    {
+    protected function _setCPid($value) {
         $this->cPid = max(intval($value), 0);
     }
 
@@ -574,8 +558,7 @@ 
      *
      * @return void
      */
-    protected function _setLimit($value)
-    {
+    protected function _setLimit($value) {
         $this->limit = max(intval($value), 0);
     }
 
@@ -588,8 +571,7 @@ 
      *
      * @return void
      */
-    protected function _setParams(array $value)
-    {
+    protected function _setParams(array $value) {
         $this->params = $value;
     }
 
@@ -602,8 +584,7 @@ 
      *
      * @return mixed Value of $this->$var
      */
-    public function __get($var)
-    {
+    public function __get($var) {
         $method = '_get' . ucfirst($var);
         if (
             !property_exists($this, $var)
@@ -625,8 +606,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));
     }
 
@@ -640,8 +620,7 @@ 
      *
      * @return void
      */
-    public function __set($var, $value)
-    {
+    public function __set($var, $value) {
         $method = '_set' . ucfirst($var);
         if (
             !property_exists($this, $var)
@@ -662,8 +641,7 @@ 
      *
      * @return void
      */
-    protected function __construct($core)
-    {
+    protected function __construct($core) {
         // Get Solr connection parameters from configuration.
         $this->loadSolrConnectionInfo();
         // Configure connection adapter.

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

@@ -55,7 +55,7 @@ 
      * @var string|null
      * @access protected
      */
-    protected $core = null;
+    protected $core = NULL;
 
     /**
      * This holds the PID for the configuration
@@ -103,7 +103,7 @@ 
      * @var bool
      * @access protected
      */
-    protected $ready = false;
+    protected $ready = FALSE;
 
     /**
      * This holds the singleton search objects with their core as array key
@@ -296,7 +296,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)) {
@@ -305,7 +305,7 @@ 
         // Check if core is set or null.
         if (
             empty($core)
-            && $core !== null
+            && $core !== NULL
         ) {
             Helper::log('Invalid core UID or name given for Apache Solr', LOG_SEVERITY_ERROR);
         }
@@ -447,7 +447,7 @@ 
                 'core' => $this->core,
                 'pid' => $this->cPid,
                 'order' => 'score',
-                'order.asc' => true,
+                'order.asc' => TRUE,
                 'numberOfHits' => $this->numberOfHits,
                 'numberOfToplevelHits' => $numberOfToplevelHits
             ]
@@ -473,10 +473,10 @@ 
         // Set query.
         $parameters['query'] = $query;
         // Calculate cache identifier.
-        $cacheIdentifier = Helper::digest($this->core . print_r(array_merge($this->params, $parameters), true));
+        $cacheIdentifier = Helper::digest($this->core . print_r(array_merge($this->params, $parameters), TRUE));
         $cache = GeneralUtility::makeInstance(CacheManager::class)->getCache('tx_dlf_solr');
         $resultSet = [];
-        if (($entry = $cache->get($cacheIdentifier)) === false) {
+        if (($entry = $cache->get($cacheIdentifier)) === FALSE) {
             $selectQuery = $this->service->createSelect(array_merge($this->params, $parameters));
             $result = $this->service->select($selectQuery);
             foreach ($result as $doc) {
@@ -702,7 +702,7 @@ 
         // Check if connection is established.
         $query = $this->service->createCoreAdmin();
         $action = $query->createStatus();
-        if ($core !== null) {
+        if ($core !== NULL) {
             $action->setCore($core);
         }
         $query->setAction($action);
@@ -710,7 +710,7 @@ 
             $response = $this->service->coreAdmin($query);
             if ($response->getWasSuccessful()) {
                 // Solr is reachable, but is the core as well?
-                if ($core !== null) {
+                if ($core !== NULL) {
                     $result = $response->getStatusResult();
                     if (
                         $result instanceof \Solarium\QueryType\Server\CoreAdmin\Result\StatusResult
@@ -724,7 +724,7 @@ 
                     }
                 }
                 // Instantiation successful!
-                $this->ready = true;
+                $this->ready = TRUE;
             }
         } catch (\Exception $e) {
             // Nothing to do here.

Classes/Command/BaseCommand.php

Braces +1 added lines, -2 removed lines

@@ -26,8 +26,7 @@
  * @subpackage dlf
  * @access public
  */
-class BaseCommand extends Command
-{
+class BaseCommand extends Command {
     /**
      * Return starting point for indexing command.
      *

Classes/Command/ReindexCommand.php

Braces +3 added lines, -6 removed lines

@@ -32,15 +32,13 @@ 
  * @subpackage dlf
  * @access public
  */
-class ReindexCommand extends BaseCommand
-{
+class ReindexCommand extends BaseCommand {
     /**
      * Configure the command by defining the name, options and arguments
      *
      * @return void
      */
-    public function configure()
-    {
+    public function configure() {
         $this
             ->setDescription('Reindex a collection into database and Solr.')
             ->setHelp('')
@@ -84,8 +82,7 @@ 
      *
      * @return void
      */
-    protected function execute(InputInterface $input, OutputInterface $output)
-    {
+    protected function execute(InputInterface $input, OutputInterface $output) {
         // Make sure the _cli_ user is loaded
         Bootstrap::getInstance()->initializeBackendAuthentication();
 

Spacing +8 added lines, -8 removed lines

@@ -103,7 +103,7 @@ 
         $startingPoint = $this->getStartingPoint($input->getOption('pid'));
 
         if ($startingPoint == 0) {
-            $io->error('ERROR: No valid PID (' . $startingPoint . ') given.');
+            $io->error('ERROR: No valid PID ('.$startingPoint.') given.');
             exit(1);
         }
 
@@ -118,13 +118,13 @@ 
             if (empty($solrCoreUid) || !in_array($solrCoreUid, $allSolrCores)) {
                 $output_solrCores = [];
                 foreach ($allSolrCores as $index_name => $uid) {
-                    $output_solrCores[] = $uid . ' : ' . $index_name;
+                    $output_solrCores[] = $uid.' : '.$index_name;
                 }
                 if (empty($output_solrCores)) {
-                    $io->error('ERROR: No valid Solr core ("' . $input->getOption('solr') . '") given. No valid cores found on PID ' . $startingPoint . ".\n");
+                    $io->error('ERROR: No valid Solr core ("'.$input->getOption('solr').'") given. No valid cores found on PID '.$startingPoint.".\n");
                     exit(1);
                 } else {
-                    $io->error('ERROR: No valid Solr core ("' . $input->getOption('solr') . '") given. ' . "Valid cores are (<uid>:<index_name>):\n" . implode("\n", $output_solrCores) . "\n");
+                    $io->error('ERROR: No valid Solr core ("'.$input->getOption('solr').'") given. '."Valid cores are (<uid>:<index_name>):\n".implode("\n", $output_solrCores)."\n");
                     exit(1);
                 }
             }
@@ -165,18 +165,18 @@ 
             $doc = Document::getInstance($document, $startingPoint, true);
             if ($doc->ready) {
                 if ($dryRun) {
-                    $io->writeln('DRY RUN: Would index ' . $id . '/' . count($documents) . ' ' . $doc->uid . ' ("' . $doc->location . '") on PID ' . $startingPoint . ' and Solr core ' . $solrCoreUid . '.');
+                    $io->writeln('DRY RUN: Would index '.$id.'/'.count($documents).' '.$doc->uid.' ("'.$doc->location.'") on PID '.$startingPoint.' and Solr core '.$solrCoreUid.'.');
                 } else {
                     if ($io->isVerbose()) {
-                        $io->writeln(date('Y-m-d H:i:s') . ' Indexing ' . $id . '/' . count($documents) . ' ' . $doc->uid . ' ("' . $doc->location . '") on PID ' . $startingPoint . ' and Solr core ' . $solrCoreUid . '.');
+                        $io->writeln(date('Y-m-d H:i:s').' Indexing '.$id.'/'.count($documents).' '.$doc->uid.' ("'.$doc->location.'") on PID '.$startingPoint.' and Solr core '.$solrCoreUid.'.');
                     }
                     // ...and save it to the database...
                     if (!$doc->save($startingPoint, $solrCoreUid, $owner)) {
-                        $io->error('ERROR: Document "' . $id . '" not saved and indexed.');
+                        $io->error('ERROR: Document "'.$id.'" not saved and indexed.');
                     }
                 }
             } else {
-                $io->error('ERROR: Document "' . $id . '" could not be loaded.');
+                $io->error('ERROR: Document "'.$id.'" could not be loaded.');
             }
             // Clear document registry to prevent memory exhaustion.
             Document::clearRegistry();

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

@@ -46,7 +46,7 @@ 
             ->setHelp('')
             ->addOption(
                 'dry-run',
-                null,
+                NULL,
                 InputOption::VALUE_NONE,
                 'If this option is set, the files will not actually be processed but the location URI is shown.'
             )
@@ -95,7 +95,7 @@ 
         // Make sure the _cli_ user is loaded
         Bootstrap::getInstance()->initializeBackendAuthentication();
 
-        $dryRun = $input->getOption('dry-run') != false ? true : false;
+        $dryRun = $input->getOption('dry-run') != FALSE ? TRUE : FALSE;
 
         $io = new SymfonyStyle($input, $output);
         $io->title($this->getDescription());
@@ -140,7 +140,7 @@ 
                 $owner = (string) $input->getOption('owner');
             }
         } else {
-            $owner = null;
+            $owner = NULL;
         }
 
         if (!empty($input->getOption('all'))) {
@@ -151,7 +151,7 @@ 
             && !is_array($input->getOption('coll'))
         ) {
             // "coll" may be a single integer or a comma-separated list of integers.
-            if (empty(array_filter(GeneralUtility::intExplode(',', $input->getOption('coll'), true)))) {
+            if (empty(array_filter(GeneralUtility::intExplode(',', $input->getOption('coll'), TRUE)))) {
                 $io->error('ERROR: Parameter --coll|-c is not a valid comma-separated list of collection UIDs.');
                 exit(1);
             }
@@ -162,7 +162,7 @@ 
         }
 
         foreach ($documents as $id => $document) {
-            $doc = Document::getInstance($document, $startingPoint, true);
+            $doc = Document::getInstance($document, $startingPoint, TRUE);
             if ($doc->ready) {
                 if ($dryRun) {
                     $io->writeln('DRY RUN: Would index ' . $id . '/' . count($documents) . ' ' . $doc->uid . ' ("' . $doc->location . '") on PID ' . $startingPoint . ' and Solr core ' . $solrCoreUid . '.');
@@ -225,7 +225,7 @@ 
                     $queryBuilder->expr()->in(
                         'tx_dlf_collections_join.uid',
                         $queryBuilder->createNamedParameter(
-                            GeneralUtility::intExplode(',', $collIds, true),
+                            GeneralUtility::intExplode(',', $collIds, TRUE),
                             Connection::PARAM_INT_ARRAY
                         )
                     ),

Classes/Command/IndexCommand.php

Braces +3 added lines, -6 removed lines

@@ -31,15 +31,13 @@ 
  * @subpackage dlf
  * @access public
  */
-class IndexCommand extends BaseCommand
-{
+class IndexCommand extends BaseCommand {
     /**
      * Configure the command by defining the name, options and arguments
      *
      * @return void
      */
-    public function configure()
-    {
+    public function configure() {
         $this
             ->setDescription('Index single document into database and Solr.')
             ->setHelp('')
@@ -77,8 +75,7 @@ 
      *
      * @return void
      */
-    protected function execute(InputInterface $input, OutputInterface $output)
-    {
+    protected function execute(InputInterface $input, OutputInterface $output) {
         // Make sure the _cli_ user is loaded
         Bootstrap::getInstance()->initializeBackendAuthentication();
 

Spacing +8 added lines, -8 removed lines

@@ -95,7 +95,7 @@ 
         $startingPoint = $this->getStartingPoint($input->getOption('pid'));
 
         if ($startingPoint == 0) {
-            $io->error('ERROR: No valid PID (' . $startingPoint . ') given.');
+            $io->error('ERROR: No valid PID ('.$startingPoint.') given.');
             exit(1);
         }
 
@@ -110,13 +110,13 @@ 
             if (empty($solrCoreUid) || !in_array($solrCoreUid, $allSolrCores)) {
                 $output_solrCores = [];
                 foreach ($allSolrCores as $index_name => $uid) {
-                    $output_solrCores[] = $uid . ' : ' . $index_name;
+                    $output_solrCores[] = $uid.' : '.$index_name;
                 }
                 if (empty($output_solrCores)) {
-                    $io->error('ERROR: No valid Solr core ("' . $input->getOption('solr') . '") given. No valid cores found on PID ' . $startingPoint . ".\n");
+                    $io->error('ERROR: No valid Solr core ("'.$input->getOption('solr').'") given. No valid cores found on PID '.$startingPoint.".\n");
                     exit(1);
                 } else {
-                    $io->error('ERROR: No valid Solr core ("' . $input->getOption('solr') . '") given. ' . "Valid cores are (<uid>:<index_name>):\n" . implode("\n", $output_solrCores) . "\n");
+                    $io->error('ERROR: No valid Solr core ("'.$input->getOption('solr').'") given. '."Valid cores are (<uid>:<index_name>):\n".implode("\n", $output_solrCores)."\n");
                     exit(1);
                 }
             }
@@ -151,19 +151,19 @@ 
         $doc = Document::getInstance($input->getOption('doc'), $startingPoint, true);
         if ($doc->ready) {
             if ($dryRun) {
-                $io->section('DRY RUN: Would index ' . $doc->uid . ' ("' . $doc->location . '") on PID ' . $startingPoint . ' and Solr core ' . $solrCoreUid . '.');
+                $io->section('DRY RUN: Would index '.$doc->uid.' ("'.$doc->location.'") on PID '.$startingPoint.' and Solr core '.$solrCoreUid.'.');
             } else {
                 if ($io->isVerbose()) {
-                    $io->section('Indexing ' . $doc->uid . ' ("' . $doc->location . '") on PID ' . $startingPoint . ' and Solr core ' . $solrCoreUid . '.');
+                    $io->section('Indexing '.$doc->uid.' ("'.$doc->location.'") on PID '.$startingPoint.' and Solr core '.$solrCoreUid.'.');
                 }
                 // ...and save it to the database...
                 if (!$doc->save($startingPoint, $solrCoreUid, $owner)) {
-                    $io->error('ERROR: Document "' . $input->getOption('doc') . '" not saved and indexed.');
+                    $io->error('ERROR: Document "'.$input->getOption('doc').'" not saved and indexed.');
                     exit(1);
                 }
             }
         } else {
-            $io->error('ERROR: Document "' . $input->getOption('doc') . '" could not be loaded.');
+            $io->error('ERROR: Document "'.$input->getOption('doc').'" could not be loaded.');
             exit(1);
         }
 

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

@@ -44,7 +44,7 @@ 
             ->setHelp('')
             ->addOption(
                 'dry-run',
-                null,
+                NULL,
                 InputOption::VALUE_NONE,
                 'If this option is set, the files will not actually be processed but the location URI is shown.'
             )
@@ -87,7 +87,7 @@ 
         // Make sure the _cli_ user is loaded
         Bootstrap::getInstance()->initializeBackendAuthentication();
 
-        $dryRun = $input->getOption('dry-run') != false ? true : false;
+        $dryRun = $input->getOption('dry-run') != FALSE ? TRUE : FALSE;
 
         $io = new SymfonyStyle($input, $output);
         $io->title($this->getDescription());
@@ -144,11 +144,11 @@ 
                 $owner = (string) $input->getOption('owner');
             }
         } else {
-            $owner = null;
+            $owner = NULL;
         }
 
         // Get the document...
-        $doc = Document::getInstance($input->getOption('doc'), $startingPoint, true);
+        $doc = Document::getInstance($input->getOption('doc'), $startingPoint, TRUE);
         if ($doc->ready) {
             if ($dryRun) {
                 $io->section('DRY RUN: Would index ' . $doc->uid . ' ("' . $doc->location . '") on PID ' . $startingPoint . ' and Solr core ' . $solrCoreUid . '.');