Passed
Pull Request — master (#123)
by
unknown
07:53 queued 02:59
created
Classes/Controller/ToolboxController.php 3 patches
Braces   +1 added lines, -2 removed lines patch added patch discarded remove patch
@@ -24,8 +24,7 @@
 block discarded – undo
24 24
  *
25 25
  * @access public
26 26
  */
27
-class ToolboxController extends AbstractController
28
-{
27
+class ToolboxController extends AbstractController {
29 28
 
30 29
     /**
31 30
      * @access private
Please login to merge, or discard this patch.
Spacing   +4 added lines, -4 removed lines patch added patch discarded remove patch
@@ -99,7 +99,7 @@  discard block
 block discarded – undo
99 99
                         $this->renderToolByName('renderSearchInDocumentTool');
100 100
                         break;
101 101
                     default:
102
-                        $this->logger->warning('Incorrect tool configuration: "' . $this->settings['tools'] . '". Tool "' . $tool . '" does not exist.');
102
+                        $this->logger->warning('Incorrect tool configuration: "'.$this->settings['tools'].'". Tool "'.$tool.'" does not exist.');
103 103
                 }
104 104
             }
105 105
         }
@@ -262,7 +262,7 @@  discard block
 block discarded – undo
262 262
                 }
263 263
                 break;
264 264
             } else {
265
-                $this->logger->warning('File not found in fileGrp "' . $fileGrp . '"');
265
+                $this->logger->warning('File not found in fileGrp "'.$fileGrp.'"');
266 266
             }
267 267
         }
268 268
         return $image;
@@ -346,7 +346,7 @@  discard block
 block discarded – undo
346 346
             empty($firstPageLink)
347 347
             && empty($secondPageLink)
348 348
         ) {
349
-            $this->logger->warning('File not found in fileGrps "' . $this->extConf['files']['fileGrpDownload'] . '"');
349
+            $this->logger->warning('File not found in fileGrps "'.$this->extConf['files']['fileGrpDownload'].'"');
350 350
         }
351 351
 
352 352
         if (!empty($firstPageLink)) {
@@ -384,7 +384,7 @@  discard block
 block discarded – undo
384 384
             }
385 385
         }
386 386
         if (empty($workLink)) {
387
-            $this->logger->warning('File not found in fileGrps "' . $this->extConf['files']['fileGrpDownload'] . '"');
387
+            $this->logger->warning('File not found in fileGrps "'.$this->extConf['files']['fileGrpDownload'].'"');
388 388
         }
389 389
         return $workLink;
390 390
     }
Please login to merge, or discard this patch.
Upper-Lower-Casing   +10 added lines, -10 removed lines patch added patch discarded remove patch
@@ -117,7 +117,7 @@  discard block
 block discarded – undo
117 117
     private function renderToolByName(string $tool): void
118 118
     {
119 119
         $this->$tool();
120
-        $this->view->assign($tool, true);
120
+        $this->view->assign($tool, TRUE);
121 121
     }
122 122
 
123 123
     /**
@@ -139,12 +139,12 @@  discard block
 block discarded – undo
139 139
 
140 140
         $annotationContainers = $this->currentDocument->physicalStructureInfo[$this->currentDocument->physicalStructure[$this->requestData['page']]]['annotationContainers'];
141 141
         if (
142
-            $annotationContainers != null
142
+            $annotationContainers != NULL
143 143
             && count($annotationContainers) > 0
144 144
         ) {
145
-            $this->view->assign('annotationTool', true);
145
+            $this->view->assign('annotationTool', TRUE);
146 146
         } else {
147
-            $this->view->assign('annotationTool', false);
147
+            $this->view->assign('annotationTool', FALSE);
148 148
         }
149 149
     }
150 150
 
@@ -193,10 +193,10 @@  discard block
 block discarded – undo
193 193
         $this->setPage();
194 194
 
195 195
         if (!$this->isFullTextEmpty()) {
196
-            $this->view->assign('fulltext', true);
196
+            $this->view->assign('fulltext', TRUE);
197 197
             $this->view->assign('activateFullTextInitially', MathUtility::forceIntegerInRange($this->settings['activateFullTextInitially'], 0, 1, 0));
198 198
         } else {
199
-            $this->view->assign('fulltext', false);
199
+            $this->view->assign('fulltext', FALSE);
200 200
         }
201 201
     }
202 202
 
@@ -281,7 +281,7 @@  discard block
 block discarded – undo
281 281
         // Set parent element for initialization.
282 282
         $parentContainer = !empty($this->settings['parentContainer']) ? $this->settings['parentContainer'] : '.tx-dlf-imagemanipulationtool';
283 283
 
284
-        $this->view->assign('imageManipulation', true);
284
+        $this->view->assign('imageManipulation', TRUE);
285 285
         $this->view->assign('parentContainer', $parentContainer);
286 286
     }
287 287
 
@@ -444,7 +444,7 @@  discard block
 block discarded – undo
444 444
     {
445 445
         $id = $this->document->getUid();
446 446
 
447
-        if ($id !== null && $id > 0) {
447
+        if ($id !== NULL && $id > 0) {
448 448
             // we found the document uid
449 449
             return (string) $id;
450 450
         } else {
@@ -500,9 +500,9 @@  discard block
 block discarded – undo
500 500
         while ($fileGrpFulltext = array_shift($fileGrpsFulltext)) {
501 501
             $files = $this->currentDocument->physicalStructureInfo[$this->currentDocument->physicalStructure[$this->requestData['page']]]['files'];
502 502
             if (!empty($files[$fileGrpFulltext])) {
503
-                return false;
503
+                return FALSE;
504 504
             }
505 505
         }
506
-        return true;
506
+        return TRUE;
507 507
     }
508 508
 }
Please login to merge, or discard this patch.
Classes/Controller/PageViewController.php 3 patches
Braces   +1 added lines, -2 removed lines patch added patch discarded remove patch
@@ -25,8 +25,7 @@
 block discarded – undo
25 25
  *
26 26
  * @access public
27 27
  */
28
-class PageViewController extends AbstractController
29
-{
28
+class PageViewController extends AbstractController {
30 29
     /**
31 30
      * @access protected
32 31
      * @var array Holds the controls to add to the map
Please login to merge, or discard this patch.
Upper-Lower-Casing   +3 added lines, -3 removed lines patch added patch discarded remove patch
@@ -170,7 +170,7 @@  discard block
 block discarded – undo
170 170
             if ($iiif instanceof ManifestInterface) {
171 171
                 $canvas = $iiif->getContainedResourceById($canvasId);
172 172
                 /* @var $canvas \Ubl\Iiif\Presentation\Common\Model\Resources\CanvasInterface */
173
-                if ($canvas != null && !empty($canvas->getPossibleTextAnnotationContainers(Motivation::PAINTING))) {
173
+                if ($canvas != NULL && !empty($canvas->getPossibleTextAnnotationContainers(Motivation::PAINTING))) {
174 174
                     $annotationContainers = [];
175 175
                     /*
176 176
                      *  TODO Analyzing the annotations on the server side requires loading the annotation lists / pages
@@ -180,11 +180,11 @@  discard block
 block discarded – undo
180 180
                      *  On the other hand, server connections are potentially better than client connections. Downloading annotation lists
181 181
                      */
182 182
                     foreach ($canvas->getPossibleTextAnnotationContainers(Motivation::PAINTING) as $annotationContainer) {
183
-                        if (($textAnnotations = $annotationContainer->getTextAnnotations(Motivation::PAINTING)) != null) {
183
+                        if (($textAnnotations = $annotationContainer->getTextAnnotations(Motivation::PAINTING)) != NULL) {
184 184
                             foreach ($textAnnotations as $annotation) {
185 185
                                 if (
186 186
                                     $annotation->getBody()->getFormat() == 'text/plain'
187
-                                    && $annotation->getBody()->getChars() != null
187
+                                    && $annotation->getBody()->getChars() != NULL
188 188
                                 ) {
189 189
                                     $annotationListData = [];
190 190
                                     $annotationListData['uri'] = $annotationContainer->getId();
Please login to merge, or discard this patch.
Spacing   +11 added lines, -11 removed lines patch added patch discarded remove patch
@@ -119,11 +119,11 @@  discard block
 block discarded – undo
119 119
                 $fulltext['mimetype'] = $file['mimeType'];
120 120
                 break;
121 121
             } else {
122
-                $this->logger->notice('No full-text file found for page "' . $page . '" in fileGrp "' . $fileGrpFulltext . '"');
122
+                $this->logger->notice('No full-text file found for page "'.$page.'" in fileGrp "'.$fileGrpFulltext.'"');
123 123
             }
124 124
         }
125 125
         if (empty($fulltext)) {
126
-            $this->logger->notice('No full-text file found for page "' . $page . '" in fileGrps "' . $this->extConf['files']['fileGrpFulltext'] . '"');
126
+            $this->logger->notice('No full-text file found for page "'.$page.'" in fileGrps "'.$this->extConf['files']['fileGrpFulltext'].'"');
127 127
         }
128 128
         return $fulltext;
129 129
     }
@@ -141,13 +141,13 @@  discard block
 block discarded – undo
141 141
         $viewerConfiguration = '$(document).ready(function() {
142 142
                 if (dlfUtils.exists(dlfViewer)) {
143 143
                     tx_dlf_viewer = new dlfViewer({
144
-                        controls: ["' . implode('", "', $this->controls) . '"],
145
-                        div: "' . $this->settings['elementId'] . '",
146
-                        progressElementId: "' . $this->settings['progressElementId'] . '",
147
-                        images: ' . json_encode($this->images) . ',
148
-                        fulltexts: ' . json_encode($this->fulltexts) . ',
149
-                        annotationContainers: ' . json_encode($this->annotationContainers) . ',
150
-                        useInternalProxy: ' . ($this->settings['useInternalProxy'] ? 1 : 0) . '
144
+                        controls: ["' . implode('", "', $this->controls).'"],
145
+                        div: "' . $this->settings['elementId'].'",
146
+                        progressElementId: "' . $this->settings['progressElementId'].'",
147
+                        images: ' . json_encode($this->images).',
148
+                        fulltexts: ' . json_encode($this->fulltexts).',
149
+                        annotationContainers: ' . json_encode($this->annotationContainers).',
150
+                        useInternalProxy: ' . ($this->settings['useInternalProxy'] ? 1 : 0).'
151 151
                     });
152 152
                 }
153 153
             });';
@@ -240,11 +240,11 @@  discard block
 block discarded – undo
240 240
                 }
241 241
                 break;
242 242
             } else {
243
-                $this->logger->notice('No image file found for page "' . $page . '" in fileGrp "' . $fileGrpImages . '"');
243
+                $this->logger->notice('No image file found for page "'.$page.'" in fileGrp "'.$fileGrpImages.'"');
244 244
             }
245 245
         }
246 246
         if (empty($image)) {
247
-            $this->logger->warning('No image file found for page "' . $page . '" in fileGrps "' . $this->extConf['files']['fileGrpImages'] . '"');
247
+            $this->logger->warning('No image file found for page "'.$page.'" in fileGrps "'.$this->extConf['files']['fileGrpImages'].'"');
248 248
         }
249 249
         return $image;
250 250
     }
Please login to merge, or discard this patch.
Classes/Controller/CalendarController.php 3 patches
Spacing   +11 added lines, -11 removed lines patch added patch discarded remove patch
@@ -134,8 +134,8 @@  discard block
 block discarded – undo
134 134
         $this->view->assign('calendarData', $calendarData);
135 135
         $this->view->assign('documentId', $this->document->getUid());
136 136
         $this->view->assign('yearLinkTitle', $yearLinkTitle);
137
-        $this->view->assign('parentDocumentId', $this->document->getPartof() ?: $this->document->getCurrentDocument()->tableOfContents[0]['points']);
138
-        $this->view->assign('allYearDocTitle', $this->document->getCurrentDocument()->getTitle($this->document->getPartof()) ?: $this->document->getCurrentDocument()->tableOfContents[0]['label']);
137
+        $this->view->assign('parentDocumentId', $this->document->getPartof() ? : $this->document->getCurrentDocument()->tableOfContents[0]['points']);
138
+        $this->view->assign('allYearDocTitle', $this->document->getCurrentDocument()->getTitle($this->document->getPartof()) ? : $this->document->getCurrentDocument()->tableOfContents[0]['label']);
139 139
     }
140 140
 
141 141
     /**
@@ -220,7 +220,7 @@  discard block
 block discarded – undo
220 220
         }
221 221
 
222 222
         $this->view->assign('documentId', $this->document->getUid());
223
-        $this->view->assign('allYearDocTitle', $this->document->getCurrentDocument()->getTitle((int) $this->document->getUid()) ?: $this->document->getCurrentDocument()->tableOfContents[0]['label']);
223
+        $this->view->assign('allYearDocTitle', $this->document->getCurrentDocument()->getTitle((int) $this->document->getUid()) ? : $this->document->getCurrentDocument()->tableOfContents[0]['label']);
224 224
     }
225 225
 
226 226
     /**
@@ -239,7 +239,7 @@  discard block
 block discarded – undo
239 239
     protected function getCalendarYear(array &$calendarData, array $calendarIssuesByMonth, int $year, int $firstMonth = 1, int $lastMonth = 12): void
240 240
     {
241 241
         for ($i = $firstMonth; $i <= $lastMonth; $i++) {
242
-            $key = $year . '-' . $i;
242
+            $key = $year.'-'.$i;
243 243
 
244 244
             $calendarData[$key] = [
245 245
                 'DAYMON_NAME' => strftime('%a', strtotime('last Monday')),
@@ -249,16 +249,16 @@  discard block
 block discarded – undo
249 249
                 'DAYFRI_NAME' => strftime('%a', strtotime('last Friday')),
250 250
                 'DAYSAT_NAME' => strftime('%a', strtotime('last Saturday')),
251 251
                 'DAYSUN_NAME' => strftime('%a', strtotime('last Sunday')),
252
-                'MONTHNAME'  => strftime('%B', strtotime($year . '-' . $i . '-1')) . ' ' . $year,
252
+                'MONTHNAME'  => strftime('%B', strtotime($year.'-'.$i.'-1')).' '.$year,
253 253
                 'CALYEAR' => ($i == $firstMonth) ? $year : ''
254 254
             ];
255 255
 
256
-            $firstOfMonth = strtotime($year . '-' . $i . '-1');
256
+            $firstOfMonth = strtotime($year.'-'.$i.'-1');
257 257
             $lastOfMonth = strtotime('last day of', ($firstOfMonth));
258 258
             $firstOfMonthStart = strtotime('last Monday', $firstOfMonth);
259 259
             // There are never more than 6 weeks in a month.
260 260
             for ($j = 0; $j <= 5; $j++) {
261
-                $firstDayOfWeek = strtotime('+ ' . $j . ' Week', $firstOfMonthStart);
261
+                $firstDayOfWeek = strtotime('+ '.$j.' Week', $firstOfMonthStart);
262 262
 
263 263
                 $calendarData[$key]['week'][$j] = [
264 264
                     'DAYMON' => ['dayValue' => '&nbsp;'],
@@ -271,7 +271,7 @@  discard block
 block discarded – undo
271 271
                 ];
272 272
                 // Every week has seven days. ;-)
273 273
                 for ($k = 0; $k <= 6; $k++) {
274
-                    $currentDayTime = strtotime('+ ' . $k . ' Day', $firstDayOfWeek);
274
+                    $currentDayTime = strtotime('+ '.$k.' Day', $firstDayOfWeek);
275 275
                     if (
276 276
                         $currentDayTime >= $firstOfMonth
277 277
                         && $currentDayTime <= $lastOfMonth
@@ -342,7 +342,7 @@  discard block
 block discarded – undo
342 342
      */
343 343
     private function fillCalendar(array &$calendarData, int $currentDayTime, string $dayLinks, array $dayLinkDiv, int $firstDayOfWeek, int $k): void
344 344
     {
345
-        switch (strftime('%w', strtotime('+ ' . $k . ' Day', $firstDayOfWeek))) {
345
+        switch (strftime('%w', strtotime('+ '.$k.' Day', $firstDayOfWeek))) {
346 346
             case '0':
347 347
                 $this->fillDay($calendarData, $currentDayTime, 'DAYSUN', $dayLinks, $dayLinkDiv);
348 348
                 break;
@@ -446,7 +446,7 @@  discard block
 block discarded – undo
446 446
                 $_day = date('j', $dateTimestamp);
447 447
                 $issuesByYear[$_year][$_month][$_day][] = $issue;
448 448
             } else {
449
-                $this->logger->warning('Document with UID ' . $issue['uid'] . 'has no valid date of publication');
449
+                $this->logger->warning('Document with UID '.$issue['uid'].'has no valid date of publication');
450 450
             }
451 451
         }
452 452
         // Sort by years.
@@ -489,7 +489,7 @@  discard block
 block discarded – undo
489 489
             foreach ($year['children'] as $month) {
490 490
                 foreach ($month['children'] as $day) {
491 491
                     foreach ($day['children'] as $issue) {
492
-                        $title = $issue['label'] ?: $issue['orderlabel'];
492
+                        $title = $issue['label'] ? : $issue['orderlabel'];
493 493
                         if (strtotime($title) !== false) {
494 494
                             $title = strftime('%x', strtotime($title));
495 495
                         }
Please login to merge, or discard this patch.
Braces   +1 added lines, -2 removed lines patch added patch discarded remove patch
@@ -25,8 +25,7 @@
 block discarded – undo
25 25
  *
26 26
  * @access public
27 27
  */
28
-class CalendarController extends AbstractController
29
-{
28
+class CalendarController extends AbstractController {
30 29
     /**
31 30
      * @access protected
32 31
      * @var StructureRepository
Please login to merge, or discard this patch.
Upper-Lower-Casing   +5 added lines, -5 removed lines patch added patch discarded remove patch
@@ -82,9 +82,9 @@  discard block
 block discarded – undo
82 82
         switch ($type) {
83 83
             case 'newspaper':
84 84
             case 'ephemera':
85
-                $this->forward('years', null, null, $this->requestData);
85
+                $this->forward('years', NULL, NULL, $this->requestData);
86 86
             case 'year':
87
-                $this->forward('calendar', null, null, $this->requestData);
87
+                $this->forward('calendar', NULL, NULL, $this->requestData);
88 88
             case 'issue':
89 89
             default:
90 90
                 break;
@@ -440,7 +440,7 @@  discard block
 block discarded – undo
440 440
 
441 441
         foreach ($this->getIssues() as $issue) {
442 442
             $dateTimestamp = strtotime($issue['year']);
443
-            if ($dateTimestamp !== false) {
443
+            if ($dateTimestamp !== FALSE) {
444 444
                 $_year = date('Y', $dateTimestamp);
445 445
                 $_month = date('n', $dateTimestamp);
446 446
                 $_day = date('j', $dateTimestamp);
@@ -490,7 +490,7 @@  discard block
 block discarded – undo
490 490
                 foreach ($month['children'] as $day) {
491 491
                     foreach ($day['children'] as $issue) {
492 492
                         $title = $issue['label'] ?: $issue['orderlabel'];
493
-                        if (strtotime($title) !== false) {
493
+                        if (strtotime($title) !== FALSE) {
494 494
                             $title = strftime('%x', strtotime($title));
495 495
                         }
496 496
 
@@ -523,7 +523,7 @@  discard block
 block discarded – undo
523 523
                 $title = $document->getTitle();
524 524
             } else {
525 525
                 $title = !empty($document->getMetsLabel()) ? $document->getMetsLabel() : $document->getMetsOrderlabel();
526
-                if (strtotime($title) !== false) {
526
+                if (strtotime($title) !== FALSE) {
527 527
                     $title = strftime('%x', strtotime($title));
528 528
                 }
529 529
             }
Please login to merge, or discard this patch.
Classes/Controller/BasketController.php 3 patches
Braces   +2 added lines, -4 removed lines patch added patch discarded remove patch
@@ -33,8 +33,7 @@  discard block
 block discarded – undo
33 33
  *
34 34
  * @access public
35 35
  */
36
-class BasketController extends AbstractController
37
-{
36
+class BasketController extends AbstractController {
38 37
     /**
39 38
      * @access protected
40 39
      * @var BasketRepository
@@ -328,8 +327,7 @@  discard block
 block discarded – undo
328 327
      *
329 328
      * @return array|false download url or false
330 329
      */
331
-    protected function getDocumentData(int $id, array $data)
332
-    {
330
+    protected function getDocumentData(int $id, array $data) {
333 331
         // get document instance to load further information
334 332
         $this->loadDocument((int) $id);
335 333
         if (isset($this->document)) {
Please login to merge, or discard this patch.
Upper-Lower-Casing   +6 added lines, -6 removed lines patch added patch discarded remove patch
@@ -190,7 +190,7 @@  discard block
 block discarded – undo
190 190
 
191 191
         $countDocs = 0;
192 192
         if ($basket->getDocIds()) {
193
-            $countDocs = count(json_decode($basket->getDocIds(), true));
193
+            $countDocs = count(json_decode($basket->getDocIds(), TRUE));
194 194
         }
195 195
         $this->view->assign('countDocs', $countDocs);
196 196
 
@@ -253,7 +253,7 @@  discard block
 block discarded – undo
253 253
         }
254 254
 
255 255
         // session does not exist
256
-        if ($basket === null) {
256
+        if ($basket === NULL) {
257 257
             // create new basket in db
258 258
             $basket = GeneralUtility::makeInstance(Basket::class);
259 259
             $basket->setSessionId($userSession->getIdentifier());
@@ -388,7 +388,7 @@  discard block
 block discarded – undo
388 388
                 'record_id' => $this->document->getRecordId(),
389 389
             ];
390 390
         }
391
-        return false;
391
+        return FALSE;
392 392
     }
393 393
 
394 394
     /**
@@ -410,7 +410,7 @@  discard block
 block discarded – undo
410 410
         } else {
411 411
             $page = (int) $piVars['startpage'];
412 412
         }
413
-        if ($page != null || $piVars['addToBasket'] == 'list') {
413
+        if ($page != NULL || $piVars['addToBasket'] == 'list') {
414 414
             $documentItem = [
415 415
                 'id' => (int) $piVars['id'],
416 416
                 'startpage' => (int) $piVars['startpage'],
@@ -433,7 +433,7 @@  discard block
 block discarded – undo
433 433
             $this->loadDocument((int) $documentItem['id']);
434 434
             if ($this->isDocMissing()) {
435 435
                 // Quit without doing anything if required variables are not set.
436
-                return null;
436
+                return NULL;
437 437
             }
438 438
             // set endpage for toc and subentry based on logid
439 439
             if (($piVars['addToBasket'] == 'subentry') or ($piVars['addToBasket'] == 'toc')) {
@@ -487,7 +487,7 @@  discard block
 block discarded – undo
487 487
             }
488 488
 
489 489
             $basket->setDocIds(json_encode($items));
490
-            if ($basket->getUid() === null) {
490
+            if ($basket->getUid() === NULL) {
491 491
                 $this->basketRepository->add($basket);
492 492
             } else {
493 493
                 $this->basketRepository->update($basket);
Please login to merge, or discard this patch.
Spacing   +26 added lines, -26 removed lines patch added patch discarded remove patch
@@ -133,7 +133,7 @@  discard block
 block discarded – undo
133 133
                 foreach ($this->requestData['selected'] as $docValue) {
134 134
                     if ($docValue['id']) {
135 135
                         $docData = $this->getDocumentData((int) $docValue['id'], $docValue);
136
-                        $pdfUrl .= $docData['urlParams'] . $this->settings['pdfparamseparator'];
136
+                        $pdfUrl .= $docData['urlParams'].$this->settings['pdfparamseparator'];
137 137
                         $this->redirectToUri($pdfUrl);
138 138
                     }
139 139
                 }
@@ -200,7 +200,7 @@  discard block
 block discarded – undo
200 200
         if ($allMails->count() > 0) {
201 201
             $mailSelect[0] = htmlspecialchars(LocalizationUtility::translate('basket.chooseMail', 'dlf'));
202 202
             foreach ($allMails as $mail) {
203
-                $mailSelect[$mail->getUid()] = htmlspecialchars($mail->getName()) . ' (' . htmlspecialchars($mail->getMail()) . ')';
203
+                $mailSelect[$mail->getUid()] = htmlspecialchars($mail->getName()).' ('.htmlspecialchars($mail->getMail()).')';
204 204
             }
205 205
             $this->view->assign('mailSelect', $mailSelect);
206 206
         }
@@ -288,12 +288,12 @@  discard block
 block discarded – undo
288 288
 
289 289
         $docData = $this->getDocumentData((int) $id, $data);
290 290
 
291
-        $entryKey = $id . '_' . $startPage;
291
+        $entryKey = $id.'_'.$startPage;
292 292
         if (!empty($startX)) {
293
-            $entryKey .= '_' . $startX;
293
+            $entryKey .= '_'.$startX;
294 294
         }
295 295
         if (!empty($endX)) {
296
-            $entryKey .= '_' . $endX;
296
+            $entryKey .= '_'.$endX;
297 297
         }
298 298
 
299 299
         $entry = [
@@ -352,7 +352,7 @@  discard block
 block discarded – undo
352 352
             $urlParams = str_replace("##endy##", $data['endY'] === "" ? "" : (int) $data['endY'], $urlParams);
353 353
             $urlParams = str_replace("##rotation##", $data['rotation'] === "" ? "" : (int) $data['rotation'], $urlParams);
354 354
 
355
-            $downloadUrl = $this->settings['pdfgenerate'] . $urlParams;
355
+            $downloadUrl = $this->settings['pdfgenerate'].$urlParams;
356 356
 
357 357
             $title = $this->document->getTitle();
358 358
             if (empty($title)) {
@@ -363,15 +363,15 @@  discard block
 block discarded – undo
363 363
             $info = '';
364 364
             if ($data['startX'] != '' && $data['endX'] != '') {
365 365
                 // cutout
366
-                $info .= htmlspecialchars(LocalizationUtility::translate('basket.cutout', 'dlf')) . ' ';
366
+                $info .= htmlspecialchars(LocalizationUtility::translate('basket.cutout', 'dlf')).' ';
367 367
             }
368 368
             if ($data['startpage'] == $data['endpage']) {
369 369
                 // One page
370
-                $info .= htmlspecialchars(LocalizationUtility::translate('page', 'dlf')) . ' ' . $data['startpage'];
370
+                $info .= htmlspecialchars(LocalizationUtility::translate('page', 'dlf')).' '.$data['startpage'];
371 371
             } else {
372
-                $info .= htmlspecialchars(LocalizationUtility::translate('page', 'dlf')) . ' ' . $data['startpage'] . '-' . $data['endpage'];
372
+                $info .= htmlspecialchars(LocalizationUtility::translate('page', 'dlf')).' '.$data['startpage'].'-'.$data['endpage'];
373 373
             }
374
-            $downloadLink = '<a href="' . $downloadUrl . '" target="_blank">' . htmlspecialchars($title) . '</a> (' . $info . ')';
374
+            $downloadLink = '<a href="'.$downloadUrl.'" target="_blank">'.htmlspecialchars($title).'</a> ('.$info.')';
375 375
             if ($data['startpage'] == $data['endpage']) {
376 376
                 $pageNums = 1;
377 377
             } else {
@@ -444,12 +444,12 @@  discard block
 block discarded – undo
444 444
             if ($piVars['addToBasket'] == 'list') {
445 445
                 $documentItem['endpage'] = $this->document->getCurrentDocument()->numPages;
446 446
             }
447
-            $arrayKey = $documentItem['id'] . '_' . $page;
447
+            $arrayKey = $documentItem['id'].'_'.$page;
448 448
             if (!empty($documentItem['startX'])) {
449
-                $arrayKey .= '_' . $documentItem['startX'];
449
+                $arrayKey .= '_'.$documentItem['startX'];
450 450
             }
451 451
             if (!empty($documentItem['endX'])) {
452
-                $arrayKey .= '_' . $documentItem['endX'];
452
+                $arrayKey .= '_'.$documentItem['endX'];
453 453
             }
454 454
             // do not add more than one identical object
455 455
             if (!in_array($arrayKey, $items)) {
@@ -470,14 +470,14 @@  discard block
 block discarded – undo
470 470
                     // remove parameter endpage
471 471
                     $pdfParams = str_replace(",##endpage##", '', $pdfParams);
472 472
                 }
473
-                $pdfGenerateUrl = $this->settings['pdfgenerate'] . $pdfParams;
473
+                $pdfGenerateUrl = $this->settings['pdfgenerate'].$pdfParams;
474 474
                 if ($this->settings['pregeneration']) {
475 475
                     // send ajax request to webapp
476 476
                     $output .= '
477 477
      <script>
478 478
       $(document).ready(function(){
479 479
        $.ajax({
480
-         url: "' . $pdfGenerateUrl . '",
480
+         url: "' . $pdfGenerateUrl.'",
481 481
        }).done(function() {
482 482
        });
483 483
       });
@@ -515,12 +515,12 @@  discard block
 block discarded – undo
515 515
         }
516 516
         foreach ($piVars['selected'] as $value) {
517 517
             if (isset($value['id'])) {
518
-                $arrayKey = $value['id'] . '_' . $value['startpage'];
518
+                $arrayKey = $value['id'].'_'.$value['startpage'];
519 519
                 if (!empty($value['startX'])) {
520
-                    $arrayKey .= '_' . $value['startX'];
520
+                    $arrayKey .= '_'.$value['startX'];
521 521
                 }
522 522
                 if (!empty($value['endX'])) {
523
-                    $arrayKey .= '_' . $value['endX'];
523
+                    $arrayKey .= '_'.$value['endX'];
524 524
                 }
525 525
                 if (isset($items[$arrayKey])) {
526 526
                     unset($items[$arrayKey]);
@@ -553,7 +553,7 @@  discard block
 block discarded – undo
553 553
 
554 554
         $mailObject = $this->mailRepository->findByUid(intval($mailId))->getFirst();
555 555
 
556
-        $mailText = htmlspecialchars(LocalizationUtility::translate('basket.mailBody', 'dlf')) . "\n";
556
+        $mailText = htmlspecialchars(LocalizationUtility::translate('basket.mailBody', 'dlf'))."\n";
557 557
         $numberOfPages = 0;
558 558
         $pdfUrl = $this->settings['pdfdownload'];
559 559
         // prepare links
@@ -561,7 +561,7 @@  discard block
 block discarded – undo
561 561
             if ($docValue['id']) {
562 562
                 $explodeId = explode("_", $docValue['id']);
563 563
                 $docData = $this->getDocumentData((int) $explodeId[0], $docValue);
564
-                $pdfUrl .= $docData['urlParams'] . $this->settings['pdfparamseparator'];
564
+                $pdfUrl .= $docData['urlParams'].$this->settings['pdfparamseparator'];
565 565
                 $pages = (abs(intval($docValue['startpage']) - intval($docValue['endpage'])));
566 566
                 if ($pages === 0) {
567 567
                     $numberOfPages = $numberOfPages + 1;
@@ -572,7 +572,7 @@  discard block
 block discarded – undo
572 572
         }
573 573
         // Remove leading/tailing pdfparamseperator
574 574
         $pdfUrl = trim($pdfUrl, $this->settings['pdfparamseparator']);
575
-        $mailBody = $mailText . $pdfUrl;
575
+        $mailBody = $mailText.$pdfUrl;
576 576
         // Get hook objects.
577 577
         $hookObjects = Helper::getHookObjects('Classes/Controller/BasketController.php');
578 578
         // Hook for getting a customized mail body.
@@ -599,7 +599,7 @@  discard block
 block discarded – undo
599 599
         $newActionLog = GeneralUtility::makeInstance(ActionLog::class);
600 600
         $newActionLog->setFileName($pdfUrl);
601 601
         $newActionLog->setCountPages($numberOfPages);
602
-        $newActionLog->setLabel('Mail: ' . $mailObject->getMail());
602
+        $newActionLog->setLabel('Mail: '.$mailObject->getMail());
603 603
 
604 604
         if ($GLOBALS["TSFE"]->loginUser) {
605 605
             // internal user
@@ -630,7 +630,7 @@  discard block
 block discarded – undo
630 630
         foreach ($this->requestData['selected'] as $docId => $docValue) {
631 631
             if ($docValue['id']) {
632 632
                 $docData = $this->getDocumentData((int) $docValue['id'], $docValue);
633
-                $pdfUrl .= $docData['urlParams'] . $this->settings['pdfparamseparator'];
633
+                $pdfUrl .= $docData['urlParams'].$this->settings['pdfparamseparator'];
634 634
                 $numberOfPages += $docData['pageNums'];
635 635
             }
636 636
         }
@@ -648,7 +648,7 @@  discard block
 block discarded – undo
648 648
                 if ($docValue['id']) {
649 649
                     $explodeId = explode("_", $docId);
650 650
                     $docData = $this->getDocumentData((int) $explodeId[0], $docValue);
651
-                    $pdfUrl .= $docData['urlParams'] . $this->settings['pdfparamseparator'];
651
+                    $pdfUrl .= $docData['urlParams'].$this->settings['pdfparamseparator'];
652 652
                     $numberOfPages += $docData['pageNums'];
653 653
                 }
654 654
             }
@@ -665,12 +665,12 @@  discard block
 block discarded – undo
665 665
             // internal user
666 666
             $actionLog->setUserId($GLOBALS["TSFE"]->fe_user->user['uid']);
667 667
             $actionLog->setName($GLOBALS["TSFE"]->fe_user->user['username']);
668
-            $actionLog->setLabel('Print: ' . $printer->getLabel());
668
+            $actionLog->setLabel('Print: '.$printer->getLabel());
669 669
         } else {
670 670
             // external user
671 671
             $actionLog->setUserId(0);
672 672
             $actionLog->setName('n/a');
673
-            $actionLog->setLabel('Print: ' . $printer->getLabel());
673
+            $actionLog->setLabel('Print: '.$printer->getLabel());
674 674
         }
675 675
         // add action to protocol
676 676
         $this->actionLogRepository->add($actionLog);
Please login to merge, or discard this patch.
Classes/Controller/CollectionController.php 3 patches
Braces   +1 added lines, -2 removed lines patch added patch discarded remove patch
@@ -28,8 +28,7 @@
 block discarded – undo
28 28
  *
29 29
  * @access public
30 30
  */
31
-class CollectionController extends AbstractController
32
-{
31
+class CollectionController extends AbstractController {
33 32
     /**
34 33
      * @access protected
35 34
      * @var CollectionRepository
Please login to merge, or discard this patch.
Upper-Lower-Casing   +8 added lines, -8 removed lines patch added patch discarded remove patch
@@ -98,7 +98,7 @@  discard block
 block discarded – undo
98 98
         }
99 99
 
100 100
         if (count($collections) == 1 && empty($this->settings['dont_show_single']) && is_array($collections)) {
101
-            $this->forward('show', null, null, ['collection' => array_pop($collections)]);
101
+            $this->forward('show', NULL, NULL, ['collection' => array_pop($collections)]);
102 102
         }
103 103
 
104 104
         $processedCollections = $this->processCollections($collections, $solr);
@@ -140,7 +140,7 @@  discard block
 block discarded – undo
140 140
         $searchParams['collection'] = $collection;
141 141
         // If a targetPid is given, the results will be shown by ListView on the target page.
142 142
         if (!empty($this->settings['targetPid'])) {
143
-            $this->redirect('main', 'ListView', null,
143
+            $this->redirect('main', 'ListView', NULL,
144 144
                 [
145 145
                     'searchParameter' => $searchParams,
146 146
                     'page' => $currentPage
@@ -149,16 +149,16 @@  discard block
 block discarded – undo
149 149
         }
150 150
 
151 151
         // get all metadata records to be shown in results
152
-        $listedMetadata = $this->metadataRepository->findByIsListed(true);
152
+        $listedMetadata = $this->metadataRepository->findByIsListed(TRUE);
153 153
 
154 154
         // get all indexed metadata fields
155
-        $indexedMetadata = $this->metadataRepository->findByIndexIndexed(true);
155
+        $indexedMetadata = $this->metadataRepository->findByIndexIndexed(TRUE);
156 156
 
157 157
         // get all sortable metadata records
158
-        $sortableMetadata = $this->metadataRepository->findByIsSortable(true);
158
+        $sortableMetadata = $this->metadataRepository->findByIsSortable(TRUE);
159 159
 
160 160
         // get all documents of given collection
161
-        $solrResults = null;
161
+        $solrResults = NULL;
162 162
         if (is_array($searchParams) && !empty($searchParams)) {
163 163
             $solrResults = $this->documentRepository->findSolrByCollection($collection, $this->settings, $searchParams, $listedMetadata, $indexedMetadata);
164 164
 
@@ -194,13 +194,13 @@  discard block
 block discarded – undo
194 194
         // if search was triggered, get search parameters from POST variables
195 195
         $searchParams = $this->getParametersSafely('searchParameter');
196 196
 
197
-        $collection = null;
197
+        $collection = NULL;
198 198
         if ($searchParams['collection']['__identity'] && MathUtility::canBeInterpretedAsInteger($searchParams['collection']['__identity'])) {
199 199
             $collection = $this->collectionRepository->findByUid($searchParams['collection']['__identity']);
200 200
         }
201 201
 
202 202
         // output is done by show action
203
-        $this->forward('show', null, null, ['searchParameter' => $searchParams, 'collection' => $collection]);
203
+        $this->forward('show', NULL, NULL, ['searchParameter' => $searchParams, 'collection' => $collection]);
204 204
 
205 205
     }
206 206
 
Please login to merge, or discard this patch.
Spacing   +5 added lines, -5 removed lines patch added patch discarded remove patch
@@ -168,7 +168,7 @@  discard block
 block discarded – undo
168 168
             $simplePagination = new SimplePagination($solrPaginator);
169 169
 
170 170
             $pagination = $this->buildSimplePagination($simplePagination, $solrPaginator);
171
-            $this->view->assignMultiple([ 'pagination' => $pagination, 'paginator' => $solrPaginator ]);
171
+            $this->view->assignMultiple(['pagination' => $pagination, 'paginator' => $solrPaginator]);
172 172
         }
173 173
 
174 174
         $this->view->assign('viewData', $this->viewData);
@@ -220,9 +220,9 @@  discard block
 block discarded – undo
220 220
         foreach ($collections as $collection) {
221 221
             $solrQuery = '';
222 222
             if ($collection->getIndexSearch() != '') {
223
-                $solrQuery .= '(' . $collection->getIndexSearch() . ')';
223
+                $solrQuery .= '('.$collection->getIndexSearch().')';
224 224
             } else {
225
-                $solrQuery .= 'collection:("' . Solr::escapeQuery($collection->getIndexName()) . '")';
225
+                $solrQuery .= 'collection:("'.Solr::escapeQuery($collection->getIndexName()).'")';
226 226
             }
227 227
 
228 228
             // We only care about the UID and partOf in the results and want them sorted
@@ -236,11 +236,11 @@  discard block
 block discarded – undo
236 236
             if ($collection->getIndexSearch()) {
237 237
                 $params['query'] = $solrQuery;
238 238
             } else {
239
-                $params['query'] = $solrQuery . ' AND partof:0 AND toplevel:true';
239
+                $params['query'] = $solrQuery.' AND partof:0 AND toplevel:true';
240 240
             }
241 241
             $partOfNothing = $solr->searchRaw($params);
242 242
 
243
-            $params['query'] = $solrQuery . ' AND NOT partof:0 AND toplevel:true';
243
+            $params['query'] = $solrQuery.' AND NOT partof:0 AND toplevel:true';
244 244
             $partOfSomething = $solr->searchRaw($params);
245 245
 
246 246
             $collectionInfo = [];
Please login to merge, or discard this patch.
Classes/Controller/Backend/NewTenantController.php 3 patches
Braces   +1 added lines, -2 removed lines patch added patch discarded remove patch
@@ -42,8 +42,7 @@
 block discarded – undo
42 42
  *
43 43
  * @access public
44 44
  */
45
-class NewTenantController extends AbstractController
46
-{
45
+class NewTenantController extends AbstractController {
47 46
     /**
48 47
      * @access protected
49 48
      * @var int
Please login to merge, or discard this patch.
Spacing   +7 added lines, -7 removed lines patch added patch discarded remove patch
@@ -250,7 +250,7 @@  discard block
 block discarded – undo
250 250
 
251 251
             $data['tx_dlf_metadata'][uniqid('NEW')] = [
252 252
                 'pid' => $this->pid,
253
-                'label' => $this->getLLL('metadata.' . $indexName, $this->siteLanguages[0]->getTypo3Language(), $metadataLabels),
253
+                'label' => $this->getLLL('metadata.'.$indexName, $this->siteLanguages[0]->getTypo3Language(), $metadataLabels),
254 254
                 'index_name' => $indexName,
255 255
                 'format' => implode(',', $formatIds),
256 256
                 'default_value' => $values['default_value'],
@@ -289,7 +289,7 @@  discard block
 block discarded – undo
289 289
                     'pid' => $this->pid,
290 290
                     'sys_language_uid' => $siteLanguage->getLanguageId(),
291 291
                     'l18n_parent' => $id,
292
-                    'label' => $this->getLLL('metadata.' . $indexName, $siteLanguage->getTypo3Language(), $metadataLabels),
292
+                    'label' => $this->getLLL('metadata.'.$indexName, $siteLanguage->getTypo3Language(), $metadataLabels),
293 293
                 ];
294 294
             }
295 295
 
@@ -315,7 +315,7 @@  discard block
 block discarded – undo
315 315
 
316 316
         if ($this->solrCoreRepository->findOneByPid($this->pid) === null) {
317 317
             $newRecord = GeneralUtility::makeInstance(SolrCore::class);
318
-            $newRecord->setLabel($this->getLLL('flexform.solrcore', $this->siteLanguages[0]->getTypo3Language(), $beLabels). ' (PID ' . $this->pid . ')');
318
+            $newRecord->setLabel($this->getLLL('flexform.solrcore', $this->siteLanguages[0]->getTypo3Language(), $beLabels).' (PID '.$this->pid.')');
319 319
             $indexName = Solr::createCore('');
320 320
             if (!empty($indexName)) {
321 321
                 $newRecord->setIndexName($indexName);
@@ -355,7 +355,7 @@  discard block
 block discarded – undo
355 355
             $data['tx_dlf_structures'][uniqid('NEW')] = [
356 356
                 'pid' => $this->pid,
357 357
                 'toplevel' => $values['toplevel'],
358
-                'label' => $this->getLLL('structure.' . $indexName, $this->siteLanguages[0]->getTypo3Language(), $structureLabels),
358
+                'label' => $this->getLLL('structure.'.$indexName, $this->siteLanguages[0]->getTypo3Language(), $structureLabels),
359 359
                 'index_name' => $indexName,
360 360
                 'oai_name' => $values['oai_name'],
361 361
                 'thumbnail' => 0,
@@ -380,7 +380,7 @@  discard block
 block discarded – undo
380 380
                     'pid' => $this->pid,
381 381
                     'sys_language_uid' => $siteLanguage->getLanguageId(),
382 382
                     'l18n_parent' => $id,
383
-                    'label' => $this->getLLL('structure.' . $indexName, $siteLanguage->getTypo3Language(), $structureLabels),
383
+                    'label' => $this->getLLL('structure.'.$indexName, $siteLanguage->getTypo3Language(), $structureLabels),
384 384
                 ];
385 385
             }
386 386
 
@@ -475,7 +475,7 @@  discard block
 block discarded – undo
475 475
         } elseif (isset($langArray['default'][$index][0]['target'])) {
476 476
             return $langArray['default'][$index][0]['target'];
477 477
         } else {
478
-            return 'Missing translation for ' . $index;
478
+            return 'Missing translation for '.$index;
479 479
         }
480 480
     }
481 481
 
@@ -490,7 +490,7 @@  discard block
 block discarded – undo
490 490
      */
491 491
     private function getRecords(string $recordType): array
492 492
     {
493
-        $filePath = Environment::getPublicPath() . '/typo3conf/ext/dlf/Resources/Private/Data/' . $recordType . 'Defaults.json';
493
+        $filePath = Environment::getPublicPath().'/typo3conf/ext/dlf/Resources/Private/Data/'.$recordType.'Defaults.json';
494 494
 
495 495
         $resourceFactory = GeneralUtility::makeInstance(ResourceFactory::class);
496 496
         $fileObject = $resourceFactory->getFileObjectFromCombinedIdentifier($filePath);
Please login to merge, or discard this patch.
Upper-Lower-Casing   +13 added lines, -13 removed lines patch added patch discarded remove patch
@@ -187,11 +187,11 @@  discard block
 block discarded – undo
187 187
         $frameworkConfiguration['persistence']['storagePid'] = 0;
188 188
         $this->configurationManager->setConfiguration($frameworkConfiguration);
189 189
 
190
-        $doPersist = false;
190
+        $doPersist = FALSE;
191 191
 
192 192
         foreach ($formatsDefaults as $type => $values) {
193 193
             // if default format record is not found, add it to the repository
194
-            if ($this->formatRepository->findOneByType($type) === null) {
194
+            if ($this->formatRepository->findOneByType($type) === NULL) {
195 195
                 $newRecord = GeneralUtility::makeInstance(Format::class);
196 196
                 $newRecord->setType($type);
197 197
                 $newRecord->setRoot($values['root']);
@@ -199,12 +199,12 @@  discard block
 block discarded – undo
199 199
                 $newRecord->setClass($values['class']);
200 200
                 $this->formatRepository->add($newRecord);
201 201
 
202
-                $doPersist = true;
202
+                $doPersist = TRUE;
203 203
             }
204 204
         }
205 205
 
206 206
         // We must persist here, if we changed anything.
207
-        if ($doPersist === true) {
207
+        if ($doPersist === TRUE) {
208 208
             $persistenceManager = GeneralUtility::makeInstance(PersistenceManager::class);
209 209
             $persistenceManager->persistAll();
210 210
         }
@@ -266,13 +266,13 @@  discard block
 block discarded – undo
266 266
             ];
267 267
         }
268 268
 
269
-        $metadataIds = Helper::processDatabaseAsAdmin($data, [], true);
269
+        $metadataIds = Helper::processDatabaseAsAdmin($data, [], TRUE);
270 270
 
271 271
         $insertedMetadata = [];
272 272
         foreach ($metadataIds as $id => $uid) {
273 273
             $metadata = $this->metadataRepository->findByUid($uid);
274 274
             // id array contains also ids of formats
275
-            if ($metadata != null) {
275
+            if ($metadata != NULL) {
276 276
                 $insertedMetadata[$uid] = $metadata->getIndexName();
277 277
             }
278 278
         }
@@ -308,12 +308,12 @@  discard block
 block discarded – undo
308 308
      */
309 309
     public function addSolrCoreAction(): void
310 310
     {
311
-        $doPersist = false;
311
+        $doPersist = FALSE;
312 312
 
313 313
         // load language file in own array
314 314
         $beLabels = $this->languageFactory->getParsedData('EXT:dlf/Resources/Private/Language/locallang_be.xlf', $this->siteLanguages[0]->getTypo3Language());
315 315
 
316
-        if ($this->solrCoreRepository->findOneByPid($this->pid) === null) {
316
+        if ($this->solrCoreRepository->findOneByPid($this->pid) === NULL) {
317 317
             $newRecord = GeneralUtility::makeInstance(SolrCore::class);
318 318
             $newRecord->setLabel($this->getLLL('flexform.solrcore', $this->siteLanguages[0]->getTypo3Language(), $beLabels). ' (PID ' . $this->pid . ')');
319 319
             $indexName = Solr::createCore('');
@@ -322,12 +322,12 @@  discard block
 block discarded – undo
322 322
 
323 323
                 $this->solrCoreRepository->add($newRecord);
324 324
 
325
-                $doPersist = true;
325
+                $doPersist = TRUE;
326 326
             }
327 327
         }
328 328
 
329 329
         // We must persist here, if we changed anything.
330
-        if ($doPersist === true) {
330
+        if ($doPersist === TRUE) {
331 331
             $persistenceManager = GeneralUtility::makeInstance(PersistenceManager::class);
332 332
             $persistenceManager->persistAll();
333 333
         }
@@ -361,7 +361,7 @@  discard block
 block discarded – undo
361 361
                 'thumbnail' => 0,
362 362
             ];
363 363
         }
364
-        $structureIds = Helper::processDatabaseAsAdmin($data, [], true);
364
+        $structureIds = Helper::processDatabaseAsAdmin($data, [], TRUE);
365 365
 
366 366
         $insertedStructures = [];
367 367
         foreach ($structureIds as $id => $uid) {
@@ -495,9 +495,9 @@  discard block
 block discarded – undo
495 495
         $resourceFactory = GeneralUtility::makeInstance(ResourceFactory::class);
496 496
         $fileObject = $resourceFactory->getFileObjectFromCombinedIdentifier($filePath);
497 497
 
498
-        if ($fileObject !== null) {
498
+        if ($fileObject !== NULL) {
499 499
             $fileContents = $fileObject->getContents();
500
-            $records = json_decode($fileContents, true);
500
+            $records = json_decode($fileContents, TRUE);
501 501
 
502 502
             if (json_last_error() === JSON_ERROR_NONE) {
503 503
                 return $records;
Please login to merge, or discard this patch.
Classes/Controller/SearchController.php 3 patches
Braces   +1 added lines, -2 removed lines patch added patch discarded remove patch
@@ -33,8 +33,7 @@
 block discarded – undo
33 33
  *
34 34
  * @access public
35 35
  */
36
-class SearchController extends AbstractController
37
-{
36
+class SearchController extends AbstractController {
38 37
     /**
39 38
      * @access protected
40 39
      * @var CollectionRepository
Please login to merge, or discard this patch.
Spacing   +16 added lines, -16 removed lines patch added patch discarded remove patch
@@ -122,7 +122,7 @@  discard block
 block discarded – undo
122 122
         }
123 123
 
124 124
         if (isset($listRequestData['searchParameter']) && is_array($listRequestData['searchParameter'])) {
125
-            $this->searchParams = array_merge($this->searchParams ?: [], $listRequestData['searchParameter']);
125
+            $this->searchParams = array_merge($this->searchParams ? : [], $listRequestData['searchParameter']);
126 126
             $listViewSearch = true;
127 127
             $GLOBALS['TSFE']->fe_user->setKey('ses', 'search', $this->searchParams);
128 128
         }
@@ -183,7 +183,7 @@  discard block
 block discarded – undo
183 183
                 $simplePagination = new SimplePagination($solrPaginator);
184 184
 
185 185
                 $pagination = $this->buildSimplePagination($simplePagination, $solrPaginator);
186
-                $this->view->assignMultiple([ 'pagination' => $pagination, 'paginator' => $solrPaginator ]);
186
+                $this->view->assignMultiple(['pagination' => $pagination, 'paginator' => $solrPaginator]);
187 187
             }
188 188
 
189 189
             $this->view->assign('documents', !empty($solrResults) ? $solrResults : []);
@@ -208,7 +208,7 @@  discard block
 block discarded – undo
208 208
 
209 209
         // Add uHash parameter to suggest parameter to make a basic protection of this form.
210 210
         if ($this->settings['suggest']) {
211
-            $this->view->assign('uHash', GeneralUtility::hmac((string) (new Typo3Version()) . Environment::getExtensionsPath(), 'SearchSuggest'));
211
+            $this->view->assign('uHash', GeneralUtility::hmac((string) (new Typo3Version()).Environment::getExtensionsPath(), 'SearchSuggest'));
212 212
         }
213 213
 
214 214
         $this->view->assign('viewData', $this->viewData);
@@ -229,7 +229,7 @@  discard block
 block discarded – undo
229 229
         // Get facets from plugin configuration.
230 230
         $facets = [];
231 231
         foreach (GeneralUtility::trimExplode(',', $this->settings['facets'], true) as $facet) {
232
-            $facets[$facet . '_faceting'] = Helper::translate($facet, 'tx_dlf_metadata', $this->settings['storagePid']);
232
+            $facets[$facet.'_faceting'] = Helper::translate($facet, 'tx_dlf_metadata', $this->settings['storagePid']);
233 233
         }
234 234
 
235 235
         $this->view->assign('facetsMenu', $this->makeFacetsMenuArray($facets));
@@ -265,13 +265,13 @@  discard block
 block discarded – undo
265 265
         $searchParams = $this->searchParams;
266 266
         if (
267 267
             (!empty($searchParams['fulltext']))
268
-            || preg_match('/' . $fields['fulltext'] . ':\((.*)\)/', trim($searchParams['query']), $matches)
268
+            || preg_match('/'.$fields['fulltext'].':\((.*)\)/', trim($searchParams['query']), $matches)
269 269
         ) {
270 270
             // If the query already is a fulltext query e.g using the facets
271 271
             $searchParams['query'] = empty($matches[1]) ? $searchParams['query'] : $matches[1];
272 272
             // Search in fulltext field if applicable. Query must not be empty!
273 273
             if (!empty($searchParams['query'])) {
274
-                $search['query'] = $fields['fulltext'] . ':(' . Solr::escapeQuery(trim($searchParams['query'])) . ')';
274
+                $search['query'] = $fields['fulltext'].':('.Solr::escapeQuery(trim($searchParams['query'])).')';
275 275
             }
276 276
         } else {
277 277
             // Retain given search field if valid.
@@ -288,7 +288,7 @@  discard block
 block discarded – undo
288 288
         // add filter query for date search
289 289
         if (!empty($this->searchParams['dateFrom']) && !empty($this->searchParams['dateTo'])) {
290 290
             // combine dateFrom and dateTo into filterquery as range search
291
-            $search['params']['filterquery'][]['query'] = '{!join from=' . $fields['uid'] . ' to=' . $fields['uid'] . '}' . $fields['date'] . ':[' . $this->searchParams['dateFrom'] . ' TO ' . $this->searchParams['dateTo'] . ']';
291
+            $search['params']['filterquery'][]['query'] = '{!join from='.$fields['uid'].' to='.$fields['uid'].'}'.$fields['date'].':['.$this->searchParams['dateFrom'].' TO '.$this->searchParams['dateTo'].']';
292 292
         }
293 293
 
294 294
         // Add extended search query.
@@ -306,9 +306,9 @@  discard block
 block discarded – undo
306 306
                         in_array($searchParams['extOperator'][$i], $allowedOperators)
307 307
                     ) {
308 308
                         if (!empty($search['query'])) {
309
-                            $search['query'] .= ' ' . $searchParams['extOperator'][$i] . ' ';
309
+                            $search['query'] .= ' '.$searchParams['extOperator'][$i].' ';
310 310
                         }
311
-                        $search['query'] .= Indexer::getIndexFieldName($searchParams['extField'][$i], $this->settings['storagePid']) . ':(' . Solr::escapeQuery($searchParams['extQuery'][$i]) . ')';
311
+                        $search['query'] .= Indexer::getIndexFieldName($searchParams['extField'][$i], $this->settings['storagePid']).':('.Solr::escapeQuery($searchParams['extQuery'][$i]).')';
312 312
                     }
313 313
                 }
314 314
             }
@@ -397,24 +397,24 @@  discard block
 block discarded – undo
397 397
             foreach ($collections as $collectionEntry) {
398 398
                 // check for virtual collections query string
399 399
                 if ($collectionEntry->getIndexSearch()) {
400
-                    $virtualCollectionsQueryString .= empty($virtualCollectionsQueryString) ? '(' . $collectionEntry->getIndexSearch() . ')' : ' OR (' . $collectionEntry->getIndexSearch() . ')';
400
+                    $virtualCollectionsQueryString .= empty($virtualCollectionsQueryString) ? '('.$collectionEntry->getIndexSearch().')' : ' OR ('.$collectionEntry->getIndexSearch().')';
401 401
                 } else {
402
-                    $collectionsQueryString .= empty($collectionsQueryString) ? '"' . $collectionEntry->getIndexName() . '"' : ' OR "' . $collectionEntry->getIndexName() . '"';
402
+                    $collectionsQueryString .= empty($collectionsQueryString) ? '"'.$collectionEntry->getIndexName().'"' : ' OR "'.$collectionEntry->getIndexName().'"';
403 403
                 }
404 404
             }
405 405
 
406 406
             // distinguish between simple collection browsing and actual searching within the collection(s)
407 407
             if (!empty($collectionsQueryString)) {
408 408
                 if (empty($query)) {
409
-                    $collectionsQueryString = '(collection_faceting:(' . $collectionsQueryString . ') AND toplevel:true AND partof:0)';
409
+                    $collectionsQueryString = '(collection_faceting:('.$collectionsQueryString.') AND toplevel:true AND partof:0)';
410 410
                 } else {
411
-                    $collectionsQueryString = '(collection_faceting:(' . $collectionsQueryString . '))';
411
+                    $collectionsQueryString = '(collection_faceting:('.$collectionsQueryString.'))';
412 412
                 }
413 413
             }
414 414
 
415 415
             // virtual collections might query documents that are neither toplevel:true nor partof:0 and need to be searched separately
416 416
             if (!empty($virtualCollectionsQueryString)) {
417
-                $virtualCollectionsQueryString = '(' . $virtualCollectionsQueryString . ')';
417
+                $virtualCollectionsQueryString = '('.$virtualCollectionsQueryString.')';
418 418
             }
419 419
 
420 420
             // combine both querystrings into a single filterquery via OR if both are given, otherwise pass either of those
@@ -444,7 +444,7 @@  discard block
 block discarded – undo
444 444
         $entryArray['doNotLinkIt'] = 0;
445 445
         // Check if facet is already selected.
446 446
         $queryColumn = array_column($search['params']['filterquery'], 'query');
447
-        $index = array_search($field . ':("' . Solr::escapeQuery($value) . '")', $queryColumn);
447
+        $index = array_search($field.':("'.Solr::escapeQuery($value).'")', $queryColumn);
448 448
         if ($index !== false) {
449 449
             // Facet is selected, thus remove it from filter.
450 450
             unset($queryColumn[$index]);
@@ -458,7 +458,7 @@  discard block
 block discarded – undo
458 458
             }
459 459
         } else {
460 460
             // Facet is not selected, thus add it to filter.
461
-            $queryColumn[] = $field . ':("' . Solr::escapeQuery($value) . '")';
461
+            $queryColumn[] = $field.':("'.Solr::escapeQuery($value).'")';
462 462
             $entryArray['ITEM_STATE'] = 'NO';
463 463
         }
464 464
         $entryArray['queryColumn'] = $queryColumn;
Please login to merge, or discard this patch.
Upper-Lower-Casing   +13 added lines, -13 removed lines patch added patch discarded remove patch
@@ -90,7 +90,7 @@  discard block
 block discarded – undo
90 90
         $this->searchParams = $this->getParametersSafely('searchParameter');
91 91
 
92 92
         // output is done by main action
93
-        $this->forward('main', null, null, ['searchParameter' => $this->searchParams]);
93
+        $this->forward('main', NULL, NULL, ['searchParameter' => $this->searchParams]);
94 94
     }
95 95
 
96 96
     /**
@@ -104,7 +104,7 @@  discard block
 block discarded – undo
104 104
      */
105 105
     public function mainAction(): void
106 106
     {
107
-        $listViewSearch = false;
107
+        $listViewSearch = FALSE;
108 108
         // Quit without doing anything if required variables are not set.
109 109
         if (empty($this->settings['solrcore'])) {
110 110
             $this->logger->warning('Incomplete plugin configuration');
@@ -123,7 +123,7 @@  discard block
 block discarded – undo
123 123
 
124 124
         if (isset($listRequestData['searchParameter']) && is_array($listRequestData['searchParameter'])) {
125 125
             $this->searchParams = array_merge($this->searchParams ?: [], $listRequestData['searchParameter']);
126
-            $listViewSearch = true;
126
+            $listViewSearch = TRUE;
127 127
             $GLOBALS['TSFE']->fe_user->setKey('ses', 'search', $this->searchParams);
128 128
         }
129 129
 
@@ -155,7 +155,7 @@  discard block
 block discarded – undo
155 155
             $this->redirect(
156 156
                 'main',
157 157
                 'ListView',
158
-                null,
158
+                NULL,
159 159
                 [
160 160
                     'searchParameter' => $this->searchParams,
161 161
                     'page' => $currentPage
@@ -167,15 +167,15 @@  discard block
 block discarded – undo
167 167
         // An empty form will be shown.
168 168
         if (is_array($this->searchParams) && !empty($this->searchParams)) {
169 169
             // get all sortable metadata records
170
-            $sortableMetadata = $this->metadataRepository->findByIsSortable(true);
170
+            $sortableMetadata = $this->metadataRepository->findByIsSortable(TRUE);
171 171
 
172 172
             // get all metadata records to be shown in results
173
-            $listedMetadata = $this->metadataRepository->findByIsListed(true);
173
+            $listedMetadata = $this->metadataRepository->findByIsListed(TRUE);
174 174
 
175 175
             // get all indexed metadata fields
176
-            $indexedMetadata = $this->metadataRepository->findByIndexIndexed(true);
176
+            $indexedMetadata = $this->metadataRepository->findByIndexIndexed(TRUE);
177 177
 
178
-            $solrResults = null;
178
+            $solrResults = NULL;
179 179
             $numResults = 0;
180 180
             // Do not execute the Solr search if used together with ListView plugin.
181 181
             if (!$listViewSearch) {
@@ -235,7 +235,7 @@  discard block
 block discarded – undo
235 235
 
236 236
         // Get facets from plugin configuration.
237 237
         $facets = [];
238
-        foreach (GeneralUtility::trimExplode(',', $this->settings['facets'], true) as $facet) {
238
+        foreach (GeneralUtility::trimExplode(',', $this->settings['facets'], TRUE) as $facet) {
239 239
             $facets[$facet . '_faceting'] = Helper::translate($facet, 'tx_dlf_metadata', $this->settings['storagePid']);
240 240
         }
241 241
 
@@ -392,7 +392,7 @@  discard block
 block discarded – undo
392 392
     {
393 393
         // if collections are given, we prepare the collections query string
394 394
         // extract collections from collection parameter
395
-        $collections = null;
395
+        $collections = NULL;
396 396
         if (array_key_exists('collection', $this->searchParams)) {
397 397
             foreach (explode(',', $this->searchParams['collection']) as $collectionEntry) {
398 398
                 $collections[] = $this->collectionRepository->findByUid((int) $collectionEntry);
@@ -452,7 +452,7 @@  discard block
 block discarded – undo
452 452
         // Check if facet is already selected.
453 453
         $queryColumn = array_column($search['params']['filterquery'], 'query');
454 454
         $index = array_search($field . ':("' . Solr::escapeQuery($value) . '")', $queryColumn);
455
-        if ($index !== false) {
455
+        if ($index !== FALSE) {
456 456
             // Facet is selected, thus remove it from filter.
457 457
             unset($queryColumn[$index]);
458 458
             $queryColumn = array_values($queryColumn);
@@ -460,7 +460,7 @@  discard block
 block discarded – undo
460 460
             $state = 'ACTIFSUB';
461 461
             // Reset facets
462 462
             if ($this->settings['resetFacets']) {
463
-                $entryArray['resetFacet'] = true;
463
+                $entryArray['resetFacet'] = TRUE;
464 464
                 $entryArray['queryColumn'] = $queryColumn;
465 465
             }
466 466
         } else {
@@ -571,7 +571,7 @@  discard block
 block discarded – undo
571 571
         }
572 572
 
573 573
         // Get field selector options.
574
-        $searchFields = GeneralUtility::trimExplode(',', $this->settings['extendedFields'], true);
574
+        $searchFields = GeneralUtility::trimExplode(',', $this->settings['extendedFields'], TRUE);
575 575
 
576 576
         $slotCountArray = [];
577 577
         for ($i = 0; $i < $this->settings['extendedSlotCount']; $i++) {
Please login to merge, or discard this patch.
Classes/Format/AudioVideoMD.php 3 patches
Spacing   +1 added lines, -1 removed lines patch added patch discarded remove patch
@@ -53,7 +53,7 @@
 block discarded – undo
53 53
             $metadata['video_duration'] = [$videoDuration];
54 54
         }
55 55
 
56
-        $metadata['duration'] = $metadata['video_duration'] ?: $metadata['audio_duration'] ?: [];
56
+        $metadata['duration'] = $metadata['video_duration'] ? : $metadata['audio_duration'] ? : [];
57 57
 
58 58
         if ($useExternalApis) {
59 59
             // TODO?
Please login to merge, or discard this patch.
Braces   +1 added lines, -2 removed lines patch added patch discarded remove patch
@@ -25,8 +25,7 @@
 block discarded – undo
25 25
  *
26 26
  * @access public
27 27
  */
28
-class AudioVideoMD implements MetadataInterface
29
-{
28
+class AudioVideoMD implements MetadataInterface {
30 29
     /**
31 30
      * Extract some essential AudioMD/VideoMD metadata.
32 31
      *
Please login to merge, or discard this patch.
Upper-Lower-Casing   +1 added lines, -1 removed lines patch added patch discarded remove patch
@@ -38,7 +38,7 @@
 block discarded – undo
38 38
      *
39 39
      * @return void
40 40
      */
41
-    public function extractMetadata(\SimpleXMLElement $xml, array &$metadata, bool $useExternalApis = false): void
41
+    public function extractMetadata(\SimpleXMLElement $xml, array &$metadata, bool $useExternalApis = FALSE): void
42 42
     {
43 43
         $xml->registerXPathNamespace('audiomd', 'http://www.loc.gov/audioMD/');
44 44
         $xml->registerXPathNamespace('videomd', 'http://www.loc.gov/videoMD/');
Please login to merge, or discard this patch.
Classes/Format/Alto.php 3 patches
Spacing   +2 added lines, -2 removed lines patch added patch discarded remove patch
@@ -123,7 +123,7 @@  discard block
 block discarded – undo
123 123
             }
124 124
             return ' ';
125 125
         }
126
-        return htmlspecialchars((string) $attributes['CONTENT']) . ' ';
126
+        return htmlspecialchars((string) $attributes['CONTENT']).' ';
127 127
     }
128 128
 
129 129
     /**
@@ -137,7 +137,7 @@  discard block
 block discarded – undo
137 137
      */
138 138
     private function getCoordinates(\SimpleXMLElement $attributes): string
139 139
     {
140
-        return (string) $attributes['HPOS'] . ' ' . (string) $attributes['VPOS'] . ' ' . (string) $attributes['WIDTH'] . ' ' . (string) $attributes['HEIGHT'];
140
+        return (string) $attributes['HPOS'].' '.(string) $attributes['VPOS'].' '.(string) $attributes['WIDTH'].' '.(string) $attributes['HEIGHT'];
141 141
     }
142 142
 
143 143
     /**
Please login to merge, or discard this patch.
Braces   +1 added lines, -2 removed lines patch added patch discarded remove patch
@@ -147,8 +147,7 @@
 block discarded – undo
147 147
      *
148 148
      * @param \SimpleXMLElement &$xml: The XML to register the namespace for
149 149
      */
150
-    private function registerAltoNamespace(\SimpleXMLElement &$xml)
151
-    {
150
+    private function registerAltoNamespace(\SimpleXMLElement &$xml) {
152 151
         $namespace = $xml->getDocNamespaces();
153 152
 
154 153
         if (in_array('http://www.loc.gov/standards/alto/ns-v2#', $namespace, true)) {
Please login to merge, or discard this patch.
Upper-Lower-Casing   +3 added lines, -3 removed lines patch added patch discarded remove patch
@@ -151,11 +151,11 @@
 block discarded – undo
151 151
     {
152 152
         $namespace = $xml->getDocNamespaces();
153 153
 
154
-        if (in_array('http://www.loc.gov/standards/alto/ns-v2#', $namespace, true)) {
154
+        if (in_array('http://www.loc.gov/standards/alto/ns-v2#', $namespace, TRUE)) {
155 155
             $xml->registerXPathNamespace('alto', 'http://www.loc.gov/standards/alto/ns-v2#');
156
-        } elseif (in_array('http://www.loc.gov/standards/alto/ns-v3#', $namespace, true)) {
156
+        } elseif (in_array('http://www.loc.gov/standards/alto/ns-v3#', $namespace, TRUE)) {
157 157
             $xml->registerXPathNamespace('alto', 'http://www.loc.gov/standards/alto/ns-v3#');
158
-        } elseif (in_array('http://www.loc.gov/standards/alto/ns-v4#', $namespace, true)) {
158
+        } elseif (in_array('http://www.loc.gov/standards/alto/ns-v4#', $namespace, TRUE)) {
159 159
             $xml->registerXPathNamespace('alto', 'http://www.loc.gov/standards/alto/ns-v4#');
160 160
         }
161 161
     }
Please login to merge, or discard this patch.