Erikmitk / kitodo-presentation

Classes/ViewHelpers/StdWrapViewHelper.php

Braces +1 added lines, -2 removed lines

@@ -23,8 +23,7 @@
  *
  * @access public
  */
-class StdWrapViewHelper extends AbstractViewHelper
-{
+class StdWrapViewHelper extends AbstractViewHelper {
     /**
      * @access protected
      * @var bool

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

@@ -29,7 +29,7 @@ 
      * @access protected
      * @var bool
      */
-    protected $escapeOutput = false;
+    protected $escapeOutput = FALSE;
 
     /**
      * Initializes arguments.
@@ -41,8 +41,8 @@ 
     public function initializeArguments(): void
     {
         parent::initializeArguments();
-        $this->registerArgument('wrap', 'string', 'The wrap information', true);
-        $this->registerArgument('data', 'array', 'Data for the content object', false);
+        $this->registerArgument('wrap', 'string', 'The wrap information', TRUE);
+        $this->registerArgument('data', 'array', 'Data for the content object', FALSE);
     }
 
     /**

Classes/ViewHelpers/MetadataWrapVariableViewHelper.php

Braces +1 added lines, -2 removed lines

@@ -39,8 +39,7 @@
  *
  * @access public
  */
-class MetadataWrapVariableViewHelper extends AbstractViewHelper
-{
+class MetadataWrapVariableViewHelper extends AbstractViewHelper {
     /**
      * @access public
      *

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

@@ -48,7 +48,7 @@
      */
     public function initializeArguments(): void
     {
-        $this->registerArgument('name', 'string', 'Name of variable to create', true);
+        $this->registerArgument('name', 'string', 'Name of variable to create', TRUE);
     }
 
     /**

Classes/ViewHelpers/JsFooterViewHelper.php

Braces +1 added lines, -2 removed lines

@@ -25,8 +25,7 @@
  *
  * @access public
  */
-class JsFooterViewHelper extends AbstractViewHelper
-{
+class JsFooterViewHelper extends AbstractViewHelper {
     /**
      * Initialize arguments.
      *

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

@@ -35,7 +35,7 @@
     public function initializeArguments(): void
     {
         parent::initializeArguments();
-        $this->registerArgument('inlineCode', 'string', 'Inline JavaScript', true);
+        $this->registerArgument('inlineCode', 'string', 'Inline JavaScript', TRUE);
     }
 
     /**

Classes/Common/SolrPaginator.php

Braces +1 added lines, -2 removed lines

@@ -15,8 +15,7 @@
 use Kitodo\Dlf\Common\Solr\SolrSearch;
 use TYPO3\CMS\Core\Pagination\AbstractPaginator;
 
-class SolrPaginator extends AbstractPaginator
-{
+class SolrPaginator extends AbstractPaginator {
     /**
      * @var SolrSearch
      */

Classes/Common/IiifManifest.php

Spacing +6 added lines, -6 removed lines

@@ -653,16 +653,16 @@ 
                 if ($resArray['format'] > 0 && !empty($resArray['xpath_sorting'])) {
                     $values = $iiifResource->jsonPath($resArray['xpath_sorting']);
                     if (is_string($values)) {
-                        $metadata[$resArray['index_name'] . '_sorting'][0] = [trim((string) $values)];
+                        $metadata[$resArray['index_name'].'_sorting'][0] = [trim((string) $values)];
                     } elseif ($values instanceof JSONPath && is_array($values->data()) && count($values->data()) > 1) {
                         $metadata[$resArray['index_name']] = [];
                         foreach ($values->data() as $value) {
-                            $metadata[$resArray['index_name'] . '_sorting'][0] = trim((string) $value);
+                            $metadata[$resArray['index_name'].'_sorting'][0] = trim((string) $value);
                         }
                     }
                 }
-                if (empty($metadata[$resArray['index_name'] . '_sorting'][0])) {
-                    $metadata[$resArray['index_name'] . '_sorting'][0] = $metadata[$resArray['index_name']][0];
+                if (empty($metadata[$resArray['index_name'].'_sorting'][0])) {
+                    $metadata[$resArray['index_name'].'_sorting'][0] = $metadata[$resArray['index_name']][0];
                 }
             }
         }
@@ -772,7 +772,7 @@ 
                     }
                 }
             } else {
-                $this->logger->warning('Invalid structure resource @id "' . $id . '"');
+                $this->logger->warning('Invalid structure resource @id "'.$id.'"');
                 return $rawText;
             }
             $this->rawTextArray[$id] = $rawText;
@@ -817,7 +817,7 @@ 
                 return true;
             }
         }
-        $this->logger->error('Could not load IIIF manifest from "' . $location . '"');
+        $this->logger->error('Could not load IIIF manifest from "'.$location.'"');
         return false;
     }
 

Braces +2 added lines, -4 removed lines

@@ -75,8 +75,7 @@ 
  * @property array $mimeTypes this holds the mime types of linked resources in the manifest (extracted during parsing) for later us
  * 
  */
-final class IiifManifest extends AbstractDocument
-{
+final class IiifManifest extends AbstractDocument {
     /**
      * @access protected
      * @var string This holds the manifest file as string for serialization purposes
@@ -229,8 +228,7 @@ 
      *
      * @return array|string
      */
-    protected function getUseGroups(string $use)
-    {
+    protected function getUseGroups(string $use) {
         if (!$this->useGrpsLoaded) {
             // Get configured USE attributes.
             $extConf = GeneralUtility::makeInstance(ExtensionConfiguration::class)->get(self::$extKey, 'files');

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

@@ -101,7 +101,7 @@ 
      * @access protected
      * @var bool Document has already been analyzed if it contains fulltext for the Solr index
      */
-    protected bool $hasFulltextSet = false;
+    protected bool $hasFulltextSet = FALSE;
 
     /**
      * @access protected
@@ -120,7 +120,7 @@ 
      */
     protected function establishRecordId(int $pid): void
     {
-        if ($this->iiif !== null) {
+        if ($this->iiif !== NULL) {
             /*
              *  FIXME This will not consistently work because we can not be sure to have the pid at hand. It may miss
              *  if the plugin that actually loads the manifest allows content from other pages.
@@ -207,7 +207,7 @@ 
      * @var bool
      * @access protected
      */
-    protected bool $useGrpsLoaded = false;
+    protected bool $useGrpsLoaded = FALSE;
 
     /**
      * Holds the configured useGrps as array.
@@ -249,7 +249,7 @@ 
             if (!empty($extConf['fileGrpAudio'])) {
                 $this->useGrps['fileGrpAudio'] = GeneralUtility::trimExplode(',', $extConf['fileGrpAudio']);
             }
-            $this->useGrpsLoaded = true;
+            $this->useGrpsLoaded = TRUE;
         }
         return array_key_exists($use, $this->useGrps) ? $this->useGrps[$use] : [];
     }
@@ -261,7 +261,7 @@ 
     {
         // Is there no physical structure array yet?
         if (!$this->physicalStructureLoaded) {
-            if ($this->iiif == null || !($this->iiif instanceof ManifestInterface)) {
+            if ($this->iiif == NULL || !($this->iiif instanceof ManifestInterface)) {
                 return [];
             }
             $extConf = GeneralUtility::makeInstance(ExtensionConfiguration::class)->get(self::$extKey, 'iiif');
@@ -271,7 +271,7 @@ 
             $this->physicalStructureInfo[$iiifId]['label'] = $this->iiif->getLabelForDisplay();
             $this->physicalStructureInfo[$iiifId]['orderlabel'] = $this->iiif->getLabelForDisplay();
             $this->physicalStructureInfo[$iiifId]['type'] = 'physSequence';
-            $this->physicalStructureInfo[$iiifId]['contentIds'] = null;
+            $this->physicalStructureInfo[$iiifId]['contentIds'] = NULL;
 
             $this->setFileUseDownload($iiifId, $this->iiif);
             $this->setFileUseFulltext($iiifId, $this->iiif);
@@ -296,20 +296,20 @@ 
                     // populate structural metadata info
                     $elements[$canvasOrder] = $canvas->getId();
                     $this->physicalStructureInfo[$elements[$canvasOrder]]['id'] = $canvas->getId();
-                    $this->physicalStructureInfo[$elements[$canvasOrder]]['dmdId'] = null;
+                    $this->physicalStructureInfo[$elements[$canvasOrder]]['dmdId'] = NULL;
                     $this->physicalStructureInfo[$elements[$canvasOrder]]['label'] = $canvas->getLabelForDisplay();
                     $this->physicalStructureInfo[$elements[$canvasOrder]]['orderlabel'] = $canvas->getLabelForDisplay();
                     // assume that a canvas always represents a page
                     $this->physicalStructureInfo[$elements[$canvasOrder]]['type'] = 'page';
-                    $this->physicalStructureInfo[$elements[$canvasOrder]]['contentIds'] = null;
-                    $this->physicalStructureInfo[$elements[$canvasOrder]]['annotationContainers'] = null;
+                    $this->physicalStructureInfo[$elements[$canvasOrder]]['contentIds'] = NULL;
+                    $this->physicalStructureInfo[$elements[$canvasOrder]]['annotationContainers'] = NULL;
                     if (!empty($canvas->getPossibleTextAnnotationContainers(Motivation::PAINTING))) {
                         $this->physicalStructureInfo[$elements[$canvasOrder]]['annotationContainers'] = [];
                         foreach ($canvas->getPossibleTextAnnotationContainers(Motivation::PAINTING) as $annotationContainer) {
                             $this->physicalStructureInfo[$elements[$canvasOrder]]['annotationContainers'][] = $annotationContainer->getId();
                             if ($extConf['indexAnnotations']) {
-                                $this->hasFulltext = true;
-                                $this->hasFulltextSet = true;
+                                $this->hasFulltext = TRUE;
+                                $this->hasFulltextSet = TRUE;
                             }
                         }
                     }
@@ -319,7 +319,7 @@ 
                     if (!empty($fileUses)) {
                         $image = $canvas->getImageAnnotations()[0];
                         foreach ($fileUses as $fileUse) {
-                            if ($image->getBody() !== null && $image->getBody() instanceof ContentResourceInterface) {
+                            if ($image->getBody() !== NULL && $image->getBody() instanceof ContentResourceInterface) {
                                 $this->physicalStructureInfo[$elements[$canvasOrder]]['files'][$fileUse] = $image->getBody()->getId();
                             }
                         }
@@ -335,7 +335,7 @@ 
                 array_unshift($elements, $iiifId);
                 $this->physicalStructure = $elements;
             }
-            $this->physicalStructureLoaded = true;
+            $this->physicalStructureLoaded = TRUE;
         }
         return $this->physicalStructure;
     }
@@ -366,7 +366,7 @@ 
             $this->fileInfos[$id]['mimeType'] = $this->getFileMimeType($id);
         }
 
-        return $this->fileInfos[$id] ?? null;
+        return $this->fileInfos[$id] ?? NULL;
     }
 
     /**
@@ -374,7 +374,7 @@ 
      */
     public function getFileLocation(string $id): string
     {
-        if ($id == null) {
+        if ($id == NULL) {
             return '';
         }
         $resource = $this->iiif->getContainedResourceById($id);
@@ -382,7 +382,7 @@ 
             if ($resource instanceof CanvasInterface) {
                 // TODO: Cannot call method getSingleService() on array<Ubl\Iiif\Presentation\Common\Model\Resources\AnnotationInterface>.
                 // @phpstan-ignore-next-line
-                return (!empty($resource->getImageAnnotations()) && $resource->getImageAnnotations()->getSingleService() != null) ? $resource->getImageAnnotations()[0]->getSingleService()->getId() : $id;
+                return (!empty($resource->getImageAnnotations()) && $resource->getImageAnnotations()->getSingleService() != NULL) ? $resource->getImageAnnotations()[0]->getSingleService()->getId() : $id;
             } elseif ($resource instanceof ContentResourceInterface) {
                 return $resource->getSingleService() instanceof Service ? $resource->getSingleService()->getId() : $id;
             } elseif ($resource instanceof AbstractImageService) {
@@ -405,7 +405,7 @@ 
         } elseif ($fileResource instanceof AnnotationInterface) {
             $format = "application/vnd.kitodo.iiif";
         } elseif ($fileResource instanceof ContentResourceInterface) {
-            if ($fileResource->isText() || $fileResource->isImage() && ($fileResource->getSingleService() == null || !($fileResource->getSingleService() instanceof AbstractImageService))) {
+            if ($fileResource->isText() || $fileResource->isImage() && ($fileResource->getSingleService() == NULL || !($fileResource->getSingleService() instanceof AbstractImageService))) {
                 // Support static images without an image service
                 return $fileResource->getFormat();
             }
@@ -422,7 +422,7 @@ 
     /**
      * @see AbstractDocument::getLogicalStructure()
      */
-    public function getLogicalStructure(string $id, bool $recursive = false): array
+    public function getLogicalStructure(string $id, bool $recursive = FALSE): array
     {
         $details = [];
         if (!$recursive && !empty($this->logicalUnits[$id])) {
@@ -441,8 +441,8 @@ 
                 // cache the ranges - they might occur multiple times in the structures "tree" - with full data as well as referenced as id
                 $processedStructures = [];
                 foreach ($logUnits as $logUnit) {
-                    if (array_search($logUnit->getId(), $processedStructures) == false) {
-                        $this->tableOfContents[] = $this->getLogicalStructureInfo($logUnit, true, $processedStructures);
+                    if (array_search($logUnit->getId(), $processedStructures) == FALSE) {
+                        $this->tableOfContents[] = $this->getLogicalStructureInfo($logUnit, TRUE, $processedStructures);
                     }
                 }
             }
@@ -461,7 +461,7 @@ 
      *
      * @return array Logical structure array
      */
-    protected function getLogicalStructureInfo(IiifResourceInterface $resource, bool $recursive = false, array &$processedStructures = []): array
+    protected function getLogicalStructureInfo(IiifResourceInterface $resource, bool $recursive = FALSE, array &$processedStructures = []): array
     {
         $details = [];
         $details['id'] = $resource->getId();
@@ -491,7 +491,7 @@ 
         if (isset($startCanvas)) {
             $details['pagination'] = $startCanvas->getLabel();
             $startCanvasIndex = array_search($startCanvas, $this->iiif->getDefaultCanvases());
-            if ($startCanvasIndex !== false) {
+            if ($startCanvasIndex !== FALSE) {
                 $details['points'] = $startCanvasIndex + 1;
             }
         }
@@ -505,7 +505,7 @@ 
         if ($recursive) {
             $processedStructures[] = $resource->getId();
             $details['children'] = [];
-            if ($resource instanceof ManifestInterface && $resource->getRootRanges() != null) {
+            if ($resource instanceof ManifestInterface && $resource->getRootRanges() != NULL) {
                 $rangesToAdd = [];
                 $rootRanges = [];
                 if (count($this->iiif->getRootRanges()) == 1 && $this->iiif->getRootRanges()[0]->isTopRange()) {
@@ -517,15 +517,15 @@ 
                     $rootRanges[] = $range;
                 }
                 foreach ($rootRanges as $range) {
-                    if ((array_search($range->getId(), $processedStructures) == false)) {
-                        $details['children'][] = $this->getLogicalStructureInfo($range, true, $processedStructures);
+                    if ((array_search($range->getId(), $processedStructures) == FALSE)) {
+                        $details['children'][] = $this->getLogicalStructureInfo($range, TRUE, $processedStructures);
                     }
                 }
             } elseif ($resource instanceof RangeInterface) {
                 if (!empty($resource->getAllRanges())) {
                     foreach ($resource->getAllRanges() as $range) {
-                        if ((array_search($range->getId(), $processedStructures) == false)) {
-                            $details['children'][] = $this->getLogicalStructureInfo($range, true, $processedStructures);
+                        if ((array_search($range->getId(), $processedStructures) == FALSE)) {
+                            $details['children'][] = $this->getLogicalStructureInfo($range, TRUE, $processedStructures);
                         }
                     }
                 }
@@ -549,14 +549,14 @@ 
      *
      * @todo This method is still in experimental; the method signature may change.
      */
-    public function getManifestMetadata(string $id, bool $withDescription = true, bool $withRights = true, bool $withRelated = true): array
+    public function getManifestMetadata(string $id, bool $withDescription = TRUE, bool $withRights = TRUE, bool $withRelated = TRUE): array
     {
         if (!empty($this->originalMetadataArray[$id])) {
             return $this->originalMetadataArray[$id];
         }
         $iiifResource = $this->iiif->getContainedResourceById($id);
         $result = [];
-        if ($iiifResource != null) {
+        if ($iiifResource != NULL) {
             if (!empty($iiifResource->getLabel())) {
                 $result['label'] = $iiifResource->getLabel();
             }
@@ -689,7 +689,7 @@ 
                     $this->smLinkRangeCanvasesRecursively($range);
                 }
             }
-            $this->smLinksLoaded = true;
+            $this->smLinksLoaded = TRUE;
         }
         return $this->smLinks;
     }
@@ -806,7 +806,7 @@ 
     protected function loadLocation(string $location): bool
     {
         $fileResource = GeneralUtility::getUrl($location);
-        if ($fileResource !== false) {
+        if ($fileResource !== FALSE) {
             $conf = GeneralUtility::makeInstance(ExtensionConfiguration::class)->get(self::$extKey, 'iiif');
             IiifHelper::setUrlReader(IiifUrlReader::getInstance());
             IiifHelper::setMaxThumbnailHeight($conf['thumbnailHeight']);
@@ -814,11 +814,11 @@ 
             $resource = IiifHelper::loadIiifResource($fileResource);
             if ($resource instanceof ManifestInterface) {
                 $this->iiif = $resource;
-                return true;
+                return TRUE;
             }
         }
         $this->logger->error('Could not load IIIF manifest from "' . $location . '"');
-        return false;
+        return FALSE;
     }
 
     /**
@@ -837,9 +837,9 @@ 
     {
         if ($preloadedDocument instanceof ManifestInterface) {
             $this->iiif = $preloadedDocument;
-            return true;
+            return TRUE;
         }
-        return false;
+        return FALSE;
     }
 
     /**
@@ -861,23 +861,23 @@ 
                     !empty($canvas->getSeeAlsoUrlsForFormat("application/alto+xml")) ||
                     !empty($canvas->getSeeAlsoUrlsForProfile("http://www.loc.gov/standards/alto/"))
                 ) {
-                    $this->hasFulltextSet = true;
-                    $this->hasFulltext = true;
+                    $this->hasFulltextSet = TRUE;
+                    $this->hasFulltext = TRUE;
                     return;
                 }
                 $extConf = GeneralUtility::makeInstance(ExtensionConfiguration::class)->get(self::$extKey, 'iiif');
                 if ($extConf['indexAnnotations'] == 1 && !empty($canvas->getPossibleTextAnnotationContainers(Motivation::PAINTING))) {
                     foreach ($canvas->getPossibleTextAnnotationContainers(Motivation::PAINTING) as $annotationContainer) {
                         $textAnnotations = $annotationContainer->getTextAnnotations(Motivation::PAINTING);
-                        if ($textAnnotations != null) {
+                        if ($textAnnotations != NULL) {
                             foreach ($textAnnotations as $annotation) {
                                 if (
-                                    $annotation->getBody() != null &&
+                                    $annotation->getBody() != NULL &&
                                     $annotation->getBody()->getFormat() == "text/plain" &&
-                                    $annotation->getBody()->getChars() != null
+                                    $annotation->getBody()->getChars() != NULL
                                 ) {
-                                    $this->hasFulltextSet = true;
-                                    $this->hasFulltext = true;
+                                    $this->hasFulltextSet = TRUE;
+                                    $this->hasFulltext = TRUE;
                                     return;
                                 }
                             }
@@ -885,14 +885,14 @@ 
                     }
                 }
             }
-            $this->hasFulltextSet = true;
+            $this->hasFulltextSet = TRUE;
         }
     }
 
     /**
      * @see AbstractDocument::magicGetThumbnail()
      */
-    protected function magicGetThumbnail(bool $forceReload = false): string
+    protected function magicGetThumbnail(bool $forceReload = FALSE): string
     {
         return $this->iiif->getThumbnailUrl();
     }
@@ -929,7 +929,7 @@ 
             foreach ($annotationContainer->getTextAnnotations(Motivation::PAINTING) as $annotation) {
                 if (
                     $annotation->getTargetResourceId() == $iiifId &&
-                    $annotation->getBody() != null && $annotation->getBody()->getChars() != null
+                    $annotation->getBody() != NULL && $annotation->getBody()->getChars() != NULL
                 ) {
                     $annotationTexts[] = $annotation->getBody()->getChars();
                 }
@@ -977,13 +977,13 @@ 
         if (!empty($fileUseFulltext)) {
             $alto = $iiif->getSeeAlsoUrlsForFormat('application/alto+xml');
             if (empty($alto)) {
-                $alto = $iiif->getSeeAlsoUrlsForProfile('http://www.loc.gov/standards/alto/', true);
+                $alto = $iiif->getSeeAlsoUrlsForProfile('http://www.loc.gov/standards/alto/', TRUE);
             }
             if (!empty($alto)) {
                 $this->mimeTypes[$alto[0]] = 'application/alto+xml';
                 $this->physicalStructureInfo[$iiifId]['files'][$fileUseFulltext[0]] = $alto[0];
-                $this->hasFulltext = true;
-                $this->hasFulltextSet = true;
+                $this->hasFulltext = TRUE;
+                $this->hasFulltextSet = TRUE;
             }
         }
     }

Classes/Common/Solr/SearchResult/Page.php

Braces +2 added lines, -4 removed lines

@@ -20,8 +20,7 @@ 
  *
  * @access public
  */
-class Page
-{
+class Page {
 
     /**
      * @access private
@@ -57,8 +56,7 @@ 
      *
      * @return void
      */
-    public function __construct(int $id, array $page)
-    {
+    public function __construct(int $id, array $page) {
         $this->id = $id;
         $this->name = $page['id'];
         $this->width = $page['width'];

Classes/Common/Solr/SearchResult/Highlight.php

Spacing +1 added lines, -1 removed lines

@@ -87,7 +87,7 @@
         $this->xEndPosition = $highlight['lrx'];
         $this->yBeginPosition = $highlight['uly'];
         $this->yEndPosition = $highlight['lry'];
-        $this->id = $this->xBeginPosition . '_' . $this->yBeginPosition;
+        $this->id = $this->xBeginPosition.'_'.$this->yBeginPosition;
     }
 
     /**

Braces +2 added lines, -4 removed lines

@@ -20,8 +20,7 @@ 
  *
  * @access public
  */
-class Highlight
-{
+class Highlight {
 
     /**
      * @access private
@@ -62,8 +61,7 @@ 
      *
      * @return void
      */
-    public function __construct(array $highlight)
-    {
+    public function __construct(array $highlight) {
         // there is also possibility to access parentRegionIdx
         // $this->parentRegionId = $highlight['parentRegionIdx'];
         $this->xBeginPosition = $highlight['ulx'];

Classes/Common/Solr/SearchResult/ResultDocument.php

Braces +2 added lines, -4 removed lines

@@ -22,8 +22,7 @@ 
  *
  * @access public
  */
-class ResultDocument
-{
+class ResultDocument {
 
     /**
      * @access private
@@ -108,8 +107,7 @@ 
      *
      * @return void
      */
-    public function __construct(Document $record, array $highlighting, array $fields)
-    {
+    public function __construct(Document $record, array $highlighting, array $fields) {
         $this->id = $record[$fields['id']];
         $this->uid = $record[$fields['uid']];
         $this->page = $record[$fields['page']];

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

@@ -65,7 +65,7 @@ 
      * @access private
      * @var bool It's a toplevel element?
      */
-    private bool $toplevel = false;
+    private bool $toplevel = FALSE;
 
     /**
      * @access private
@@ -115,7 +115,7 @@ 
         $this->page = $record[$fields['page']];
         $this->thumbnail = $record[$fields['thumbnail']];
         $this->title = $record[$fields['title']];
-        $this->toplevel = $record[$fields['toplevel']] ?? false;
+        $this->toplevel = $record[$fields['toplevel']] ?? FALSE;
         $this->type = $record[$fields['type']];
 
         if (!empty($highlighting[$this->id])) {

Classes/Common/Solr/Solr.php

Spacing +10 added lines, -10 removed lines

@@ -127,7 +127,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);
@@ -217,13 +217,13 @@ 
                 ->execute();
 
             while ($resArray = $result->fetchAssociative()) {
-                $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);
             }
@@ -330,7 +330,7 @@ 
     {
         $number = max($number, 0);
         // Check if core already exists.
-        $solr = self::getInstance('dlfCore' . $number);
+        $solr = self::getInstance('dlfCore'.$number);
         if (!$solr->ready) {
             return $number;
         } else {
@@ -388,7 +388,7 @@ 
         $parameters['start'] = 0;
         $parameters['rows'] = $this->limit;
         // 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 = [];
         $entry = $cache->get($cacheIdentifier);
@@ -520,12 +520,12 @@ 
      */
     public function __get(string $var)
     {
-        $method = 'magicGet' . ucfirst($var);
+        $method = 'magicGet'.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 null;
         } else {
             return $this->$method();
@@ -558,12 +558,12 @@ 
      */
     public function __set(string $var, $value): void
     {
-        $method = 'magicSet' . ucfirst($var);
+        $method = 'magicSet'.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);
         }
@@ -603,7 +603,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 +3 added lines, -6 removed lines

@@ -42,8 +42,7 @@ 
  * @property-read bool $ready flag if the Solr service is instantiated successfully
  * @property-read Client $service this holds the Solr service object
  */
-class Solr implements LoggerAwareInterface
-{
+class Solr implements LoggerAwareInterface {
     use LoggerAwareTrait;
 
     /**
@@ -518,8 +517,7 @@ 
      *
      * @return mixed Value of $this->$var
      */
-    public function __get(string $var)
-    {
+    public function __get(string $var) {
         $method = 'magicGet' . ucfirst($var);
         if (
             !property_exists($this, $var)
@@ -578,8 +576,7 @@ 
      *
      * @return void
      */
-    protected function __construct(?string $core)
-    {
+    protected function __construct(?string $core) {
         // Solarium requires different code for version 5 and 6.
         $isSolarium5 = Client::checkExact('5');
         // Get Solr connection parameters from configuration.

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

@@ -56,7 +56,7 @@ 
      * @access protected
      * @var string|null This holds the core name
      */
-    protected ?string $core = null;
+    protected ?string $core = NULL;
 
     /**
      * @access protected
@@ -100,7 +100,7 @@ 
      * @access protected
      * @var bool Is the search instantiated successfully?
      */
-    protected bool $ready = false;
+    protected bool $ready = FALSE;
 
     /**
      * @access protected
@@ -285,7 +285,7 @@ 
      *
      * @return Solr Instance of this class
      */
-    public static function getInstance($core = null): Solr
+    public static function getInstance($core = NULL): Solr
     {
         // Get core name if UID is given.
         if (MathUtility::canBeInterpretedAsInteger($core)) {
@@ -294,7 +294,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);
         }
@@ -388,11 +388,11 @@ 
         $parameters['start'] = 0;
         $parameters['rows'] = $this->limit;
         // 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 = [];
         $entry = $cache->get($cacheIdentifier);
-        if ($entry === false) {
+        if ($entry === FALSE) {
             $selectQuery = $this->service->createSelect(array_merge($this->params, $parameters));
             $result = $this->service->select($selectQuery);
             foreach ($result as $doc) {
@@ -526,7 +526,7 @@ 
             || !method_exists($this, $method)
         ) {
             $this->logger->warning('There is no getter function for property "' . $var . '"');
-            return null;
+            return NULL;
         } else {
             return $this->$method();
         }
@@ -589,7 +589,7 @@ 
         $adapter->setTimeout($this->config['timeout']);
         // Configure event dispatcher.
         if ($isSolarium5) {
-            $eventDispatcher = null;
+            $eventDispatcher = NULL;
         } else {
             // When updating to TYPO3 >=10.x and Solarium >=6.x
             // we have to provide an PSR-14 Event Dispatcher instead of
@@ -623,7 +623,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);
@@ -631,7 +631,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 StatusResult
@@ -645,7 +645,7 @@ 
                     }
                 }
                 // Instantiation successful!
-                $this->ready = true;
+                $this->ready = TRUE;
             }
         } catch (\Exception $e) {
             // Nothing to do here.
@@ -669,22 +669,22 @@ 
 
         // commit the index
         if ($commit) {
-            $update->addCommit(false);
+            $update->addCommit(FALSE);
         }
 
         // optimize the index
         if ($optimize) {
-            $update->addOptimize(false);
+            $update->addOptimize(FALSE);
         }
 
         // this executes the query and returns the result
         $result = $this->service->update($update);
 
         if ($result->getStatus()) {
-            return false;
+            return FALSE;
         }
 
-        return true;
+        return TRUE;
     }
 
     /**
@@ -702,9 +702,9 @@ 
         $result = $this->service->execute($query);
 
         if ($result->getResponse()->getStatusCode() == 400) {
-            return false;
+            return FALSE;
         }
 
-        return true;
+        return TRUE;
     }
 }