Passed
Pull Request — master (#103)
by Alexander
03:32
created
Classes/Common/SolrSearchResult/ResultDocument.php 2 patches
Braces   +19 added lines, -38 removed lines patch added patch discarded remove patch
@@ -24,8 +24,7 @@  discard block
 block discarded – undo
24 24
  * @subpackage dlf
25 25
  * @access public
26 26
  */
27
-class ResultDocument
28
-{
27
+class ResultDocument {
29 28
 
30 29
     /**
31 30
      * The identifier
@@ -134,8 +133,7 @@  discard block
 block discarded – undo
134 133
      *
135 134
      * @return void
136 135
      */
137
-    public function __construct($record, $highlighting, $fields)
138
-    {
136
+    public function __construct($record, $highlighting, $fields) {
139 137
         $this->id = $record[$fields['id']];
140 138
         $this->uid = $record[$fields['uid']];
141 139
         $this->page = $record[$fields['page']];
@@ -160,8 +158,7 @@  discard block
 block discarded – undo
160 158
      *
161 159
      * @return string The result's record identifier
162 160
      */
163
-    public function getId()
164
-    {
161
+    public function getId() {
165 162
         return $this->id;
166 163
     }
167 164
 
@@ -172,8 +169,7 @@  discard block
 block discarded – undo
172 169
      *
173 170
      * @return string|null The result's record unified identifier
174 171
      */
175
-    public function getUid()
176
-    {
172
+    public function getUid() {
177 173
         return $this->uid;
178 174
     }
179 175
 
@@ -184,8 +180,7 @@  discard block
 block discarded – undo
184 180
      *
185 181
      * @return int The result's record page
186 182
      */
187
-    public function getPage()
188
-    {
183
+    public function getPage() {
189 184
         return $this->page;
190 185
     }
191 186
 
@@ -196,8 +191,7 @@  discard block
 block discarded – undo
196 191
      *
197 192
      * @return string All result's record snippets imploded to one string
198 193
      */
199
-    public function getSnippets()
200
-    {
194
+    public function getSnippets() {
201 195
         return $this->snippets;
202 196
     }
203 197
 
@@ -208,8 +202,7 @@  discard block
 block discarded – undo
208 202
      *
209 203
      * @return string
210 204
      */
211
-    public function getThumbnail()
212
-    {
205
+    public function getThumbnail() {
213 206
         return $this->thumbnail;
214 207
     }
215 208
 
@@ -220,8 +213,7 @@  discard block
 block discarded – undo
220 213
      *
221 214
      * @return string
222 215
      */
223
-    public function getTitle()
224
-    {
216
+    public function getTitle() {
225 217
         return $this->title;
226 218
     }
227 219
 
@@ -232,8 +224,7 @@  discard block
 block discarded – undo
232 224
      *
233 225
      * @return boolean
234 226
      */
235
-    public function getToplevel()
236
-    {
227
+    public function getToplevel() {
237 228
         return $this->toplevel;
238 229
     }
239 230
 
@@ -244,8 +235,7 @@  discard block
 block discarded – undo
244 235
      *
245 236
      * @return string
246 237
      */
247
-    public function getType()
248
-    {
238
+    public function getType() {
249 239
         return $this->type;
250 240
     }
251 241
 
@@ -256,8 +246,7 @@  discard block
 block discarded – undo
256 246
      *
257 247
      * @return array(Page) All result's pages which contain search phrase
258 248
      */
259
-    public function getPages()
260
-    {
249
+    public function getPages() {
261 250
         return $this->pages;
262 251
     }
263 252
 
@@ -268,8 +257,7 @@  discard block
 block discarded – undo
268 257
      *
269 258
      * @return array(Region) All result's regions which contain search phrase
270 259
      */
271
-    public function getRegions()
272
-    {
260
+    public function getRegions() {
273 261
         return $this->regions;
274 262
     }
275 263
 
@@ -280,8 +268,7 @@  discard block
 block discarded – undo
280 268
      *
281 269
      * @return array(Highlight) All result's highlights of search phrase
282 270
      */
283
-    public function getHighlights()
284
-    {
271
+    public function getHighlights() {
285 272
         return $this->highlights;
286 273
     }
287 274
 
@@ -292,8 +279,7 @@  discard block
 block discarded – undo
292 279
      *
293 280
      * @return array(string) All result's highlights of search phrase
294 281
      */
295
-    public function getHighlightsIds()
296
-    {
282
+    public function getHighlightsIds() {
297 283
         $highlightsIds = [];
298 284
         foreach ($this->highlights as $highlight) {
299 285
             array_push($highlightsIds, $highlight->getId());
@@ -309,8 +295,7 @@  discard block
 block discarded – undo
309 295
      *
310 296
      * @return void
311 297
      */
312
-    private function parseSnippets()
313
-    {
298
+    private function parseSnippets() {
314 299
         $snippetArray = $this->getArrayByIndex('text');
315 300
 
316 301
         $this->snippets = !empty($snippetArray) ? implode(' [...] ', $snippetArray) : '';
@@ -324,8 +309,7 @@  discard block
 block discarded – undo
324 309
      *
325 310
      * @return void
326 311
      */
327
-    private function parsePages()
328
-    {
312
+    private function parsePages() {
329 313
         $pageArray = $this->getArrayByIndex('pages');
330 314
 
331 315
         $i = 0;
@@ -345,8 +329,7 @@  discard block
 block discarded – undo
345 329
      *
346 330
      * @return void
347 331
      */
348
-    private function parseRegions()
349
-    {
332
+    private function parseRegions() {
350 333
         $regionArray = $this->getArrayByIndex('regions');
351 334
 
352 335
         $i = 0;
@@ -366,8 +349,7 @@  discard block
 block discarded – undo
366 349
      *
367 350
      * @return void
368 351
      */
369
-    private function parseHighlights()
370
-    {
352
+    private function parseHighlights() {
371 353
         $highlightArray = $this->getArrayByIndex('highlights');
372 354
 
373 355
         foreach ($highlightArray as $highlights) {
@@ -388,8 +370,7 @@  discard block
 block discarded – undo
388 370
      *
389 371
      * @return array
390 372
      */
391
-    private function getArrayByIndex($index)
392
-    {
373
+    private function getArrayByIndex($index) {
393 374
         $objectArray = [];
394 375
         foreach ($this->snippetsForRecord as $snippet) {
395 376
             if (!empty($snippet[$index])) {
Please login to merge, or discard this patch.
Upper-Lower-Casing   +1 added lines, -1 removed lines patch added patch discarded remove patch
@@ -81,7 +81,7 @@
 block discarded – undo
81 81
      * @var boolean
82 82
      * @access private
83 83
      */
84
-    private $toplevel = false;
84
+    private $toplevel = FALSE;
85 85
 
86 86
     /**
87 87
      * The structure type
Please login to merge, or discard this patch.
Classes/Common/Indexer.php 3 patches
Spacing   +15 added lines, -15 removed lines patch added patch discarded remove patch
@@ -115,7 +115,7 @@  discard block
 block discarded – undo
115 115
                         $parent->setDoc($doc);
116 116
                         $success = self::add($parent);
117 117
                     } else {
118
-                        Helper::log('Could not load parent document with UID ' . $document->getDoc()->parentId, LOG_SEVERITY_ERROR);
118
+                        Helper::log('Could not load parent document with UID '.$document->getDoc()->parentId, LOG_SEVERITY_ERROR);
119 119
                         return false;
120 120
                     }
121 121
                 }
@@ -125,7 +125,7 @@  discard block
 block discarded – undo
125 125
                 self::$processedDocs[] = $document->getUid();
126 126
                 // Delete old Solr documents.
127 127
                 $updateQuery = self::$solr->service->createUpdate();
128
-                $updateQuery->addDeleteQuery('uid:' . $document->getUid());
128
+                $updateQuery->addDeleteQuery('uid:'.$document->getUid());
129 129
                 self::$solr->service->update($updateQuery);
130 130
 
131 131
                 // Index every logical unit as separate Solr document.
@@ -174,14 +174,14 @@  discard block
 block discarded – undo
174 174
             } catch (\Exception $e) {
175 175
                 if (!(\TYPO3_REQUESTTYPE & \TYPO3_REQUESTTYPE_CLI)) {
176 176
                     Helper::addMessage(
177
-                        Helper::getLanguageService()->getLL('flash.solrException') . ' ' . htmlspecialchars($e->getMessage()),
177
+                        Helper::getLanguageService()->getLL('flash.solrException').' '.htmlspecialchars($e->getMessage()),
178 178
                         Helper::getLanguageService()->getLL('flash.error'),
179 179
                         FlashMessage::ERROR,
180 180
                         true,
181 181
                         'core.template.flashMessages'
182 182
                     );
183 183
                 }
184
-                Helper::log('Apache Solr threw exception: "' . $e->getMessage() . '"', LOG_SEVERITY_ERROR);
184
+                Helper::log('Apache Solr threw exception: "'.$e->getMessage().'"', LOG_SEVERITY_ERROR);
185 185
                 return false;
186 186
             }
187 187
         } else {
@@ -214,7 +214,7 @@  discard block
 block discarded – undo
214 214
         // Sanitize input.
215 215
         $pid = max(intval($pid), 0);
216 216
         if (!$pid) {
217
-            Helper::log('Invalid PID ' . $pid . ' for metadata configuration', LOG_SEVERITY_ERROR);
217
+            Helper::log('Invalid PID '.$pid.' for metadata configuration', LOG_SEVERITY_ERROR);
218 218
             return '';
219 219
         }
220 220
         // Load metadata configuration.
@@ -223,7 +223,7 @@  discard block
 block discarded – undo
223 223
         $suffix = (in_array($index_name, self::$fields['tokenized']) ? 't' : 'u');
224 224
         $suffix .= (in_array($index_name, self::$fields['stored']) ? 's' : 'u');
225 225
         $suffix .= (in_array($index_name, self::$fields['indexed']) ? 'i' : 'u');
226
-        $index_name .= '_' . $suffix;
226
+        $index_name .= '_'.$suffix;
227 227
         return $index_name;
228 228
     }
229 229
 
@@ -330,7 +330,7 @@  discard block
 block discarded – undo
330 330
             $updateQuery = self::$solr->service->createUpdate();
331 331
             $solrDoc = $updateQuery->createDocument();
332 332
             // Create unique identifier from document's UID and unit's XML ID.
333
-            $solrDoc->setField('id', $document->getUid() . $logicalUnit['id']);
333
+            $solrDoc->setField('id', $document->getUid().$logicalUnit['id']);
334 334
             $solrDoc->setField('uid', $document->getUid());
335 335
             $solrDoc->setField('pid', $document->getPid());
336 336
             if (MathUtility::canBeInterpretedAsInteger($logicalUnit['points'])) {
@@ -371,11 +371,11 @@  discard block
 block discarded – undo
371 371
                     $solrDoc->setField(self::getIndexFieldName($index_name, $document->getPid()), $data, self::$fields['fieldboost'][$index_name]);
372 372
                     if (in_array($index_name, self::$fields['sortables'])) {
373 373
                         // Add sortable fields to index.
374
-                        $solrDoc->setField($index_name . '_sorting', $metadata[$index_name . '_sorting'][0]);
374
+                        $solrDoc->setField($index_name.'_sorting', $metadata[$index_name.'_sorting'][0]);
375 375
                     }
376 376
                     if (in_array($index_name, self::$fields['facets'])) {
377 377
                         // Add facets to index.
378
-                        $solrDoc->setField($index_name . '_faceting', $data);
378
+                        $solrDoc->setField($index_name.'_faceting', $data);
379 379
                     }
380 380
                     if (in_array($index_name, self::$fields['autocomplete'])) {
381 381
                         $autocomplete = array_merge($autocomplete, $data);
@@ -400,14 +400,14 @@  discard block
 block discarded – undo
400 400
             } catch (\Exception $e) {
401 401
                 if (!(\TYPO3_REQUESTTYPE & \TYPO3_REQUESTTYPE_CLI)) {
402 402
                     Helper::addMessage(
403
-                        Helper::getLanguageService()->getLL('flash.solrException') . '<br />' . htmlspecialchars($e->getMessage()),
403
+                        Helper::getLanguageService()->getLL('flash.solrException').'<br />'.htmlspecialchars($e->getMessage()),
404 404
                         Helper::getLanguageService()->getLL('flash.error'),
405 405
                         FlashMessage::ERROR,
406 406
                         true,
407 407
                         'core.template.flashMessages'
408 408
                     );
409 409
                 }
410
-                Helper::log('Apache Solr threw exception: "' . $e->getMessage() . '"', LOG_SEVERITY_ERROR);
410
+                Helper::log('Apache Solr threw exception: "'.$e->getMessage().'"', LOG_SEVERITY_ERROR);
411 411
                 return false;
412 412
             }
413 413
         }
@@ -447,7 +447,7 @@  discard block
 block discarded – undo
447 447
             $updateQuery = self::$solr->service->createUpdate();
448 448
             $solrDoc = $updateQuery->createDocument();
449 449
             // Create unique identifier from document's UID and unit's XML ID.
450
-            $solrDoc->setField('id', $document->getUid() . $physicalUnit['id']);
450
+            $solrDoc->setField('id', $document->getUid().$physicalUnit['id']);
451 451
             $solrDoc->setField('uid', $document->getUid());
452 452
             $solrDoc->setField('pid', $document->getPid());
453 453
             $solrDoc->setField('page', $page);
@@ -483,7 +483,7 @@  discard block
 block discarded – undo
483 483
                                 }
484 484
                             }
485 485
                             // Add facets to index.
486
-                            $solrDoc->setField($index_name . '_faceting', $data);
486
+                            $solrDoc->setField($index_name.'_faceting', $data);
487 487
                         }
488 488
                     }
489 489
                 }
@@ -501,14 +501,14 @@  discard block
 block discarded – undo
501 501
             } catch (\Exception $e) {
502 502
                 if (!(\TYPO3_REQUESTTYPE & \TYPO3_REQUESTTYPE_CLI)) {
503 503
                     Helper::addMessage(
504
-                        Helper::getLanguageService()->getLL('flash.solrException') . '<br />' . htmlspecialchars($e->getMessage()),
504
+                        Helper::getLanguageService()->getLL('flash.solrException').'<br />'.htmlspecialchars($e->getMessage()),
505 505
                         Helper::getLanguageService()->getLL('flash.error'),
506 506
                         FlashMessage::ERROR,
507 507
                         true,
508 508
                         'core.template.flashMessages'
509 509
                     );
510 510
                 }
511
-                Helper::log('Apache Solr threw exception: "' . $e->getMessage() . '"', LOG_SEVERITY_ERROR);
511
+                Helper::log('Apache Solr threw exception: "'.$e->getMessage().'"', LOG_SEVERITY_ERROR);
512 512
                 return false;
513 513
             }
514 514
         }
Please login to merge, or discard this patch.
Braces   +8 added lines, -16 removed lines patch added patch discarded remove patch
@@ -32,8 +32,7 @@  discard block
 block discarded – undo
32 32
  * @subpackage dlf
33 33
  * @access public
34 34
  */
35
-class Indexer
36
-{
35
+class Indexer {
37 36
     /**
38 37
      * The extension key
39 38
      *
@@ -93,8 +92,7 @@  discard block
 block discarded – undo
93 92
      *
94 93
      * @return bool true on success or false on failure
95 94
      */
96
-    public static function add(Document $document)
97
-    {
95
+    public static function add(Document $document) {
98 96
         if (in_array($document->getUid(), self::$processedDocs)) {
99 97
             return true;
100 98
         } elseif (self::solrConnect($document->getSolrcore(), $document->getPid())) {
@@ -209,8 +207,7 @@  discard block
 block discarded – undo
209 207
      *
210 208
      * @return string The field's dynamic index name
211 209
      */
212
-    public static function getIndexFieldName($index_name, $pid = 0)
213
-    {
210
+    public static function getIndexFieldName($index_name, $pid = 0) {
214 211
         // Sanitize input.
215 212
         $pid = max(intval($pid), 0);
216 213
         if (!$pid) {
@@ -236,8 +233,7 @@  discard block
 block discarded – undo
236 233
      *
237 234
      * @return void
238 235
      */
239
-    protected static function loadIndexConf($pid)
240
-    {
236
+    protected static function loadIndexConf($pid) {
241 237
         if (!self::$fieldsLoaded) {
242 238
             $queryBuilder = GeneralUtility::makeInstance(ConnectionPool::class)
243 239
                 ->getQueryBuilderForTable('tx_dlf_metadata');
@@ -307,8 +303,7 @@  discard block
 block discarded – undo
307 303
      *
308 304
      * @return bool true on success or false on failure
309 305
      */
310
-    protected static function processLogical(Document $document, array $logicalUnit)
311
-    {
306
+    protected static function processLogical(Document $document, array $logicalUnit) {
312 307
         $success = true;
313 308
         $doc = $document->getDoc();
314 309
         $doc->cPid = $document->getPid();
@@ -436,8 +431,7 @@  discard block
 block discarded – undo
436 431
      *
437 432
      * @return bool true on success or false on failure
438 433
      */
439
-    protected static function processPhysical(Document $document, $page, array $physicalUnit)
440
-    {
434
+    protected static function processPhysical(Document $document, $page, array $physicalUnit) {
441 435
         $doc = $document->getDoc();
442 436
         $doc->cPid = $document->getPid();
443 437
         if ($doc->hasFulltext && $fullText = $doc->getFullText($physicalUnit['id'])) {
@@ -525,8 +519,7 @@  discard block
 block discarded – undo
525 519
      *
526 520
      * @return bool true on success or false on failure
527 521
      */
528
-    protected static function solrConnect($core, $pid = 0)
529
-    {
522
+    protected static function solrConnect($core, $pid = 0) {
530 523
         // Get Solr instance.
531 524
         if (!self::$solr) {
532 525
             // Connect to Solr server.
@@ -549,8 +542,7 @@  discard block
 block discarded – undo
549 542
      *
550 543
      * @access private
551 544
      */
552
-    private function __construct()
553
-    {
545
+    private function __construct() {
554 546
         // This is a static class, thus no instances should be created.
555 547
     }
556 548
 }
Please login to merge, or discard this patch.
Upper-Lower-Casing   +24 added lines, -24 removed lines patch added patch discarded remove patch
@@ -66,7 +66,7 @@  discard block
 block discarded – undo
66 66
      * @var bool
67 67
      * @access protected
68 68
      */
69
-    protected static $fieldsLoaded = false;
69
+    protected static $fieldsLoaded = FALSE;
70 70
 
71 71
     /**
72 72
      * List of already processed documents
@@ -96,9 +96,9 @@  discard block
 block discarded – undo
96 96
     public static function add(Document $document)
97 97
     {
98 98
         if (in_array($document->getUid(), self::$processedDocs)) {
99
-            return true;
99
+            return TRUE;
100 100
         } elseif (self::solrConnect($document->getSolrcore(), $document->getPid())) {
101
-            $success = true;
101
+            $success = TRUE;
102 102
             Helper::getLanguageService()->includeLLFile('EXT:dlf/Resources/Private/Language/locallang_be.xlf');
103 103
             // Handle multi-volume documents.
104 104
             if ($parentId = $document->getPartof()) {
@@ -110,13 +110,13 @@  discard block
 block discarded – undo
110 110
                 $parent = $documentRepository->findByUid($parentId);
111 111
                 if ($parent) {
112 112
                     // get XML document of parent
113
-                    $doc = Doc::getInstance($parent->getLocation(), ['storagePid' => $parent->getPid()], true);
114
-                    if ($doc !== null) {
113
+                    $doc = Doc::getInstance($parent->getLocation(), ['storagePid' => $parent->getPid()], TRUE);
114
+                    if ($doc !== NULL) {
115 115
                         $parent->setDoc($doc);
116 116
                         $success = self::add($parent);
117 117
                     } else {
118 118
                         Helper::log('Could not load parent document with UID ' . $document->getDoc()->parentId, LOG_SEVERITY_ERROR);
119
-                        return false;
119
+                        return FALSE;
120 120
                     }
121 121
                 }
122 122
             }
@@ -157,7 +157,7 @@  discard block
 block discarded – undo
157 157
                             sprintf(Helper::getLanguageService()->getLL('flash.documentIndexed'), $document->getTitle(), $document->getUid()),
158 158
                             Helper::getLanguageService()->getLL('flash.done'),
159 159
                             FlashMessage::OK,
160
-                            true,
160
+                            TRUE,
161 161
                             'core.template.flashMessages'
162 162
                         );
163 163
                     } else {
@@ -165,7 +165,7 @@  discard block
 block discarded – undo
165 165
                             sprintf(Helper::getLanguageService()->getLL('flash.documentNotIndexed'), $document->getTitle(), $document->getUid()),
166 166
                             Helper::getLanguageService()->getLL('flash.error'),
167 167
                             FlashMessage::ERROR,
168
-                            true,
168
+                            TRUE,
169 169
                             'core.template.flashMessages'
170 170
                         );
171 171
                     }
@@ -177,12 +177,12 @@  discard block
 block discarded – undo
177 177
                         Helper::getLanguageService()->getLL('flash.solrException') . ' ' . htmlspecialchars($e->getMessage()),
178 178
                         Helper::getLanguageService()->getLL('flash.error'),
179 179
                         FlashMessage::ERROR,
180
-                        true,
180
+                        TRUE,
181 181
                         'core.template.flashMessages'
182 182
                     );
183 183
                 }
184 184
                 Helper::log('Apache Solr threw exception: "' . $e->getMessage() . '"', LOG_SEVERITY_ERROR);
185
-                return false;
185
+                return FALSE;
186 186
             }
187 187
         } else {
188 188
             if (!(\TYPO3_REQUESTTYPE & \TYPO3_REQUESTTYPE_CLI)) {
@@ -190,12 +190,12 @@  discard block
 block discarded – undo
190 190
                     Helper::getLanguageService()->getLL('flash.solrNoConnection'),
191 191
                     Helper::getLanguageService()->getLL('flash.warning'),
192 192
                     FlashMessage::WARNING,
193
-                    true,
193
+                    TRUE,
194 194
                     'core.template.flashMessages'
195 195
                 );
196 196
             }
197 197
             Helper::log('Could not connect to Apache Solr server', LOG_SEVERITY_ERROR);
198
-            return false;
198
+            return FALSE;
199 199
         }
200 200
     }
201 201
 
@@ -290,10 +290,10 @@  discard block
 block discarded – undo
290 290
                 if ($indexing['index_boost'] > 0.0) {
291 291
                     self::$fields['fieldboost'][$indexing['index_name']] = floatval($indexing['index_boost']);
292 292
                 } else {
293
-                    self::$fields['fieldboost'][$indexing['index_name']] = false;
293
+                    self::$fields['fieldboost'][$indexing['index_name']] = FALSE;
294 294
                 }
295 295
             }
296
-            self::$fieldsLoaded = true;
296
+            self::$fieldsLoaded = TRUE;
297 297
         }
298 298
     }
299 299
 
@@ -309,7 +309,7 @@  discard block
 block discarded – undo
309 309
      */
310 310
     protected static function processLogical(Document $document, array $logicalUnit)
311 311
     {
312
-        $success = true;
312
+        $success = TRUE;
313 313
         $doc = $document->getDoc();
314 314
         $doc->cPid = $document->getPid();
315 315
         // Get metadata for logical unit.
@@ -345,7 +345,7 @@  discard block
 block discarded – undo
345 345
             $solrDoc->setField('root', $doc->rootId);
346 346
             $solrDoc->setField('sid', $logicalUnit['id']);
347 347
             // There can be only one toplevel unit per UID, independently of backend configuration
348
-            $solrDoc->setField('toplevel', $logicalUnit['id'] == $doc->toplevelId ? true : false);
348
+            $solrDoc->setField('toplevel', $logicalUnit['id'] == $doc->toplevelId ? TRUE : FALSE);
349 349
             $solrDoc->setField('type', $logicalUnit['type'], self::$fields['fieldboost']['type']);
350 350
             $solrDoc->setField('title', $metadata['title'][0], self::$fields['fieldboost']['title']);
351 351
             $solrDoc->setField('volume', $metadata['volume'][0], self::$fields['fieldboost']['volume']);
@@ -403,12 +403,12 @@  discard block
 block discarded – undo
403 403
                         Helper::getLanguageService()->getLL('flash.solrException') . '<br />' . htmlspecialchars($e->getMessage()),
404 404
                         Helper::getLanguageService()->getLL('flash.error'),
405 405
                         FlashMessage::ERROR,
406
-                        true,
406
+                        TRUE,
407 407
                         'core.template.flashMessages'
408 408
                     );
409 409
                 }
410 410
                 Helper::log('Apache Solr threw exception: "' . $e->getMessage() . '"', LOG_SEVERITY_ERROR);
411
-                return false;
411
+                return FALSE;
412 412
             }
413 413
         }
414 414
         // Check for child elements...
@@ -461,7 +461,7 @@  discard block
 block discarded – undo
461 461
             $solrDoc->setField('partof', $document->getPartof());
462 462
             $solrDoc->setField('root', $doc->rootId);
463 463
             $solrDoc->setField('sid', $physicalUnit['id']);
464
-            $solrDoc->setField('toplevel', false);
464
+            $solrDoc->setField('toplevel', FALSE);
465 465
             $solrDoc->setField('type', $physicalUnit['type'], self::$fields['fieldboost']['type']);
466 466
             $solrDoc->setField('collection', $doc->metadataArray[$doc->toplevelId]['collection']);
467 467
 
@@ -504,15 +504,15 @@  discard block
 block discarded – undo
504 504
                         Helper::getLanguageService()->getLL('flash.solrException') . '<br />' . htmlspecialchars($e->getMessage()),
505 505
                         Helper::getLanguageService()->getLL('flash.error'),
506 506
                         FlashMessage::ERROR,
507
-                        true,
507
+                        TRUE,
508 508
                         'core.template.flashMessages'
509 509
                     );
510 510
                 }
511 511
                 Helper::log('Apache Solr threw exception: "' . $e->getMessage() . '"', LOG_SEVERITY_ERROR);
512
-                return false;
512
+                return FALSE;
513 513
             }
514 514
         }
515
-        return true;
515
+        return TRUE;
516 516
     }
517 517
 
518 518
     /**
@@ -538,10 +538,10 @@  discard block
 block discarded – undo
538 538
                     self::loadIndexConf($pid);
539 539
                 }
540 540
             } else {
541
-                return false;
541
+                return FALSE;
542 542
             }
543 543
         }
544
-        return true;
544
+        return TRUE;
545 545
     }
546 546
 
547 547
     /**
Please login to merge, or discard this patch.
Classes/Common/Doc.php 3 patches
Spacing   +12 added lines, -12 removed lines patch added patch discarded remove patch
@@ -569,14 +569,14 @@  discard block
 block discarded – undo
569 569
                     if ($fileContent !== false) {
570 570
                         $textFormat = $this->getTextFormat($fileContent);
571 571
                     } else {
572
-                        $this->logger->warning('Couldn\'t load full text file for structure node @ID "' . $id . '"');
572
+                        $this->logger->warning('Couldn\'t load full text file for structure node @ID "'.$id.'"');
573 573
                         return $fullText;
574 574
                     }
575 575
                     break;
576 576
                 }
577 577
             }
578 578
         } else {
579
-            $this->logger->warning('Invalid structure node @ID "' . $id . '"');
579
+            $this->logger->warning('Invalid structure node @ID "'.$id.'"');
580 580
             return $fullText;
581 581
         }
582 582
         // Is this text format supported?
@@ -595,12 +595,12 @@  discard block
 block discarded – undo
595 595
                     $textMiniOcr = $obj->getTextAsMiniOcr($ocrTextXml);
596 596
                     $this->rawTextArray[$id] = $textMiniOcr;
597 597
                 } else {
598
-                    $this->logger->warning('Invalid class/method "' . $class . '->getRawText()" for text format "' . $textFormat . '"');
598
+                    $this->logger->warning('Invalid class/method "'.$class.'->getRawText()" for text format "'.$textFormat.'"');
599 599
                 }
600 600
             }
601 601
             $fullText = $textMiniOcr;
602 602
         } else {
603
-            $this->logger->warning('Unsupported text format "' . $textFormat . '" in physical node with @ID "' . $id . '"');
603
+            $this->logger->warning('Unsupported text format "'.$textFormat.'" in physical node with @ID "'.$id.'"');
604 604
         }
605 605
         return $fullText;
606 606
     }
@@ -674,10 +674,10 @@  discard block
 block discarded – undo
674 674
                     $title = self::getTitle($partof, true);
675 675
                 }
676 676
             } else {
677
-                Helper::log('No document with UID ' . $uid . ' found or document not accessible', LOG_SEVERITY_WARNING);
677
+                Helper::log('No document with UID '.$uid.' found or document not accessible', LOG_SEVERITY_WARNING);
678 678
             }
679 679
         } else {
680
-            Helper::log('Invalid UID ' . $uid . ' for document', LOG_SEVERITY_ERROR);
680
+            Helper::log('Invalid UID '.$uid.' for document', LOG_SEVERITY_ERROR);
681 681
         }
682 682
         return $title;
683 683
     }
@@ -808,7 +808,7 @@  discard block
 block discarded – undo
808 808
             // the actual loading is format specific
809 809
             return $this->loadLocation($location);
810 810
         } else {
811
-            $this->logger->error('Invalid file location "' . $location . '" for document loading');
811
+            $this->logger->error('Invalid file location "'.$location.'" for document loading');
812 812
         }
813 813
         return false;
814 814
     }
@@ -949,7 +949,7 @@  discard block
 block discarded – undo
949 949
         // Set metadata definitions' PID.
950 950
         $cPid = ($this->cPid ? $this->cPid : $this->pid);
951 951
         if (!$cPid) {
952
-            $this->logger->error('Invalid PID ' . $cPid . ' for metadata definitions');
952
+            $this->logger->error('Invalid PID '.$cPid.' for metadata definitions');
953 953
             return [];
954 954
         }
955 955
         if (
@@ -1184,12 +1184,12 @@  discard block
 block discarded – undo
1184 1184
      */
1185 1185
     public function __get($var)
1186 1186
     {
1187
-        $method = '_get' . ucfirst($var);
1187
+        $method = '_get'.ucfirst($var);
1188 1188
         if (
1189 1189
             !property_exists($this, $var)
1190 1190
             || !method_exists($this, $method)
1191 1191
         ) {
1192
-            $this->logger->warning('There is no getter function for property "' . $var . '"');
1192
+            $this->logger->warning('There is no getter function for property "'.$var.'"');
1193 1193
             return;
1194 1194
         } else {
1195 1195
             return $this->$method();
@@ -1222,12 +1222,12 @@  discard block
 block discarded – undo
1222 1222
      */
1223 1223
     public function __set($var, $value)
1224 1224
     {
1225
-        $method = '_set' . ucfirst($var);
1225
+        $method = '_set'.ucfirst($var);
1226 1226
         if (
1227 1227
             !property_exists($this, $var)
1228 1228
             || !method_exists($this, $method)
1229 1229
         ) {
1230
-            $this->logger->warning('There is no setter function for property "' . $var . '"');
1230
+            $this->logger->warning('There is no setter function for property "'.$var.'"');
1231 1231
         } else {
1232 1232
             $this->$method($value);
1233 1233
         }
Please login to merge, or discard this patch.
Braces   +32 added lines, -64 removed lines patch added patch discarded remove patch
@@ -49,8 +49,7 @@  discard block
 block discarded – undo
49 49
  * @property-read string $toplevelId This holds the toplevel structure's @ID (METS) or the manifest's @id (IIIF)
50 50
  * @abstract
51 51
  */
52
-abstract class Doc
53
-{
52
+abstract class Doc {
54 53
     /**
55 54
      * This holds the logger
56 55
      *
@@ -326,8 +325,7 @@  discard block
 block discarded – undo
326 325
      *
327 326
      * @return void
328 327
      */
329
-    public static function clearRegistry()
330
-    {
328
+    public static function clearRegistry() {
331 329
         // Reset registry array.
332 330
         self::$registry = [];
333 331
     }
@@ -505,8 +503,7 @@  discard block
 block discarded – undo
505 503
      *
506 504
      * @return int The physical page number
507 505
      */
508
-    public function getPhysicalPage($logicalPage)
509
-    {
506
+    public function getPhysicalPage($logicalPage) {
510 507
         if (
511 508
             !empty($this->lastSearchedPhysicalPage['logicalPage'])
512 509
             && $this->lastSearchedPhysicalPage['logicalPage'] == $logicalPage
@@ -551,8 +548,7 @@  discard block
 block discarded – undo
551 548
      *
552 549
      * @return string The OCR full text
553 550
      */
554
-    protected function getFullTextFromXml($id)
555
-    {
551
+    protected function getFullTextFromXml($id) {
556 552
         $fullText = '';
557 553
         // Load available text formats, ...
558 554
         $this->loadFormats();
@@ -614,8 +610,7 @@  discard block
 block discarded – undo
614 610
      *
615 611
      * @return string The format of the OCR full text
616 612
      */
617
-    private function getTextFormat($fileContent)
618
-    {
613
+    private function getTextFormat($fileContent) {
619 614
         $xml = Helper::getXmlFileAsString($fileContent);
620 615
 
621 616
         if ($xml !== false) {
@@ -638,8 +633,7 @@  discard block
 block discarded – undo
638 633
      *
639 634
      * @return string The title of the document itself or a parent document
640 635
      */
641
-    public static function getTitle($uid, $recursive = false)
642
-    {
636
+    public static function getTitle($uid, $recursive = false) {
643 637
         $title = '';
644 638
         // Sanitize input.
645 639
         $uid = max(intval($uid), 0);
@@ -691,8 +685,7 @@  discard block
 block discarded – undo
691 685
      *
692 686
      * @return array The logical structure node's / resource's parsed metadata array
693 687
      */
694
-    public function getTitledata($cPid = 0)
695
-    {
688
+    public function getTitledata($cPid = 0) {
696 689
         $titledata = $this->getMetadata($this->_getToplevelId(), $cPid);
697 690
         // Add information from METS structural map to titledata array.
698 691
         if ($this instanceof MetsDocument) {
@@ -725,8 +718,7 @@  discard block
 block discarded – undo
725 718
      * @return int|bool: false if structure with $logId is not a child of this substructure,
726 719
      * or the actual depth.
727 720
      */
728
-    protected function getTreeDepth($structure, $depth, $logId)
729
-    {
721
+    protected function getTreeDepth($structure, $depth, $logId) {
730 722
         foreach ($structure as $element) {
731 723
             if ($element['id'] == $logId) {
732 724
                 return $depth;
@@ -748,8 +740,7 @@  discard block
 block discarded – undo
748 740
      * @param string $logId: The id of the logical structure element whose depth is requested
749 741
      * @return int|bool tree depth as integer or false if no element with $logId exists within the TOC.
750 742
      */
751
-    public function getStructureDepth($logId)
752
-    {
743
+    public function getStructureDepth($logId) {
753 744
         return $this->getTreeDepth($this->_getTableOfContents(), 1, $logId);
754 745
     }
755 746
 
@@ -801,8 +792,7 @@  discard block
 block discarded – undo
801 792
      *
802 793
      * @return bool true on success or false on failure
803 794
      */
804
-    protected function load($location)
805
-    {
795
+    protected function load($location) {
806 796
         // Load XML / JSON-LD file.
807 797
         if (GeneralUtility::isValidUrl($location)) {
808 798
             // the actual loading is format specific
@@ -829,8 +819,7 @@  discard block
 block discarded – undo
829 819
      *
830 820
      * @return void
831 821
      */
832
-    protected function loadFormats()
833
-    {
822
+    protected function loadFormats() {
834 823
         if (!$this->formatsLoaded) {
835 824
             $queryBuilder = GeneralUtility::makeInstance(ConnectionPool::class)
836 825
                 ->getQueryBuilderForTable('tx_dlf_formats');
@@ -870,8 +859,7 @@  discard block
 block discarded – undo
870 859
      *
871 860
      * @return void
872 861
      */
873
-    public function registerNamespaces(&$obj)
874
-    {
862
+    public function registerNamespaces(&$obj) {
875 863
         // TODO Check usage. XML specific method does not seem to be used anywhere outside this class within the project, but it is public and may be used by extensions.
876 864
         $this->loadFormats();
877 865
         // Do we have a \SimpleXMLElement or \DOMXPath object?
@@ -896,8 +884,7 @@  discard block
 block discarded – undo
896 884
      *
897 885
      * @return int The PID of the metadata definitions
898 886
      */
899
-    protected function _getCPid()
900
-    {
887
+    protected function _getCPid() {
901 888
         return $this->cPid;
902 889
     }
903 890
 
@@ -908,8 +895,7 @@  discard block
 block discarded – undo
908 895
      *
909 896
      * @return bool Are there any fulltext files available?
910 897
      */
911
-    protected function _getHasFulltext()
912
-    {
898
+    protected function _getHasFulltext() {
913 899
         $this->ensureHasFulltextIsSet();
914 900
         return $this->hasFulltext;
915 901
     }
@@ -921,8 +907,7 @@  discard block
 block discarded – undo
921 907
      *
922 908
      * @return string The location of the document
923 909
      */
924
-    protected function _getLocation()
925
-    {
910
+    protected function _getLocation() {
926 911
         return $this->location;
927 912
     }
928 913
 
@@ -944,8 +929,7 @@  discard block
 block discarded – undo
944 929
      *
945 930
      * @return array Array of metadata with their corresponding logical structure node ID as key
946 931
      */
947
-    protected function _getMetadataArray()
948
-    {
932
+    protected function _getMetadataArray() {
949 933
         // Set metadata definitions' PID.
950 934
         $cPid = ($this->cPid ? $this->cPid : $this->pid);
951 935
         if (!$cPid) {
@@ -970,8 +954,7 @@  discard block
 block discarded – undo
970 954
      *
971 955
      * @return int The total number of pages and/or tracks
972 956
      */
973
-    protected function _getNumPages()
974
-    {
957
+    protected function _getNumPages() {
975 958
         $this->_getPhysicalStructure();
976 959
         return $this->numPages;
977 960
     }
@@ -983,8 +966,7 @@  discard block
 block discarded – undo
983 966
      *
984 967
      * @return int The UID of the parent document or zero if not applicable
985 968
      */
986
-    protected function _getParentId()
987
-    {
969
+    protected function _getParentId() {
988 970
         return $this->parentId;
989 971
     }
990 972
 
@@ -1007,8 +989,7 @@  discard block
 block discarded – undo
1007 989
      *
1008 990
      * @return array Array of elements' type, label and file representations ordered by @ID attribute / Canvas order
1009 991
      */
1010
-    protected function _getPhysicalStructureInfo()
1011
-    {
992
+    protected function _getPhysicalStructureInfo() {
1012 993
         // Is there no physical structure array yet?
1013 994
         if (!$this->physicalStructureLoaded) {
1014 995
             // Build physical structure array.
@@ -1024,8 +1005,7 @@  discard block
 block discarded – undo
1024 1005
      *
1025 1006
      * @return int The PID of the document or zero if not in database
1026 1007
      */
1027
-    protected function _getPid()
1028
-    {
1008
+    protected function _getPid() {
1029 1009
         return $this->pid;
1030 1010
     }
1031 1011
 
@@ -1036,8 +1016,7 @@  discard block
 block discarded – undo
1036 1016
      *
1037 1017
      * @return bool Is the document instantiated successfully?
1038 1018
      */
1039
-    protected function _getReady()
1040
-    {
1019
+    protected function _getReady() {
1041 1020
         return $this->ready;
1042 1021
     }
1043 1022
 
@@ -1048,8 +1027,7 @@  discard block
 block discarded – undo
1048 1027
      *
1049 1028
      * @return mixed The METS file's / IIIF manifest's record identifier
1050 1029
      */
1051
-    protected function _getRecordId()
1052
-    {
1030
+    protected function _getRecordId() {
1053 1031
         return $this->recordId;
1054 1032
     }
1055 1033
 
@@ -1060,8 +1038,7 @@  discard block
 block discarded – undo
1060 1038
      *
1061 1039
      * @return int The UID of the root document or zero if not applicable
1062 1040
      */
1063
-    protected function _getRootId()
1064
-    {
1041
+    protected function _getRootId() {
1065 1042
         if (!$this->rootIdLoaded) {
1066 1043
             if ($this->parentId) {
1067 1044
                 $parent = self::getInstance($this->parentId, ['storagePid' => $this->pid]);
@@ -1091,8 +1068,7 @@  discard block
 block discarded – undo
1091 1068
      *
1092 1069
      * @return array Array of structure nodes' id, label, type and physical page indexes/mptr / Canvas link with original hierarchy preserved
1093 1070
      */
1094
-    protected function _getTableOfContents()
1095
-    {
1071
+    protected function _getTableOfContents() {
1096 1072
         // Is there no logical structure array yet?
1097 1073
         if (!$this->tableOfContentsLoaded) {
1098 1074
             // Get all logical structures.
@@ -1133,8 +1109,7 @@  discard block
 block discarded – undo
1133 1109
      *
1134 1110
      * @return mixed The UID or the URL of the document
1135 1111
      */
1136
-    protected function _getUid()
1137
-    {
1112
+    protected function _getUid() {
1138 1113
         return $this->uid;
1139 1114
     }
1140 1115
 
@@ -1147,8 +1122,7 @@  discard block
 block discarded – undo
1147 1122
      *
1148 1123
      * @return void
1149 1124
      */
1150
-    protected function _setCPid($value)
1151
-    {
1125
+    protected function _setCPid($value) {
1152 1126
         $this->cPid = max(intval($value), 0);
1153 1127
     }
1154 1128
 
@@ -1165,8 +1139,7 @@  discard block
 block discarded – undo
1165 1139
      *
1166 1140
      * @return void
1167 1141
      */
1168
-    protected function __construct($location, $pid, $preloadedDocument)
1169
-    {
1142
+    protected function __construct($location, $pid, $preloadedDocument) {
1170 1143
         $this->setPreloadedDocument($preloadedDocument);
1171 1144
         $this->init($location);
1172 1145
         $this->establishRecordId($pid);
@@ -1182,8 +1155,7 @@  discard block
 block discarded – undo
1182 1155
      *
1183 1156
      * @return mixed Value of $this->$var
1184 1157
      */
1185
-    public function __get($var)
1186
-    {
1158
+    public function __get($var) {
1187 1159
         $method = '_get' . ucfirst($var);
1188 1160
         if (
1189 1161
             !property_exists($this, $var)
@@ -1205,8 +1177,7 @@  discard block
 block discarded – undo
1205 1177
      *
1206 1178
      * @return bool true if variable is set and not empty, false otherwise
1207 1179
      */
1208
-    public function __isset($var)
1209
-    {
1180
+    public function __isset($var) {
1210 1181
         return !empty($this->__get($var));
1211 1182
     }
1212 1183
 
@@ -1220,8 +1191,7 @@  discard block
 block discarded – undo
1220 1191
      *
1221 1192
      * @return void
1222 1193
      */
1223
-    public function __set($var, $value)
1224
-    {
1194
+    public function __set($var, $value) {
1225 1195
         $method = '_set' . ucfirst($var);
1226 1196
         if (
1227 1197
             !property_exists($this, $var)
@@ -1239,8 +1209,7 @@  discard block
 block discarded – undo
1239 1209
      * @param string $location
1240 1210
      * @return Doc|false
1241 1211
      */
1242
-    private static function getDocCache(string $location)
1243
-    {
1212
+    private static function getDocCache(string $location) {
1244 1213
         $cacheIdentifier = md5($location);
1245 1214
         $cache = GeneralUtility::makeInstance(CacheManager::class)->getCache('tx_dlf_doc');
1246 1215
         $cacheHit = $cache->get($cacheIdentifier);
@@ -1255,8 +1224,7 @@  discard block
 block discarded – undo
1255 1224
      * @param Doc $doc
1256 1225
      * @return void
1257 1226
      */
1258
-    private static function setDocCache(string $location, Doc $doc)
1259
-    {
1227
+    private static function setDocCache(string $location, Doc $doc) {
1260 1228
         $cacheIdentifier = md5($location);
1261 1229
         $cache = GeneralUtility::makeInstance(CacheManager::class)->getCache('tx_dlf_doc');
1262 1230
 
Please login to merge, or discard this patch.
Upper-Lower-Casing   +35 added lines, -35 removed lines patch added patch discarded remove patch
@@ -104,7 +104,7 @@  discard block
 block discarded – undo
104 104
      * @var bool
105 105
      * @access protected
106 106
      */
107
-    protected $formatsLoaded = false;
107
+    protected $formatsLoaded = FALSE;
108 108
 
109 109
     /**
110 110
      * Are there any fulltext files available? This also includes IIIF text annotations
@@ -114,7 +114,7 @@  discard block
 block discarded – undo
114 114
      * @var bool
115 115
      * @access protected
116 116
      */
117
-    protected $hasFulltext = false;
117
+    protected $hasFulltext = FALSE;
118 118
 
119 119
     /**
120 120
      * Last searched logical and physical page
@@ -122,7 +122,7 @@  discard block
 block discarded – undo
122 122
      * @var array
123 123
      * @access protected
124 124
      */
125
-    protected $lastSearchedPhysicalPage = ['logicalPage' => null, 'physicalPage' => null];
125
+    protected $lastSearchedPhysicalPage = ['logicalPage' => NULL, 'physicalPage' => NULL];
126 126
 
127 127
     /**
128 128
      * This holds the logical units
@@ -148,7 +148,7 @@  discard block
 block discarded – undo
148 148
      * @var bool
149 149
      * @access protected
150 150
      */
151
-    protected $metadataArrayLoaded = false;
151
+    protected $metadataArrayLoaded = FALSE;
152 152
 
153 153
     /**
154 154
      * The holds the total number of pages
@@ -189,7 +189,7 @@  discard block
 block discarded – undo
189 189
      * @var bool
190 190
      * @access protected
191 191
      */
192
-    protected $physicalStructureLoaded = false;
192
+    protected $physicalStructureLoaded = FALSE;
193 193
 
194 194
     /**
195 195
      * This holds the PID of the document or zero if not in database
@@ -214,7 +214,7 @@  discard block
 block discarded – undo
214 214
      * @var bool
215 215
      * @access protected
216 216
      */
217
-    protected $ready = false;
217
+    protected $ready = FALSE;
218 218
 
219 219
     /**
220 220
      * The METS file's / IIIF manifest's record identifier
@@ -248,7 +248,7 @@  discard block
 block discarded – undo
248 248
      * @var bool
249 249
      * @access protected
250 250
      */
251
-    protected $rootIdLoaded = false;
251
+    protected $rootIdLoaded = FALSE;
252 252
 
253 253
     /**
254 254
      * This holds the smLinks between logical and physical structMap
@@ -265,7 +265,7 @@  discard block
 block discarded – undo
265 265
      * @var bool
266 266
      * @access protected
267 267
      */
268
-    protected $smLinksLoaded = false;
268
+    protected $smLinksLoaded = FALSE;
269 269
 
270 270
     /**
271 271
      * This holds the logical structure
@@ -282,7 +282,7 @@  discard block
 block discarded – undo
282 282
      * @var bool
283 283
      * @access protected
284 284
      */
285
-    protected $tableOfContentsLoaded = false;
285
+    protected $tableOfContentsLoaded = FALSE;
286 286
 
287 287
     /**
288 288
      * This holds the document's thumbnail location
@@ -299,7 +299,7 @@  discard block
 block discarded – undo
299 299
      * @var bool
300 300
      * @access protected
301 301
      */
302
-    protected $thumbnailLoaded = false;
302
+    protected $thumbnailLoaded = FALSE;
303 303
 
304 304
     /**
305 305
      * This holds the toplevel structure's @ID (METS) or the manifest's @id (IIIF)
@@ -408,17 +408,17 @@  discard block
 block discarded – undo
408 408
      *
409 409
      * @return \Kitodo\Dlf\Common\Doc|null Instance of this class, either MetsDocument or IiifManifest
410 410
      */
411
-    public static function &getInstance($location, $settings = [], $forceReload = false)
411
+    public static function &getInstance($location, $settings = [], $forceReload = FALSE)
412 412
     {
413 413
         // Create new instance depending on format (METS or IIIF) ...
414
-        $documentFormat = null;
415
-        $xml = null;
416
-        $iiif = null;
414
+        $documentFormat = NULL;
415
+        $xml = NULL;
416
+        $iiif = NULL;
417 417
 
418 418
         if ($instance = self::getDocCache($location)) {
419 419
             return $instance;
420 420
         } else {
421
-            $instance = null;
421
+            $instance = NULL;
422 422
         }
423 423
 
424 424
         // Try to load a file from the url
@@ -427,17 +427,17 @@  discard block
 block discarded – undo
427 427
             $extConf = GeneralUtility::makeInstance(ExtensionConfiguration::class)->get(self::$extKey);
428 428
 
429 429
             $content = Helper::getUrl($location);
430
-            if ($content !== false) {
430
+            if ($content !== FALSE) {
431 431
                 $xml = Helper::getXmlFileAsString($content);
432
-                if ($xml !== false) {
432
+                if ($xml !== FALSE) {
433 433
                     /* @var $xml \SimpleXMLElement */
434 434
                     $xml->registerXPathNamespace('mets', 'http://www.loc.gov/METS/');
435 435
                     $xpathResult = $xml->xpath('//mets:mets');
436
-                    $documentFormat = !empty($xpathResult) ? 'METS' : null;
436
+                    $documentFormat = !empty($xpathResult) ? 'METS' : NULL;
437 437
                 } else {
438 438
                     // Try to load file as IIIF resource instead.
439
-                    $contentAsJsonArray = json_decode($content, true);
440
-                    if ($contentAsJsonArray !== null) {
439
+                    $contentAsJsonArray = json_decode($content, TRUE);
440
+                    if ($contentAsJsonArray !== NULL) {
441 441
                         IiifHelper::setUrlReader(IiifUrlReader::getInstance());
442 442
                         IiifHelper::setMaxThumbnailHeight($extConf['iiifThumbnailHeight']);
443 443
                         IiifHelper::setMaxThumbnailWidth($extConf['iiifThumbnailWidth']);
@@ -478,7 +478,7 @@  discard block
 block discarded – undo
478 478
      *
479 479
      * @return array Array of the element's id, label, type and physical page indexes/mptr link
480 480
      */
481
-    public abstract function getLogicalStructure($id, $recursive = false);
481
+    public abstract function getLogicalStructure($id, $recursive = FALSE);
482 482
 
483 483
     /**
484 484
      * This extracts all the metadata for a logical structure node
@@ -515,7 +515,7 @@  discard block
 block discarded – undo
515 515
         } else {
516 516
             $physicalPage = 0;
517 517
             foreach ($this->physicalStructureInfo as $page) {
518
-                if (strpos($page['orderlabel'], $logicalPage) !== false) {
518
+                if (strpos($page['orderlabel'], $logicalPage) !== FALSE) {
519 519
                     $this->lastSearchedPhysicalPage['logicalPage'] = $logicalPage;
520 520
                     $this->lastSearchedPhysicalPage['physicalPage'] = $physicalPage;
521 521
                     return $physicalPage;
@@ -566,7 +566,7 @@  discard block
 block discarded – undo
566 566
                 if (!empty($this->physicalStructureInfo[$id]['files'][$fileGrpFulltext])) {
567 567
                     // Get full text file.
568 568
                     $fileContent = GeneralUtility::getUrl($this->getFileLocation($this->physicalStructureInfo[$id]['files'][$fileGrpFulltext]));
569
-                    if ($fileContent !== false) {
569
+                    if ($fileContent !== FALSE) {
570 570
                         $textFormat = $this->getTextFormat($fileContent);
571 571
                     } else {
572 572
                         $this->logger->warning('Couldn\'t load full text file for structure node @ID "' . $id . '"');
@@ -618,7 +618,7 @@  discard block
 block discarded – undo
618 618
     {
619 619
         $xml = Helper::getXmlFileAsString($fileContent);
620 620
 
621
-        if ($xml !== false) {
621
+        if ($xml !== FALSE) {
622 622
             // Get the root element's name as text format.
623 623
             return strtoupper($xml->getName());
624 624
         } else {
@@ -638,7 +638,7 @@  discard block
 block discarded – undo
638 638
      *
639 639
      * @return string The title of the document itself or a parent document
640 640
      */
641
-    public static function getTitle($uid, $recursive = false)
641
+    public static function getTitle($uid, $recursive = FALSE)
642 642
     {
643 643
         $title = '';
644 644
         // Sanitize input.
@@ -671,7 +671,7 @@  discard block
 block discarded – undo
671 671
                     && intval($partof)
672 672
                     && $partof != $uid
673 673
                 ) {
674
-                    $title = self::getTitle($partof, true);
674
+                    $title = self::getTitle($partof, TRUE);
675 675
                 }
676 676
             } else {
677 677
                 Helper::log('No document with UID ' . $uid . ' found or document not accessible', LOG_SEVERITY_WARNING);
@@ -732,12 +732,12 @@  discard block
 block discarded – undo
732 732
                 return $depth;
733 733
             } elseif (array_key_exists('children', $element)) {
734 734
                 $foundInChildren = $this->getTreeDepth($element['children'], $depth + 1, $logId);
735
-                if ($foundInChildren !== false) {
735
+                if ($foundInChildren !== FALSE) {
736 736
                     return $foundInChildren;
737 737
                 }
738 738
             }
739 739
         }
740
-        return false;
740
+        return FALSE;
741 741
     }
742 742
 
743 743
     /**
@@ -810,7 +810,7 @@  discard block
 block discarded – undo
810 810
         } else {
811 811
             $this->logger->error('Invalid file location "' . $location . '" for document loading');
812 812
         }
813
-        return false;
813
+        return FALSE;
814 814
     }
815 815
 
816 816
     /**
@@ -857,7 +857,7 @@  discard block
 block discarded – undo
857 857
                     'class' => $resArray['class']
858 858
                 ];
859 859
             }
860
-            $this->formatsLoaded = true;
860
+            $this->formatsLoaded = TRUE;
861 861
         }
862 862
     }
863 863
 
@@ -958,7 +958,7 @@  discard block
 block discarded – undo
958 958
         ) {
959 959
             $this->prepareMetadataArray($cPid);
960 960
             $this->metadataArray[0] = $cPid;
961
-            $this->metadataArrayLoaded = true;
961
+            $this->metadataArrayLoaded = TRUE;
962 962
         }
963 963
         return $this->metadataArray;
964 964
     }
@@ -1067,7 +1067,7 @@  discard block
 block discarded – undo
1067 1067
                 $parent = self::getInstance($this->parentId, ['storagePid' => $this->pid]);
1068 1068
                 $this->rootId = $parent->rootId;
1069 1069
             }
1070
-            $this->rootIdLoaded = true;
1070
+            $this->rootIdLoaded = TRUE;
1071 1071
         }
1072 1072
         return $this->rootId;
1073 1073
     }
@@ -1096,8 +1096,8 @@  discard block
 block discarded – undo
1096 1096
         // Is there no logical structure array yet?
1097 1097
         if (!$this->tableOfContentsLoaded) {
1098 1098
             // Get all logical structures.
1099
-            $this->getLogicalStructure('', true);
1100
-            $this->tableOfContentsLoaded = true;
1099
+            $this->getLogicalStructure('', TRUE);
1100
+            $this->tableOfContentsLoaded = TRUE;
1101 1101
         }
1102 1102
         return $this->tableOfContents;
1103 1103
     }
@@ -1113,7 +1113,7 @@  discard block
 block discarded – undo
1113 1113
      *
1114 1114
      * @return string The document's thumbnail location
1115 1115
      */
1116
-    protected abstract function _getThumbnail($forceReload = false);
1116
+    protected abstract function _getThumbnail($forceReload = FALSE);
1117 1117
 
1118 1118
     /**
1119 1119
      * This returns the ID of the toplevel logical structure node
Please login to merge, or discard this patch.
Classes/Common/Helper.php 3 patches
Spacing   +34 added lines, -34 removed lines patch added patch discarded remove patch
@@ -142,7 +142,7 @@  discard block
 block discarded – undo
142 142
                 if (!preg_match('/[0-9]{8}-[0-9]{1}/i', $id)) {
143 143
                     return false;
144 144
                 } elseif ($checksum == 10) {
145
-                    return self::checkIdentifier(($digits + 1) . substr($id, -2, 2), 'SWD');
145
+                    return self::checkIdentifier(($digits + 1).substr($id, -2, 2), 'SWD');
146 146
                 } elseif (substr($id, -1, 1) != $checksum) {
147 147
                     return false;
148 148
                 }
@@ -307,7 +307,7 @@  discard block
 block discarded – undo
307 307
         $encrypted = openssl_encrypt($string, self::$cipherAlgorithm, $key, OPENSSL_RAW_DATA, $iv);
308 308
         // Merge initialisation vector and encrypted data.
309 309
         if ($encrypted !== false) {
310
-            $encrypted = base64_encode($iv . $encrypted);
310
+            $encrypted = base64_encode($iv.$encrypted);
311 311
         }
312 312
         return $encrypted;
313 313
     }
@@ -361,8 +361,8 @@  discard block
 block discarded – undo
361 361
     public static function getHookObjects($scriptRelPath)
362 362
     {
363 363
         $hookObjects = [];
364
-        if (is_array($GLOBALS['TYPO3_CONF_VARS']['SC_OPTIONS'][self::$extKey . '/' . $scriptRelPath]['hookClass'])) {
365
-            foreach ($GLOBALS['TYPO3_CONF_VARS']['SC_OPTIONS'][self::$extKey . '/' . $scriptRelPath]['hookClass'] as $classRef) {
364
+        if (is_array($GLOBALS['TYPO3_CONF_VARS']['SC_OPTIONS'][self::$extKey.'/'.$scriptRelPath]['hookClass'])) {
365
+            foreach ($GLOBALS['TYPO3_CONF_VARS']['SC_OPTIONS'][self::$extKey.'/'.$scriptRelPath]['hookClass'] as $classRef) {
366 366
                 $hookObjects[] = GeneralUtility::makeInstance($classRef);
367 367
             }
368 368
         }
@@ -388,7 +388,7 @@  discard block
 block discarded – undo
388 388
             !$uid
389 389
             || !in_array($table, ['tx_dlf_collections', 'tx_dlf_libraries', 'tx_dlf_metadata', 'tx_dlf_structures', 'tx_dlf_solrcores'])
390 390
         ) {
391
-            self::log('Invalid UID "' . $uid . '" or table "' . $table . '"', LOG_SEVERITY_ERROR);
391
+            self::log('Invalid UID "'.$uid.'" or table "'.$table.'"', LOG_SEVERITY_ERROR);
392 392
             return '';
393 393
         }
394 394
 
@@ -399,15 +399,15 @@  discard block
 block discarded – undo
399 399
         // Should we check for a specific PID, too?
400 400
         if ($pid !== -1) {
401 401
             $pid = max(intval($pid), 0);
402
-            $where = $queryBuilder->expr()->eq($table . '.pid', $pid);
402
+            $where = $queryBuilder->expr()->eq($table.'.pid', $pid);
403 403
         }
404 404
 
405 405
         // Get index_name from database.
406 406
         $result = $queryBuilder
407
-            ->select($table . '.index_name AS index_name')
407
+            ->select($table.'.index_name AS index_name')
408 408
             ->from($table)
409 409
             ->where(
410
-                $queryBuilder->expr()->eq($table . '.uid', $uid),
410
+                $queryBuilder->expr()->eq($table.'.uid', $uid),
411 411
                 $where,
412 412
                 self::whereExpression($table)
413 413
             )
@@ -417,7 +417,7 @@  discard block
 block discarded – undo
417 417
         if ($resArray = $result->fetch()) {
418 418
             return $resArray['index_name'];
419 419
         } else {
420
-            self::log('No "index_name" with UID ' . $uid . ' and PID ' . $pid . ' found in table "' . $table . '"', LOG_SEVERITY_WARNING);
420
+            self::log('No "index_name" with UID '.$uid.' and PID '.$pid.' found in table "'.$table.'"', LOG_SEVERITY_WARNING);
421 421
             return '';
422 422
         }
423 423
     }
@@ -436,9 +436,9 @@  discard block
 block discarded – undo
436 436
         // Analyze code and set appropriate ISO table.
437 437
         $isoCode = strtolower(trim($code));
438 438
         if (preg_match('/^[a-z]{3}$/', $isoCode)) {
439
-            $file = \TYPO3\CMS\Core\Utility\ExtensionManagementUtility::extPath(self::$extKey) . 'Resources/Private/Data/iso-639-2b.xml';
439
+            $file = \TYPO3\CMS\Core\Utility\ExtensionManagementUtility::extPath(self::$extKey).'Resources/Private/Data/iso-639-2b.xml';
440 440
         } elseif (preg_match('/^[a-z]{2}$/', $isoCode)) {
441
-            $file = \TYPO3\CMS\Core\Utility\ExtensionManagementUtility::extPath(self::$extKey) . 'Resources/Private/Data/iso-639-1.xml';
441
+            $file = \TYPO3\CMS\Core\Utility\ExtensionManagementUtility::extPath(self::$extKey).'Resources/Private/Data/iso-639-1.xml';
442 442
         } else {
443 443
             // No ISO code, return unchanged.
444 444
             return $code;
@@ -456,13 +456,13 @@  discard block
 block discarded – undo
456 456
                 $lang = $languageService->getLLL($isoCode, $iso639);
457 457
             }
458 458
         } else {
459
-            self::log('Unexpected TYPO3_MODE "' . \TYPO3_MODE . '"', LOG_SEVERITY_ERROR);
459
+            self::log('Unexpected TYPO3_MODE "'.\TYPO3_MODE.'"', LOG_SEVERITY_ERROR);
460 460
             return $code;
461 461
         }
462 462
         if (!empty($lang)) {
463 463
             return $lang;
464 464
         } else {
465
-            self::log('Language code "' . $code . '" not found in ISO-639 table', LOG_SEVERITY_NOTICE);
465
+            self::log('Language code "'.$code.'" not found in ISO-639 table', LOG_SEVERITY_NOTICE);
466 466
             return $code;
467 467
         }
468 468
     }
@@ -557,7 +557,7 @@  discard block
 block discarded – undo
557 557
             '-' => 39,
558 558
             ':' => 17,
559 559
         ];
560
-        $urn = strtolower($base . $id);
560
+        $urn = strtolower($base.$id);
561 561
         if (preg_match('/[^a-z0-9:-]/', $urn)) {
562 562
             self::log('Invalid chars in given parameters', LOG_SEVERITY_WARNING);
563 563
             return '';
@@ -571,7 +571,7 @@  discard block
 block discarded – undo
571 571
             $checksum += ($i + 1) * intval(substr($digits, $i, 1));
572 572
         }
573 573
         $checksum = substr(intval($checksum / intval(substr($digits, -1, 1))), -1, 1);
574
-        return $base . $id . $checksum;
574
+        return $base.$id.$checksum;
575 575
     }
576 576
 
577 577
     /**
@@ -665,7 +665,7 @@  discard block
 block discarded – undo
665 665
         // Sanitize input.
666 666
         $pid = max(intval($pid), 0);
667 667
         if (!$pid) {
668
-            self::log('Invalid PID ' . $pid . ' for translation', LOG_SEVERITY_WARNING);
668
+            self::log('Invalid PID '.$pid.' for translation', LOG_SEVERITY_WARNING);
669 669
             return $index_name;
670 670
         }
671 671
         /** @var \TYPO3\CMS\Frontend\Page\PageRepository $pageRepository */
@@ -687,13 +687,13 @@  discard block
 block discarded – undo
687 687
         // First fetch the uid of the received index_name
688 688
         $result = $queryBuilder
689 689
             ->select(
690
-                $table . '.uid AS uid',
691
-                $table . '.l18n_parent AS l18n_parent'
690
+                $table.'.uid AS uid',
691
+                $table.'.l18n_parent AS l18n_parent'
692 692
             )
693 693
             ->from($table)
694 694
             ->where(
695
-                $queryBuilder->expr()->eq($table . '.pid', $pid),
696
-                $queryBuilder->expr()->eq($table . '.index_name', $queryBuilder->expr()->literal($index_name)),
695
+                $queryBuilder->expr()->eq($table.'.pid', $pid),
696
+                $queryBuilder->expr()->eq($table.'.index_name', $queryBuilder->expr()->literal($index_name)),
697 697
                 self::whereExpression($table, true)
698 698
             )
699 699
             ->setMaxResults(1)
@@ -706,12 +706,12 @@  discard block
 block discarded – undo
706 706
             $resArray = $allResults[0];
707 707
 
708 708
             $result = $queryBuilder
709
-                ->select($table . '.index_name AS index_name')
709
+                ->select($table.'.index_name AS index_name')
710 710
                 ->from($table)
711 711
                 ->where(
712
-                    $queryBuilder->expr()->eq($table . '.pid', $pid),
713
-                    $queryBuilder->expr()->eq($table . '.uid', $resArray['l18n_parent']),
714
-                    $queryBuilder->expr()->eq($table . '.sys_language_uid', intval($languageAspect->getContentId())),
712
+                    $queryBuilder->expr()->eq($table.'.pid', $pid),
713
+                    $queryBuilder->expr()->eq($table.'.uid', $resArray['l18n_parent']),
714
+                    $queryBuilder->expr()->eq($table.'.sys_language_uid', intval($languageAspect->getContentId())),
715 715
                     self::whereExpression($table, true)
716 716
                 )
717 717
                 ->setMaxResults(1)
@@ -729,14 +729,14 @@  discard block
 block discarded – undo
729 729
         if (empty($labels[$table][$pid][$languageAspect->getContentId()][$index_name])) {
730 730
             // Check if this table is allowed for translation.
731 731
             if (in_array($table, ['tx_dlf_collections', 'tx_dlf_libraries', 'tx_dlf_metadata', 'tx_dlf_structures'])) {
732
-                $additionalWhere = $queryBuilder->expr()->in($table . '.sys_language_uid', [-1, 0]);
732
+                $additionalWhere = $queryBuilder->expr()->in($table.'.sys_language_uid', [-1, 0]);
733 733
                 if ($languageAspect->getContentId() > 0) {
734 734
                     $additionalWhere = $queryBuilder->expr()->andX(
735 735
                         $queryBuilder->expr()->orX(
736
-                            $queryBuilder->expr()->in($table . '.sys_language_uid', [-1, 0]),
737
-                            $queryBuilder->expr()->eq($table . '.sys_language_uid', intval($languageAspect->getContentId()))
736
+                            $queryBuilder->expr()->in($table.'.sys_language_uid', [-1, 0]),
737
+                            $queryBuilder->expr()->eq($table.'.sys_language_uid', intval($languageAspect->getContentId()))
738 738
                         ),
739
-                        $queryBuilder->expr()->eq($table . '.l18n_parent', 0)
739
+                        $queryBuilder->expr()->eq($table.'.l18n_parent', 0)
740 740
                     );
741 741
                 }
742 742
 
@@ -745,7 +745,7 @@  discard block
 block discarded – undo
745 745
                     ->select('*')
746 746
                     ->from($table)
747 747
                     ->where(
748
-                        $queryBuilder->expr()->eq($table . '.pid', $pid),
748
+                        $queryBuilder->expr()->eq($table.'.pid', $pid),
749 749
                         $additionalWhere,
750 750
                         self::whereExpression($table, true)
751 751
                     )
@@ -763,10 +763,10 @@  discard block
 block discarded – undo
763 763
                         }
764 764
                     }
765 765
                 } else {
766
-                    self::log('No translation with PID ' . $pid . ' available in table "' . $table . '" or translation not accessible', LOG_SEVERITY_NOTICE);
766
+                    self::log('No translation with PID '.$pid.' available in table "'.$table.'" or translation not accessible', LOG_SEVERITY_NOTICE);
767 767
                 }
768 768
             } else {
769
-                self::log('No translations available for table "' . $table . '"', LOG_SEVERITY_WARNING);
769
+                self::log('No translations available for table "'.$table.'"', LOG_SEVERITY_WARNING);
770 770
             }
771 771
         }
772 772
 
@@ -808,9 +808,9 @@  discard block
 block discarded – undo
808 808
             return GeneralUtility::makeInstance(ConnectionPool::class)
809 809
                 ->getQueryBuilderForTable($table)
810 810
                 ->expr()
811
-                ->eq($table . '.' . $GLOBALS['TCA'][$table]['ctrl']['delete'], 0);
811
+                ->eq($table.'.'.$GLOBALS['TCA'][$table]['ctrl']['delete'], 0);
812 812
         } else {
813
-            self::log('Unexpected TYPO3_MODE "' . \TYPO3_MODE . '"', LOG_SEVERITY_ERROR);
813
+            self::log('Unexpected TYPO3_MODE "'.\TYPO3_MODE.'"', LOG_SEVERITY_ERROR);
814 814
             return '1=-1';
815 815
         }
816 816
     }
@@ -849,7 +849,7 @@  discard block
 block discarded – undo
849 849
      */
850 850
     public static function polyfillExtbaseClassesForTYPO3v9()
851 851
     {
852
-        $classes = require __DIR__ . '/../../Configuration/Extbase/Persistence/Classes.php';
852
+        $classes = require __DIR__.'/../../Configuration/Extbase/Persistence/Classes.php';
853 853
 
854 854
         $objectManager = GeneralUtility::makeInstance(ObjectManager::class);
855 855
         $configurationManager = $objectManager->get(ConfigurationManager::class);
Please login to merge, or discard this patch.
Braces   +24 added lines, -48 removed lines patch added patch discarded remove patch
@@ -31,8 +31,7 @@  discard block
 block discarded – undo
31 31
  * @subpackage dlf
32 32
  * @access public
33 33
  */
34
-class Helper
35
-{
34
+class Helper {
36 35
     /**
37 36
      * The extension key
38 37
      *
@@ -80,8 +79,7 @@  discard block
 block discarded – undo
80 79
      *
81 80
      * @return \TYPO3\CMS\Core\Messaging\FlashMessageQueue The queue the message was added to
82 81
      */
83
-    public static function addMessage($message, $title, $severity, $session = false, $queue = 'kitodo.default.flashMessages')
84
-    {
82
+    public static function addMessage($message, $title, $severity, $session = false, $queue = 'kitodo.default.flashMessages') {
85 83
         $flashMessageService = GeneralUtility::makeInstance(\TYPO3\CMS\Core\Messaging\FlashMessageService::class);
86 84
         $flashMessageQueue = $flashMessageService->getMessageQueueByIdentifier($queue);
87 85
         $flashMessage = GeneralUtility::makeInstance(
@@ -106,8 +104,7 @@  discard block
 block discarded – undo
106 104
      *
107 105
      * @return bool Is $id a valid GNL identifier of the given $type?
108 106
      */
109
-    public static function checkIdentifier($id, $type)
110
-    {
107
+    public static function checkIdentifier($id, $type) {
111 108
         $digits = substr($id, 0, 8);
112 109
         $checksum = 0;
113 110
         for ($i = 0, $j = strlen($digits); $i < $j; $i++) {
@@ -171,8 +168,7 @@  discard block
 block discarded – undo
171 168
      *
172 169
      * @return mixed The decrypted value or false on error
173 170
      */
174
-    public static function decrypt($encrypted)
175
-    {
171
+    public static function decrypt($encrypted) {
176 172
         if (
177 173
             !in_array(self::$cipherAlgorithm, openssl_get_cipher_methods(true))
178 174
             || !in_array(self::$hashAlgorithm, openssl_get_md_methods(true))
@@ -210,8 +206,7 @@  discard block
 block discarded – undo
210 206
      *
211 207
      * @return mixed
212 208
      */
213
-    public static function getXmlFileAsString($content)
214
-    {
209
+    public static function getXmlFileAsString($content) {
215 210
         // Turn off libxml's error logging.
216 211
         $libxmlErrors = libxml_use_internal_errors(true);
217 212
         // Disables the functionality to allow external entities to be loaded when parsing the XML, must be kept
@@ -236,8 +231,7 @@  discard block
 block discarded – undo
236 231
      *
237 232
      * @return void
238 233
      */
239
-    public static function log($message, $severity = 0)
240
-    {
234
+    public static function log($message, $severity = 0) {
241 235
         $logger = GeneralUtility::makeInstance(LogManager::class)->getLogger(get_called_class());
242 236
 
243 237
         switch ($severity) {
@@ -267,8 +261,7 @@  discard block
 block discarded – undo
267 261
      *
268 262
      * @return mixed Hashed string or false on error
269 263
      */
270
-    public static function digest($string)
271
-    {
264
+    public static function digest($string) {
272 265
         if (!in_array(self::$hashAlgorithm, openssl_get_md_methods(true))) {
273 266
             self::log('OpenSSL library doesn\'t support hash algorithm', LOG_SEVERITY_ERROR);
274 267
             return false;
@@ -287,8 +280,7 @@  discard block
 block discarded – undo
287 280
      *
288 281
      * @return mixed Encrypted string or false on error
289 282
      */
290
-    public static function encrypt($string)
291
-    {
283
+    public static function encrypt($string) {
292 284
         if (
293 285
             !in_array(self::$cipherAlgorithm, openssl_get_cipher_methods(true))
294 286
             || !in_array(self::$hashAlgorithm, openssl_get_md_methods(true))
@@ -321,8 +313,7 @@  discard block
 block discarded – undo
321 313
      *
322 314
      * @return string The unqualified class name
323 315
      */
324
-    public static function getUnqualifiedClassName($qualifiedClassname)
325
-    {
316
+    public static function getUnqualifiedClassName($qualifiedClassname) {
326 317
         $nameParts = explode('\\', $qualifiedClassname);
327 318
         return end($nameParts);
328 319
     }
@@ -336,8 +327,7 @@  discard block
 block discarded – undo
336 327
      *
337 328
      * @return string The cleaned up string
338 329
      */
339
-    public static function getCleanString($string)
340
-    {
330
+    public static function getCleanString($string) {
341 331
         // Convert to lowercase.
342 332
         $string = strtolower($string);
343 333
         // Remove non-alphanumeric characters.
@@ -358,8 +348,7 @@  discard block
 block discarded – undo
358 348
      *
359 349
      * @return array Array of hook objects for the class
360 350
      */
361
-    public static function getHookObjects($scriptRelPath)
362
-    {
351
+    public static function getHookObjects($scriptRelPath) {
363 352
         $hookObjects = [];
364 353
         if (is_array($GLOBALS['TYPO3_CONF_VARS']['SC_OPTIONS'][self::$extKey . '/' . $scriptRelPath]['hookClass'])) {
365 354
             foreach ($GLOBALS['TYPO3_CONF_VARS']['SC_OPTIONS'][self::$extKey . '/' . $scriptRelPath]['hookClass'] as $classRef) {
@@ -380,8 +369,7 @@  discard block
 block discarded – undo
380 369
      *
381 370
      * @return string "index_name" for the given UID
382 371
      */
383
-    public static function getIndexNameFromUid($uid, $table, $pid = -1)
384
-    {
372
+    public static function getIndexNameFromUid($uid, $table, $pid = -1) {
385 373
         // Sanitize input.
386 374
         $uid = max(intval($uid), 0);
387 375
         if (
@@ -431,8 +419,7 @@  discard block
 block discarded – undo
431 419
      *
432 420
      * @return string Localized full name of language or unchanged input
433 421
      */
434
-    public static function getLanguageName($code)
435
-    {
422
+    public static function getLanguageName($code) {
436 423
         // Analyze code and set appropriate ISO table.
437 424
         $isoCode = strtolower(trim($code));
438 425
         if (preg_match('/^[a-z]{3}$/', $isoCode)) {
@@ -474,8 +461,7 @@  discard block
 block discarded – undo
474 461
      *
475 462
      * @return array
476 463
      */
477
-    public static function getDocumentStructures($pid = -1)
478
-    {
464
+    public static function getDocumentStructures($pid = -1) {
479 465
         $connectionPool = GeneralUtility::makeInstance(ConnectionPool::class);
480 466
         $queryBuilder = $connectionPool->getQueryBuilderForTable('tx_dlf_structures');
481 467
 
@@ -515,8 +501,7 @@  discard block
 block discarded – undo
515 501
      *
516 502
      * @return string Uniform Resource Name as string
517 503
      */
518
-    public static function getURN($base, $id)
519
-    {
504
+    public static function getURN($base, $id) {
520 505
         $concordance = [
521 506
             '0' => 1,
522 507
             '1' => 2,
@@ -583,8 +568,7 @@  discard block
 block discarded – undo
583 568
      *
584 569
      * @return bool Is $id a valid PPN?
585 570
      */
586
-    public static function isPPN($id)
587
-    {
571
+    public static function isPPN($id) {
588 572
         return self::checkIdentifier($id, 'PPN');
589 573
     }
590 574
 
@@ -595,8 +579,7 @@  discard block
 block discarded – undo
595 579
      *
596 580
      * @return bool
597 581
      */
598
-    public static function isValidHttpUrl($url)
599
-    {
582
+    public static function isValidHttpUrl($url) {
600 583
         if (!GeneralUtility::isValidUrl($url)) {
601 584
             return false;
602 585
         }
@@ -622,8 +605,7 @@  discard block
 block discarded – undo
622 605
      *
623 606
      * @return array Merged array
624 607
      */
625
-    public static function mergeRecursiveWithOverrule(array $original, array $overrule, $addKeys = true, $includeEmptyValues = true, $enableUnsetFeature = true)
626
-    {
608
+    public static function mergeRecursiveWithOverrule(array $original, array $overrule, $addKeys = true, $includeEmptyValues = true, $enableUnsetFeature = true) {
627 609
         \TYPO3\CMS\Core\Utility\ArrayUtility::mergeRecursiveWithOverrule($original, $overrule, $addKeys, $includeEmptyValues, $enableUnsetFeature);
628 610
         return $original;
629 611
     }
@@ -637,8 +619,7 @@  discard block
 block discarded – undo
637 619
      *
638 620
      * @return string All flash messages in the queue rendered as HTML.
639 621
      */
640
-    public static function renderFlashMessages($queue = 'kitodo.default.flashMessages')
641
-    {
622
+    public static function renderFlashMessages($queue = 'kitodo.default.flashMessages') {
642 623
         $flashMessageService = GeneralUtility::makeInstance(\TYPO3\CMS\Core\Messaging\FlashMessageService::class);
643 624
         $flashMessageQueue = $flashMessageService->getMessageQueueByIdentifier($queue);
644 625
         $flashMessages = $flashMessageQueue->getAllMessagesAndFlush();
@@ -658,8 +639,7 @@  discard block
 block discarded – undo
658 639
      *
659 640
      * @return string Localized label for $index_name
660 641
      */
661
-    public static function translate($index_name, $table, $pid)
662
-    {
642
+    public static function translate($index_name, $table, $pid) {
663 643
         // Load labels into static variable for future use.
664 644
         static $labels = [];
665 645
         // Sanitize input.
@@ -787,8 +767,7 @@  discard block
 block discarded – undo
787 767
      *
788 768
      * @return string Additional WHERE expression
789 769
      */
790
-    public static function whereExpression($table, $showHidden = false)
791
-    {
770
+    public static function whereExpression($table, $showHidden = false) {
792 771
         if (\TYPO3_MODE === 'FE') {
793 772
             // Should we ignore the record's hidden flag?
794 773
             $ignoreHide = 0;
@@ -820,8 +799,7 @@  discard block
 block discarded – undo
820 799
      *
821 800
      * @access private
822 801
      */
823
-    private function __construct()
824
-    {
802
+    private function __construct() {
825 803
         // This is a static class, thus no instances should be created.
826 804
     }
827 805
 
@@ -847,8 +825,7 @@  discard block
 block discarded – undo
847 825
      *
848 826
      * @access public
849 827
      */
850
-    public static function polyfillExtbaseClassesForTYPO3v9()
851
-    {
828
+    public static function polyfillExtbaseClassesForTYPO3v9() {
852 829
         $classes = require __DIR__ . '/../../Configuration/Extbase/Persistence/Classes.php';
853 830
 
854 831
         $objectManager = GeneralUtility::makeInstance(ObjectManager::class);
@@ -885,8 +862,7 @@  discard block
 block discarded – undo
885 862
      *
886 863
      * @return string|bool
887 864
      */
888
-    public static function getUrl(string $url)
889
-    {
865
+    public static function getUrl(string $url) {
890 866
         if (!Helper::isValidHttpUrl($url)) {
891 867
             return false;
892 868
         }
Please login to merge, or discard this patch.
Upper-Lower-Casing   +36 added lines, -36 removed lines patch added patch discarded remove patch
@@ -80,7 +80,7 @@  discard block
 block discarded – undo
80 80
      *
81 81
      * @return \TYPO3\CMS\Core\Messaging\FlashMessageQueue The queue the message was added to
82 82
      */
83
-    public static function addMessage($message, $title, $severity, $session = false, $queue = 'kitodo.default.flashMessages')
83
+    public static function addMessage($message, $title, $severity, $session = FALSE, $queue = 'kitodo.default.flashMessages')
84 84
     {
85 85
         $flashMessageService = GeneralUtility::makeInstance(\TYPO3\CMS\Core\Messaging\FlashMessageService::class);
86 86
         $flashMessageQueue = $flashMessageService->getMessageQueueByIdentifier($queue);
@@ -122,9 +122,9 @@  discard block
 block discarded – undo
122 122
                     $checksum = 'X';
123 123
                 }
124 124
                 if (!preg_match('/[0-9]{8}[0-9X]{1}/i', $id)) {
125
-                    return false;
125
+                    return FALSE;
126 126
                 } elseif (strtoupper(substr($id, -1, 1)) != $checksum) {
127
-                    return false;
127
+                    return FALSE;
128 128
                 }
129 129
                 break;
130 130
             case 'ZDB':
@@ -132,19 +132,19 @@  discard block
 block discarded – undo
132 132
                     $checksum = 'X';
133 133
                 }
134 134
                 if (!preg_match('/[0-9]{8}-[0-9X]{1}/i', $id)) {
135
-                    return false;
135
+                    return FALSE;
136 136
                 } elseif (strtoupper(substr($id, -1, 1)) != $checksum) {
137
-                    return false;
137
+                    return FALSE;
138 138
                 }
139 139
                 break;
140 140
             case 'SWD':
141 141
                 $checksum = 11 - $checksum;
142 142
                 if (!preg_match('/[0-9]{8}-[0-9]{1}/i', $id)) {
143
-                    return false;
143
+                    return FALSE;
144 144
                 } elseif ($checksum == 10) {
145 145
                     return self::checkIdentifier(($digits + 1) . substr($id, -2, 2), 'SWD');
146 146
                 } elseif (substr($id, -1, 1) != $checksum) {
147
-                    return false;
147
+                    return FALSE;
148 148
                 }
149 149
                 break;
150 150
             case 'GKD':
@@ -153,13 +153,13 @@  discard block
 block discarded – undo
153 153
                     $checksum = 'X';
154 154
                 }
155 155
                 if (!preg_match('/[0-9]{8}-[0-9X]{1}/i', $id)) {
156
-                    return false;
156
+                    return FALSE;
157 157
                 } elseif (strtoupper(substr($id, -1, 1)) != $checksum) {
158
-                    return false;
158
+                    return FALSE;
159 159
                 }
160 160
                 break;
161 161
         }
162
-        return true;
162
+        return TRUE;
163 163
     }
164 164
 
165 165
     /**
@@ -174,28 +174,28 @@  discard block
 block discarded – undo
174 174
     public static function decrypt($encrypted)
175 175
     {
176 176
         if (
177
-            !in_array(self::$cipherAlgorithm, openssl_get_cipher_methods(true))
178
-            || !in_array(self::$hashAlgorithm, openssl_get_md_methods(true))
177
+            !in_array(self::$cipherAlgorithm, openssl_get_cipher_methods(TRUE))
178
+            || !in_array(self::$hashAlgorithm, openssl_get_md_methods(TRUE))
179 179
         ) {
180 180
             self::log('OpenSSL library doesn\'t support cipher and/or hash algorithm', LOG_SEVERITY_ERROR);
181
-            return false;
181
+            return FALSE;
182 182
         }
183 183
         if (empty($GLOBALS['TYPO3_CONF_VARS']['SYS']['encryptionKey'])) {
184 184
             self::log('No encryption key set in TYPO3 configuration', LOG_SEVERITY_ERROR);
185
-            return false;
185
+            return FALSE;
186 186
         }
187 187
         if (
188 188
             empty($encrypted)
189 189
             || strlen($encrypted) < openssl_cipher_iv_length(self::$cipherAlgorithm)
190 190
         ) {
191 191
             self::log('Invalid parameters given for decryption', LOG_SEVERITY_ERROR);
192
-            return false;
192
+            return FALSE;
193 193
         }
194 194
         // Split initialisation vector and encrypted data.
195 195
         $binary = base64_decode($encrypted);
196 196
         $iv = substr($binary, 0, openssl_cipher_iv_length(self::$cipherAlgorithm));
197 197
         $data = substr($binary, openssl_cipher_iv_length(self::$cipherAlgorithm));
198
-        $key = openssl_digest($GLOBALS['TYPO3_CONF_VARS']['SYS']['encryptionKey'], self::$hashAlgorithm, true);
198
+        $key = openssl_digest($GLOBALS['TYPO3_CONF_VARS']['SYS']['encryptionKey'], self::$hashAlgorithm, TRUE);
199 199
         // Decrypt data.
200 200
         $decrypted = openssl_decrypt($data, self::$cipherAlgorithm, $key, OPENSSL_RAW_DATA, $iv);
201 201
         return $decrypted;
@@ -213,9 +213,9 @@  discard block
 block discarded – undo
213 213
     public static function getXmlFileAsString($content)
214 214
     {
215 215
         // Turn off libxml's error logging.
216
-        $libxmlErrors = libxml_use_internal_errors(true);
216
+        $libxmlErrors = libxml_use_internal_errors(TRUE);
217 217
         // Disables the functionality to allow external entities to be loaded when parsing the XML, must be kept
218
-        $previousValueOfEntityLoader = libxml_disable_entity_loader(true);
218
+        $previousValueOfEntityLoader = libxml_disable_entity_loader(TRUE);
219 219
         // Try to load XML from file.
220 220
         $xml = simplexml_load_string($content);
221 221
         // reset entity loader setting
@@ -269,9 +269,9 @@  discard block
 block discarded – undo
269 269
      */
270 270
     public static function digest($string)
271 271
     {
272
-        if (!in_array(self::$hashAlgorithm, openssl_get_md_methods(true))) {
272
+        if (!in_array(self::$hashAlgorithm, openssl_get_md_methods(TRUE))) {
273 273
             self::log('OpenSSL library doesn\'t support hash algorithm', LOG_SEVERITY_ERROR);
274
-            return false;
274
+            return FALSE;
275 275
         }
276 276
         // Hash string.
277 277
         $hashed = openssl_digest($string, self::$hashAlgorithm);
@@ -290,23 +290,23 @@  discard block
 block discarded – undo
290 290
     public static function encrypt($string)
291 291
     {
292 292
         if (
293
-            !in_array(self::$cipherAlgorithm, openssl_get_cipher_methods(true))
294
-            || !in_array(self::$hashAlgorithm, openssl_get_md_methods(true))
293
+            !in_array(self::$cipherAlgorithm, openssl_get_cipher_methods(TRUE))
294
+            || !in_array(self::$hashAlgorithm, openssl_get_md_methods(TRUE))
295 295
         ) {
296 296
             self::log('OpenSSL library doesn\'t support cipher and/or hash algorithm', LOG_SEVERITY_ERROR);
297
-            return false;
297
+            return FALSE;
298 298
         }
299 299
         if (empty($GLOBALS['TYPO3_CONF_VARS']['SYS']['encryptionKey'])) {
300 300
             self::log('No encryption key set in TYPO3 configuration', LOG_SEVERITY_ERROR);
301
-            return false;
301
+            return FALSE;
302 302
         }
303 303
         // Generate random initialisation vector.
304 304
         $iv = openssl_random_pseudo_bytes(openssl_cipher_iv_length(self::$cipherAlgorithm));
305
-        $key = openssl_digest($GLOBALS['TYPO3_CONF_VARS']['SYS']['encryptionKey'], self::$hashAlgorithm, true);
305
+        $key = openssl_digest($GLOBALS['TYPO3_CONF_VARS']['SYS']['encryptionKey'], self::$hashAlgorithm, TRUE);
306 306
         // Encrypt data.
307 307
         $encrypted = openssl_encrypt($string, self::$cipherAlgorithm, $key, OPENSSL_RAW_DATA, $iv);
308 308
         // Merge initialisation vector and encrypted data.
309
-        if ($encrypted !== false) {
309
+        if ($encrypted !== FALSE) {
310 310
             $encrypted = base64_encode($iv . $encrypted);
311 311
         }
312 312
         return $encrypted;
@@ -451,7 +451,7 @@  discard block
 block discarded – undo
451 451
                 $lang = $languageService->getLLL($isoCode, $iso639);
452 452
             }
453 453
         } elseif (\TYPO3_MODE === 'BE') {
454
-            $iso639 = $languageService->includeLLFile($file, false, true);
454
+            $iso639 = $languageService->includeLLFile($file, FALSE, TRUE);
455 455
             if (!empty($iso639['default'][$isoCode])) {
456 456
                 $lang = $languageService->getLLL($isoCode, $iso639);
457 457
             }
@@ -598,7 +598,7 @@  discard block
 block discarded – undo
598 598
     public static function isValidHttpUrl($url)
599 599
     {
600 600
         if (!GeneralUtility::isValidUrl($url)) {
601
-            return false;
601
+            return FALSE;
602 602
         }
603 603
 
604 604
         $parsed = parse_url($url);
@@ -622,7 +622,7 @@  discard block
 block discarded – undo
622 622
      *
623 623
      * @return array Merged array
624 624
      */
625
-    public static function mergeRecursiveWithOverrule(array $original, array $overrule, $addKeys = true, $includeEmptyValues = true, $enableUnsetFeature = true)
625
+    public static function mergeRecursiveWithOverrule(array $original, array $overrule, $addKeys = TRUE, $includeEmptyValues = TRUE, $enableUnsetFeature = TRUE)
626 626
     {
627 627
         \TYPO3\CMS\Core\Utility\ArrayUtility::mergeRecursiveWithOverrule($original, $overrule, $addKeys, $includeEmptyValues, $enableUnsetFeature);
628 628
         return $original;
@@ -694,7 +694,7 @@  discard block
 block discarded – undo
694 694
             ->where(
695 695
                 $queryBuilder->expr()->eq($table . '.pid', $pid),
696 696
                 $queryBuilder->expr()->eq($table . '.index_name', $queryBuilder->expr()->literal($index_name)),
697
-                self::whereExpression($table, true)
697
+                self::whereExpression($table, TRUE)
698 698
             )
699 699
             ->setMaxResults(1)
700 700
             ->execute();
@@ -712,7 +712,7 @@  discard block
 block discarded – undo
712 712
                     $queryBuilder->expr()->eq($table . '.pid', $pid),
713 713
                     $queryBuilder->expr()->eq($table . '.uid', $resArray['l18n_parent']),
714 714
                     $queryBuilder->expr()->eq($table . '.sys_language_uid', intval($languageAspect->getContentId())),
715
-                    self::whereExpression($table, true)
715
+                    self::whereExpression($table, TRUE)
716 716
                 )
717 717
                 ->setMaxResults(1)
718 718
                 ->execute();
@@ -747,7 +747,7 @@  discard block
 block discarded – undo
747 747
                     ->where(
748 748
                         $queryBuilder->expr()->eq($table . '.pid', $pid),
749 749
                         $additionalWhere,
750
-                        self::whereExpression($table, true)
750
+                        self::whereExpression($table, TRUE)
751 751
                     )
752 752
                     ->setMaxResults(10000)
753 753
                     ->execute();
@@ -787,7 +787,7 @@  discard block
 block discarded – undo
787 787
      *
788 788
      * @return string Additional WHERE expression
789 789
      */
790
-    public static function whereExpression($table, $showHidden = false)
790
+    public static function whereExpression($table, $showHidden = FALSE)
791 791
     {
792 792
         if (\TYPO3_MODE === 'FE') {
793 793
             // Should we ignore the record's hidden flag?
@@ -856,13 +856,13 @@  discard block
 block discarded – undo
856 856
         $frameworkConfiguration = $configurationManager->getConfiguration(\TYPO3\CMS\Extbase\Configuration\ConfigurationManagerInterface::CONFIGURATION_TYPE_FRAMEWORK);
857 857
 
858 858
         $extbaseClassmap = &$frameworkConfiguration['persistence']['classes'];
859
-        if ($extbaseClassmap === null) {
859
+        if ($extbaseClassmap === NULL) {
860 860
             $extbaseClassmap = [];
861 861
         }
862 862
 
863 863
         foreach ($classes as $className => $classConfig) {
864 864
             $extbaseClass = &$extbaseClassmap[$className];
865
-            if ($extbaseClass === null) {
865
+            if ($extbaseClass === NULL) {
866 866
                 $extbaseClass = [];
867 867
             }
868 868
             if (!isset($extbaseClass['mapping'])) {
@@ -888,7 +888,7 @@  discard block
 block discarded – undo
888 888
     public static function getUrl(string $url)
889 889
     {
890 890
         if (!Helper::isValidHttpUrl($url)) {
891
-            return false;
891
+            return FALSE;
892 892
         }
893 893
 
894 894
         // Get extension configuration.
Please login to merge, or discard this patch.
Classes/Command/BaseCommand.php 3 patches
Spacing   +1 added lines, -1 removed lines patch added patch discarded remove patch
@@ -274,7 +274,7 @@
 block discarded – undo
274 274
 
275 275
         if ($doc !== null) {
276 276
             // Get the closest ancestor of the current document which has a MPTR child.
277
-            $parentMptr = $doc->mets->xpath('./mets:structMap[@TYPE="LOGICAL"]//mets:div[@ID="' . $doc->toplevelId . '"]/ancestor::mets:div[./mets:mptr][1]/mets:mptr');
277
+            $parentMptr = $doc->mets->xpath('./mets:structMap[@TYPE="LOGICAL"]//mets:div[@ID="'.$doc->toplevelId.'"]/ancestor::mets:div[./mets:mptr][1]/mets:mptr');
278 278
             if (!empty($parentMptr)) {
279 279
                 $parentLocation = (string) $parentMptr[0]->attributes('http://www.w3.org/1999/xlink')->href;
280 280
 
Please login to merge, or discard this patch.
Braces   +4 added lines, -8 removed lines patch added patch discarded remove patch
@@ -38,8 +38,7 @@  discard block
 block discarded – undo
38 38
  * @subpackage dlf
39 39
  * @access public
40 40
  */
41
-class BaseCommand extends Command
42
-{
41
+class BaseCommand extends Command {
43 42
     /**
44 43
      * @var CollectionRepository
45 44
      */
@@ -79,8 +78,7 @@  discard block
 block discarded – undo
79 78
      *
80 79
      * @return bool
81 80
      */
82
-    protected function initializeRepositories($storagePid)
83
-    {
81
+    protected function initializeRepositories($storagePid) {
84 82
         if (MathUtility::canBeInterpretedAsInteger($storagePid)) {
85 83
             $configurationManager = GeneralUtility::makeInstance(ConfigurationManager::class);
86 84
             $frameworkConfiguration = $configurationManager->getConfiguration(\TYPO3\CMS\Extbase\Configuration\ConfigurationManagerInterface::CONFIGURATION_TYPE_FRAMEWORK);
@@ -159,8 +157,7 @@  discard block
 block discarded – undo
159 157
      *
160 158
      * @return bool true on success
161 159
      */
162
-    protected function saveToDatabase(Document $document)
163
-    {
160
+    protected function saveToDatabase(Document $document) {
164 161
         $success = false;
165 162
 
166 163
         $doc = $document->getDoc();
@@ -268,8 +265,7 @@  discard block
 block discarded – undo
268 265
      *
269 266
      * @return int The parent document's id.
270 267
      */
271
-    protected function getParentDocumentUidForSaving(Document $document)
272
-    {
268
+    protected function getParentDocumentUidForSaving(Document $document) {
273 269
         $doc = $document->getDoc();
274 270
 
275 271
         if ($doc !== null) {
Please login to merge, or discard this patch.
Upper-Lower-Casing   +9 added lines, -9 removed lines patch added patch discarded remove patch
@@ -96,11 +96,11 @@  discard block
 block discarded – undo
96 96
             $this->libraryRepository = $objectManager->get(LibraryRepository::class);
97 97
             $this->structureRepository = $objectManager->get(StructureRepository::class);
98 98
         } else {
99
-            return false;
99
+            return FALSE;
100 100
         }
101 101
         $this->storagePid = MathUtility::forceIntegerInRange((int) $storagePid, 0);
102 102
 
103
-        return true;
103
+        return TRUE;
104 104
     }
105 105
 
106 106
     /**
@@ -161,10 +161,10 @@  discard block
 block discarded – undo
161 161
      */
162 162
     protected function saveToDatabase(Document $document)
163 163
     {
164
-        $success = false;
164
+        $success = FALSE;
165 165
 
166 166
         $doc = $document->getDoc();
167
-        if ($doc === null) {
167
+        if ($doc === NULL) {
168 168
             return $success;
169 169
         }
170 170
         $doc->cPid = $this->storagePid;
@@ -244,7 +244,7 @@  discard block
 block discarded – undo
244 244
             $document->setPartof($this->getParentDocumentUidForSaving($document));
245 245
         }
246 246
 
247
-        if ($document->getUid() === null) {
247
+        if ($document->getUid() === NULL) {
248 248
             // new document
249 249
             $this->documentRepository->add($document);
250 250
         } else {
@@ -255,7 +255,7 @@  discard block
 block discarded – undo
255 255
         $persistenceManager = GeneralUtility::makeInstance(PersistenceManager::class);
256 256
         $persistenceManager->persistAll();
257 257
 
258
-        $success = true;
258
+        $success = TRUE;
259 259
 
260 260
         return $success;
261 261
     }
@@ -272,7 +272,7 @@  discard block
 block discarded – undo
272 272
     {
273 273
         $doc = $document->getDoc();
274 274
 
275
-        if ($doc !== null) {
275
+        if ($doc !== NULL) {
276 276
             // Get the closest ancestor of the current document which has a MPTR child.
277 277
             $parentMptr = $doc->mets->xpath('./mets:structMap[@TYPE="LOGICAL"]//mets:div[@ID="' . $doc->toplevelId . '"]/ancestor::mets:div[./mets:mptr][1]/mets:mptr');
278 278
             if (!empty($parentMptr)) {
@@ -284,7 +284,7 @@  discard block
 block discarded – undo
284 284
                 if ($parentDoc->recordId) {
285 285
                     $parentDocument = $this->documentRepository->findOneByRecordId($parentDoc->recordId);
286 286
 
287
-                    if ($parentDocument === null) {
287
+                    if ($parentDocument === NULL) {
288 288
                         // create new Document object
289 289
                         $parentDocument = GeneralUtility::makeInstance(Document::class);
290 290
                     }
@@ -296,7 +296,7 @@  discard block
 block discarded – undo
296 296
 
297 297
                     $success = $this->saveToDatabase($parentDocument);
298 298
 
299
-                    if ($success === true) {
299
+                    if ($success === TRUE) {
300 300
                         // add to index
301 301
                         Indexer::add($parentDocument);
302 302
                         return $parentDocument->getUid();
Please login to merge, or discard this patch.
Classes/Command/IndexCommand.php 3 patches
Spacing   +8 added lines, -8 removed lines patch added patch discarded remove patch
@@ -96,7 +96,7 @@  discard block
 block discarded – undo
96 96
         $this->initializeRepositories($input->getOption('pid'));
97 97
 
98 98
         if ($this->storagePid == 0) {
99
-            $io->error('ERROR: No valid PID (' . $this->storagePid . ') given.');
99
+            $io->error('ERROR: No valid PID ('.$this->storagePid.') given.');
100 100
             exit(1);
101 101
         }
102 102
 
@@ -111,13 +111,13 @@  discard block
 block discarded – undo
111 111
             if (empty($solrCoreUid) || !in_array($solrCoreUid, $allSolrCores)) {
112 112
                 $output_solrCores = [];
113 113
                 foreach ($allSolrCores as $index_name => $uid) {
114
-                    $output_solrCores[] = $uid . ' : ' . $index_name;
114
+                    $output_solrCores[] = $uid.' : '.$index_name;
115 115
                 }
116 116
                 if (empty($output_solrCores)) {
117
-                    $io->error('ERROR: No valid Solr core ("' . $input->getOption('solr') . '") given. No valid cores found on PID ' . $this->storagePid . ".\n");
117
+                    $io->error('ERROR: No valid Solr core ("'.$input->getOption('solr').'") given. No valid cores found on PID '.$this->storagePid.".\n");
118 118
                     exit(1);
119 119
                 } else {
120
-                    $io->error('ERROR: No valid Solr core ("' . $input->getOption('solr') . '") given. ' . "Valid cores are (<uid>:<index_name>):\n" . implode("\n", $output_solrCores) . "\n");
120
+                    $io->error('ERROR: No valid Solr core ("'.$input->getOption('solr').'") given. '."Valid cores are (<uid>:<index_name>):\n".implode("\n", $output_solrCores)."\n");
121 121
                     exit(1);
122 122
                 }
123 123
             }
@@ -157,7 +157,7 @@  discard block
 block discarded – undo
157 157
             $document = $this->documentRepository->findByUid($input->getOption('doc'));
158 158
 
159 159
             if ($document === null) {
160
-                $io->error('ERROR: Document with UID "' . $input->getOption('doc') . '" could not be found on PID ' . $this->storagePid . ' .');
160
+                $io->error('ERROR: Document with UID "'.$input->getOption('doc').'" could not be found on PID '.$this->storagePid.' .');
161 161
                 exit(1);
162 162
             } else {
163 163
                 $doc = Doc::getInstance($document->getLocation(), ['storagePid' => $this->storagePid], true);
@@ -182,17 +182,17 @@  discard block
 block discarded – undo
182 182
         }
183 183
 
184 184
         if ($doc === null) {
185
-            $io->error('ERROR: Document "' . $input->getOption('doc') . '" could not be loaded.');
185
+            $io->error('ERROR: Document "'.$input->getOption('doc').'" could not be loaded.');
186 186
             exit(1);
187 187
         }
188 188
 
189 189
         $document->setSolrcore($solrCoreUid);
190 190
 
191 191
         if ($dryRun) {
192
-            $io->section('DRY RUN: Would index ' . $document->getUid() . ' ("' . $document->getLocation() . '") on PID ' . $this->storagePid . ' and Solr core ' . $solrCoreUid . '.');
192
+            $io->section('DRY RUN: Would index '.$document->getUid().' ("'.$document->getLocation().'") on PID '.$this->storagePid.' and Solr core '.$solrCoreUid.'.');
193 193
         } else {
194 194
             if ($io->isVerbose()) {
195
-                $io->section('Indexing ' . $document->getUid() . ' ("' . $document->getLocation() . '") on PID ' . $this->storagePid . ' and Solr core ' . $solrCoreUid . '.');
195
+                $io->section('Indexing '.$document->getUid().' ("'.$document->getLocation().'") on PID '.$this->storagePid.' and Solr core '.$solrCoreUid.'.');
196 196
             }
197 197
             $document->setDoc($doc);
198 198
             // save to database
Please login to merge, or discard this patch.
Braces   +3 added lines, -6 removed lines patch added patch discarded remove patch
@@ -33,16 +33,14 @@  discard block
 block discarded – undo
33 33
  * @subpackage dlf
34 34
  * @access public
35 35
  */
36
-class IndexCommand extends BaseCommand
37
-{
36
+class IndexCommand extends BaseCommand {
38 37
 
39 38
     /**
40 39
      * Configure the command by defining the name, options and arguments
41 40
      *
42 41
      * @return void
43 42
      */
44
-    public function configure()
45
-    {
43
+    public function configure() {
46 44
         $this
47 45
             ->setDescription('Index single document into database and Solr.')
48 46
             ->setHelp('')
@@ -86,8 +84,7 @@  discard block
 block discarded – undo
86 84
      *
87 85
      * @return int
88 86
      */
89
-    protected function execute(InputInterface $input, OutputInterface $output)
90
-    {
87
+    protected function execute(InputInterface $input, OutputInterface $output) {
91 88
         $dryRun = $input->getOption('dry-run') != false ? true : false;
92 89
 
93 90
         $io = new SymfonyStyle($input, $output);
Please login to merge, or discard this patch.
Upper-Lower-Casing   +10 added lines, -10 removed lines patch added patch discarded remove patch
@@ -48,7 +48,7 @@  discard block
 block discarded – undo
48 48
             ->setHelp('')
49 49
             ->addOption(
50 50
                 'dry-run',
51
-                null,
51
+                NULL,
52 52
                 InputOption::VALUE_NONE,
53 53
                 'If this option is set, the files will not actually be processed but the location URI is shown.'
54 54
             )
@@ -88,7 +88,7 @@  discard block
 block discarded – undo
88 88
      */
89 89
     protected function execute(InputInterface $input, OutputInterface $output)
90 90
     {
91
-        $dryRun = $input->getOption('dry-run') != false ? true : false;
91
+        $dryRun = $input->getOption('dry-run') != FALSE ? TRUE : FALSE;
92 92
 
93 93
         $io = new SymfonyStyle($input, $output);
94 94
         $io->title($this->getDescription());
@@ -145,32 +145,32 @@  discard block
 block discarded – undo
145 145
                 $this->owner = $this->libraryRepository->findOneByIndexName((string) $input->getOption('owner'));
146 146
             }
147 147
         } else {
148
-            $this->owner = null;
148
+            $this->owner = NULL;
149 149
         }
150 150
 
151
-        $document = null;
152
-        $doc = null;
151
+        $document = NULL;
152
+        $doc = NULL;
153 153
 
154 154
         // Try to find existing document in database
155 155
         if (MathUtility::canBeInterpretedAsInteger($input->getOption('doc'))) {
156 156
 
157 157
             $document = $this->documentRepository->findByUid($input->getOption('doc'));
158 158
 
159
-            if ($document === null) {
159
+            if ($document === NULL) {
160 160
                 $io->error('ERROR: Document with UID "' . $input->getOption('doc') . '" could not be found on PID ' . $this->storagePid . ' .');
161 161
                 exit(1);
162 162
             } else {
163
-                $doc = Doc::getInstance($document->getLocation(), ['storagePid' => $this->storagePid], true);
163
+                $doc = Doc::getInstance($document->getLocation(), ['storagePid' => $this->storagePid], TRUE);
164 164
             }
165 165
 
166 166
         } else if (GeneralUtility::isValidUrl($input->getOption('doc'))) {
167
-            $doc = Doc::getInstance($input->getOption('doc'), ['storagePid' => $this->storagePid], true);
167
+            $doc = Doc::getInstance($input->getOption('doc'), ['storagePid' => $this->storagePid], TRUE);
168 168
 
169 169
             if ($doc->recordId) {
170 170
                 $document = $this->documentRepository->findOneByRecordId($doc->recordId);
171 171
             }
172 172
 
173
-            if ($document === null) {
173
+            if ($document === NULL) {
174 174
                 // create new Document object
175 175
                 $document = GeneralUtility::makeInstance(Document::class);
176 176
             }
@@ -181,7 +181,7 @@  discard block
 block discarded – undo
181 181
             }
182 182
         }
183 183
 
184
-        if ($doc === null) {
184
+        if ($doc === NULL) {
185 185
             $io->error('ERROR: Document "' . $input->getOption('doc') . '" could not be loaded.');
186 186
             exit(1);
187 187
         }
Please login to merge, or discard this patch.
Classes/Command/ReindexCommand.php 3 patches
Spacing   +7 added lines, -7 removed lines patch added patch discarded remove patch
@@ -100,7 +100,7 @@  discard block
 block discarded – undo
100 100
         $this->initializeRepositories($input->getOption('pid'));
101 101
 
102 102
         if ($this->storagePid == 0) {
103
-            $io->error('ERROR: No valid PID (' . $this->storagePid . ') given.');
103
+            $io->error('ERROR: No valid PID ('.$this->storagePid.') given.');
104 104
             exit(1);
105 105
         }
106 106
 
@@ -115,13 +115,13 @@  discard block
 block discarded – undo
115 115
             if (empty($solrCoreUid) || !in_array($solrCoreUid, $allSolrCores)) {
116 116
                 $output_solrCores = [];
117 117
                 foreach ($allSolrCores as $index_name => $uid) {
118
-                    $output_solrCores[] = $uid . ' : ' . $index_name;
118
+                    $output_solrCores[] = $uid.' : '.$index_name;
119 119
                 }
120 120
                 if (empty($output_solrCores)) {
121
-                    $io->error('ERROR: No valid Solr core ("' . $input->getOption('solr') . '") given. No valid cores found on PID ' . $this->storagePid . ".\n");
121
+                    $io->error('ERROR: No valid Solr core ("'.$input->getOption('solr').'") given. No valid cores found on PID '.$this->storagePid.".\n");
122 122
                     exit(1);
123 123
                 } else {
124
-                    $io->error('ERROR: No valid Solr core ("' . $input->getOption('solr') . '") given. ' . "Valid cores are (<uid>:<index_name>):\n" . implode("\n", $output_solrCores) . "\n");
124
+                    $io->error('ERROR: No valid Solr core ("'.$input->getOption('solr').'") given. '."Valid cores are (<uid>:<index_name>):\n".implode("\n", $output_solrCores)."\n");
125 125
                     exit(1);
126 126
                 }
127 127
             }
@@ -163,15 +163,15 @@  discard block
 block discarded – undo
163 163
             $doc = Doc::getInstance($document->getLocation(), ['storagePid' => $this->storagePid], true);
164 164
 
165 165
             if ($doc === null) {
166
-                $io->warning('WARNING: Document "' . $document->getLocation() . '" could not be loaded. Skip to next document.');
166
+                $io->warning('WARNING: Document "'.$document->getLocation().'" could not be loaded. Skip to next document.');
167 167
                 continue;
168 168
             }
169 169
 
170 170
             if ($dryRun) {
171
-                $io->writeln('DRY RUN: Would index ' . ($id + 1) . '/' . count($documents) . '  with UID "' . $document->getUid() . '" ("' . $document->getLocation() . '") on PID ' . $this->storagePid . ' and Solr core ' . $solrCoreUid . '.');
171
+                $io->writeln('DRY RUN: Would index '.($id + 1).'/'.count($documents).'  with UID "'.$document->getUid().'" ("'.$document->getLocation().'") on PID '.$this->storagePid.' and Solr core '.$solrCoreUid.'.');
172 172
             } else {
173 173
                 if ($io->isVerbose()) {
174
-                    $io->writeln(date('Y-m-d H:i:s') . ' Indexing ' . ($id + 1) . '/' . count($documents) . ' with UID "' . $document->getUid() . '" ("' . $document->getLocation() . '") on PID ' . $this->storagePid . ' and Solr core ' . $solrCoreUid . '.');
174
+                    $io->writeln(date('Y-m-d H:i:s').' Indexing '.($id + 1).'/'.count($documents).' with UID "'.$document->getUid().'" ("'.$document->getLocation().'") on PID '.$this->storagePid.' and Solr core '.$solrCoreUid.'.');
175 175
                 }
176 176
                 $document->setDoc($doc);
177 177
                 // save to database
Please login to merge, or discard this patch.
Braces   +3 added lines, -6 removed lines patch added patch discarded remove patch
@@ -32,15 +32,13 @@  discard block
 block discarded – undo
32 32
  * @subpackage dlf
33 33
  * @access public
34 34
  */
35
-class ReindexCommand extends BaseCommand
36
-{
35
+class ReindexCommand extends BaseCommand {
37 36
     /**
38 37
      * Configure the command by defining the name, options and arguments
39 38
      *
40 39
      * @return void
41 40
      */
42
-    public function configure()
43
-    {
41
+    public function configure() {
44 42
         $this
45 43
             ->setDescription('Reindex a collection into database and Solr.')
46 44
             ->setHelp('')
@@ -90,8 +88,7 @@  discard block
 block discarded – undo
90 88
      *
91 89
      * @return int
92 90
      */
93
-    protected function execute(InputInterface $input, OutputInterface $output)
94
-    {
91
+    protected function execute(InputInterface $input, OutputInterface $output) {
95 92
         $dryRun = $input->getOption('dry-run') != false ? true : false;
96 93
 
97 94
         $io = new SymfonyStyle($input, $output);
Please login to merge, or discard this patch.
Upper-Lower-Casing   +7 added lines, -7 removed lines patch added patch discarded remove patch
@@ -46,7 +46,7 @@  discard block
 block discarded – undo
46 46
             ->setHelp('')
47 47
             ->addOption(
48 48
                 'dry-run',
49
-                null,
49
+                NULL,
50 50
                 InputOption::VALUE_NONE,
51 51
                 'If this option is set, the files will not actually be processed but the location URI is shown.'
52 52
             )
@@ -92,7 +92,7 @@  discard block
 block discarded – undo
92 92
      */
93 93
     protected function execute(InputInterface $input, OutputInterface $output)
94 94
     {
95
-        $dryRun = $input->getOption('dry-run') != false ? true : false;
95
+        $dryRun = $input->getOption('dry-run') != FALSE ? TRUE : FALSE;
96 96
 
97 97
         $io = new SymfonyStyle($input, $output);
98 98
         $io->title($this->getDescription());
@@ -137,7 +137,7 @@  discard block
 block discarded – undo
137 137
                 $this->owner = $this->libraryRepository->findOneByIndexName((string) $input->getOption('owner'));
138 138
             }
139 139
         } else {
140
-            $this->owner = null;
140
+            $this->owner = NULL;
141 141
         }
142 142
 
143 143
         if (!empty($input->getOption('all'))) {
@@ -148,21 +148,21 @@  discard block
 block discarded – undo
148 148
             && !is_array($input->getOption('coll'))
149 149
         ) {
150 150
             // "coll" may be a single integer or a comma-separated list of integers.
151
-            if (empty(array_filter(GeneralUtility::intExplode(',', $input->getOption('coll'), true)))) {
151
+            if (empty(array_filter(GeneralUtility::intExplode(',', $input->getOption('coll'), TRUE)))) {
152 152
                 $io->error('ERROR: Parameter --coll|-c is not a valid comma-separated list of collection UIDs.');
153 153
                 exit(1);
154 154
             }
155 155
             // Get all documents of given collections.
156
-            $documents = $this->documentRepository->findAllByCollectionsLimited(GeneralUtility::intExplode(',', $input->getOption('coll'), true), 0);
156
+            $documents = $this->documentRepository->findAllByCollectionsLimited(GeneralUtility::intExplode(',', $input->getOption('coll'), TRUE), 0);
157 157
         } else {
158 158
             $io->error('ERROR: One of parameters --all|-a or --coll|-c must be given.');
159 159
             exit(1);
160 160
         }
161 161
 
162 162
         foreach ($documents as $id => $document) {
163
-            $doc = Doc::getInstance($document->getLocation(), ['storagePid' => $this->storagePid], true);
163
+            $doc = Doc::getInstance($document->getLocation(), ['storagePid' => $this->storagePid], TRUE);
164 164
 
165
-            if ($doc === null) {
165
+            if ($doc === NULL) {
166 166
                 $io->warning('WARNING: Document "' . $document->getLocation() . '" could not be loaded. Skip to next document.');
167 167
                 continue;
168 168
             }
Please login to merge, or discard this patch.
Classes/Command/HarvestCommand.php 3 patches
Spacing   +12 added lines, -12 removed lines patch added patch discarded remove patch
@@ -110,7 +110,7 @@  discard block
 block discarded – undo
110 110
         $this->initializeRepositories($input->getOption('pid'));
111 111
 
112 112
         if ($this->storagePid == 0) {
113
-            $io->error('ERROR: No valid PID (' . $this->storagePid . ') given.');
113
+            $io->error('ERROR: No valid PID ('.$this->storagePid.') given.');
114 114
             exit(1);
115 115
         }
116 116
 
@@ -128,13 +128,13 @@  discard block
 block discarded – undo
128 128
             if (empty($solrCoreUid) || !in_array($solrCoreUid, $allSolrCores)) {
129 129
                 $output_solrCores = [];
130 130
                 foreach ($allSolrCores as $index_name => $uid) {
131
-                    $output_solrCores[] = $uid . ' : ' . $index_name;
131
+                    $output_solrCores[] = $uid.' : '.$index_name;
132 132
                 }
133 133
                 if (empty($output_solrCores)) {
134
-                    $io->error('ERROR: No valid Solr core ("' . $input->getOption('solr') . '") given. No valid cores found on PID ' . $this->storagePid . ".\n");
134
+                    $io->error('ERROR: No valid Solr core ("'.$input->getOption('solr').'") given. No valid cores found on PID '.$this->storagePid.".\n");
135 135
                     exit(1);
136 136
                 } else {
137
-                    $io->error('ERROR: No valid Solr core ("' . $input->getOption('solr') . '") given. ' . "Valid cores are (<uid>:<index_name>):\n" . implode("\n", $output_solrCores) . "\n");
137
+                    $io->error('ERROR: No valid Solr core ("'.$input->getOption('solr').'") given. '."Valid cores are (<uid>:<index_name>):\n".implode("\n", $output_solrCores)."\n");
138 138
                     exit(1);
139 139
                 }
140 140
             }
@@ -154,7 +154,7 @@  discard block
 block discarded – undo
154 154
             exit(1);
155 155
         }
156 156
         if (!GeneralUtility::isValidUrl($baseUrl)) {
157
-            $io->error('ERROR: No valid OAI Base URL set for library with given UID ("' . $input->getOption('lib') . '").');
157
+            $io->error('ERROR: No valid OAI Base URL set for library with given UID ("'.$input->getOption('lib').'").');
158 158
             exit(1);
159 159
         } else {
160 160
             try {
@@ -195,7 +195,7 @@  discard block
 block discarded – undo
195 195
                 }
196 196
             }
197 197
             if (empty($set)) {
198
-                $io->error('ERROR: OAI interface does not provide a set with given setSpec ("' . $input->getOption('set') . '").');
198
+                $io->error('ERROR: OAI interface does not provide a set with given setSpec ("'.$input->getOption('set').'").');
199 199
                 exit(1);
200 200
             }
201 201
         }
@@ -208,7 +208,7 @@  discard block
 block discarded – undo
208 208
         }
209 209
 
210 210
         // Process all identifiers.
211
-        $baseLocation = $baseUrl . (parse_url($baseUrl, PHP_URL_QUERY) ? '&' : '?');
211
+        $baseLocation = $baseUrl.(parse_url($baseUrl, PHP_URL_QUERY) ? '&' : '?');
212 212
         foreach ($identifiers as $identifier) {
213 213
             // Build OAI GetRecord URL...
214 214
             $params = [
@@ -216,13 +216,13 @@  discard block
 block discarded – undo
216 216
                 'metadataPrefix' => 'mets',
217 217
                 'identifier' => (string) $identifier->identifier
218 218
             ];
219
-            $docLocation = $baseLocation . http_build_query($params);
219
+            $docLocation = $baseLocation.http_build_query($params);
220 220
             // ...index the document...
221 221
             $document = null;
222 222
             $doc = Doc::getInstance($docLocation, ['storagePid' => $this->storagePid], true);
223 223
 
224 224
             if ($doc === null) {
225
-                $io->warning('WARNING: Document "' . $docLocation . '" could not be loaded. Skip to next document.');
225
+                $io->warning('WARNING: Document "'.$docLocation.'" could not be loaded. Skip to next document.');
226 226
                 continue;
227 227
             }
228 228
 
@@ -239,10 +239,10 @@  discard block
 block discarded – undo
239 239
             $document->setSolrcore($solrCoreUid);
240 240
 
241 241
             if ($dryRun) {
242
-                $io->writeln('DRY RUN: Would index ' . $document->getUid() . ' ("' . $document->getLocation() . '") on PID ' . $this->storagePid . ' and Solr core ' . $solrCoreUid . '.');
242
+                $io->writeln('DRY RUN: Would index '.$document->getUid().' ("'.$document->getLocation().'") on PID '.$this->storagePid.' and Solr core '.$solrCoreUid.'.');
243 243
             } else {
244 244
                 if ($io->isVerbose()) {
245
-                    $io->writeln(date('Y-m-d H:i:s') . ' Indexing ' . $document->getUid() . ' ("' . $document->getLocation() . '") on PID ' . $this->storagePid . ' and Solr core ' . $solrCoreUid . '.');
245
+                    $io->writeln(date('Y-m-d H:i:s').' Indexing '.$document->getUid().' ("'.$document->getLocation().'") on PID '.$this->storagePid.' and Solr core '.$solrCoreUid.'.');
246 246
                 }
247 247
                 $document->setDoc($doc);
248 248
                 // save to database
@@ -267,6 +267,6 @@  discard block
 block discarded – undo
267 267
      */
268 268
     protected function handleOaiError(BaseoaipmhException $exception, SymfonyStyle $io)
269 269
     {
270
-        $io->error('ERROR: Trying to retrieve data from OAI interface resulted in error:' . "\n    " . $exception->getMessage());
270
+        $io->error('ERROR: Trying to retrieve data from OAI interface resulted in error:'."\n    ".$exception->getMessage());
271 271
     }
272 272
 }
Please login to merge, or discard this patch.
Braces   +4 added lines, -8 removed lines patch added patch discarded remove patch
@@ -36,15 +36,13 @@  discard block
 block discarded – undo
36 36
  * @subpackage dlf
37 37
  * @access public
38 38
  */
39
-class HarvestCommand extends BaseCommand
40
-{
39
+class HarvestCommand extends BaseCommand {
41 40
     /**
42 41
      * Configure the command by defining the name, options and arguments
43 42
      *
44 43
      * @return void
45 44
      */
46
-    public function configure()
47
-    {
45
+    public function configure() {
48 46
         $this
49 47
             ->setDescription('Harvest OAI-PMH contents into database and Solr.')
50 48
             ->setHelp('')
@@ -100,8 +98,7 @@  discard block
 block discarded – undo
100 98
      *
101 99
      * @return int
102 100
      */
103
-    protected function execute(InputInterface $input, OutputInterface $output)
104
-    {
101
+    protected function execute(InputInterface $input, OutputInterface $output) {
105 102
         $dryRun = $input->getOption('dry-run') != false ? true : false;
106 103
 
107 104
         $io = new SymfonyStyle($input, $output);
@@ -265,8 +262,7 @@  discard block
 block discarded – undo
265 262
      *
266 263
      * @return void
267 264
      */
268
-    protected function handleOaiError(BaseoaipmhException $exception, SymfonyStyle $io)
269
-    {
265
+    protected function handleOaiError(BaseoaipmhException $exception, SymfonyStyle $io) {
270 266
         $io->error('ERROR: Trying to retrieve data from OAI interface resulted in error:' . "\n    " . $exception->getMessage());
271 267
     }
272 268
 }
Please login to merge, or discard this patch.
Upper-Lower-Casing   +12 added lines, -12 removed lines patch added patch discarded remove patch
@@ -50,7 +50,7 @@  discard block
 block discarded – undo
50 50
             ->setHelp('')
51 51
             ->addOption(
52 52
                 'dry-run',
53
-                null,
53
+                NULL,
54 54
                 InputOption::VALUE_NONE,
55 55
                 'If this option is set, the files will not actually be processed but the location URIs are shown.'
56 56
             )
@@ -74,19 +74,19 @@  discard block
 block discarded – undo
74 74
             )
75 75
             ->addOption(
76 76
                 'from',
77
-                null,
77
+                NULL,
78 78
                 InputOption::VALUE_OPTIONAL,
79 79
                 'Datestamp (YYYY-MM-DD) to begin harvesting from.'
80 80
             )
81 81
             ->addOption(
82 82
                 'until',
83
-                null,
83
+                NULL,
84 84
                 InputOption::VALUE_OPTIONAL,
85 85
                 'Datestamp (YYYY-MM-DD) to end harvesting on.'
86 86
             )
87 87
             ->addOption(
88 88
                 'set',
89
-                null,
89
+                NULL,
90 90
                 InputOption::VALUE_OPTIONAL,
91 91
                 'Name of the set to limit harvesting to.'
92 92
             );
@@ -102,7 +102,7 @@  discard block
 block discarded – undo
102 102
      */
103 103
     protected function execute(InputInterface $input, OutputInterface $output)
104 104
     {
105
-        $dryRun = $input->getOption('dry-run') != false ? true : false;
105
+        $dryRun = $input->getOption('dry-run') != FALSE ? TRUE : FALSE;
106 106
 
107 107
         $io = new SymfonyStyle($input, $output);
108 108
         $io->title($this->getDescription());
@@ -170,7 +170,7 @@  discard block
 block discarded – undo
170 170
         ) {
171 171
             $from = new \DateTime($input->getOption('from'));
172 172
         } else {
173
-            $from = null;
173
+            $from = NULL;
174 174
         }
175 175
 
176 176
         if (
@@ -179,10 +179,10 @@  discard block
 block discarded – undo
179 179
         ) {
180 180
             $until = new \DateTime($input->getOption('until'));
181 181
         } else {
182
-            $until = null;
182
+            $until = NULL;
183 183
         }
184 184
 
185
-        $set = null;
185
+        $set = NULL;
186 186
         if (
187 187
             !is_array($input->getOption('set'))
188 188
             && !empty($input->getOption('set'))
@@ -218,10 +218,10 @@  discard block
 block discarded – undo
218 218
             ];
219 219
             $docLocation = $baseLocation . http_build_query($params);
220 220
             // ...index the document...
221
-            $document = null;
222
-            $doc = Doc::getInstance($docLocation, ['storagePid' => $this->storagePid], true);
221
+            $document = NULL;
222
+            $doc = Doc::getInstance($docLocation, ['storagePid' => $this->storagePid], TRUE);
223 223
 
224
-            if ($doc === null) {
224
+            if ($doc === NULL) {
225 225
                 $io->warning('WARNING: Document "' . $docLocation . '" could not be loaded. Skip to next document.');
226 226
                 continue;
227 227
             }
@@ -230,7 +230,7 @@  discard block
 block discarded – undo
230 230
                 $document = $this->documentRepository->findOneByRecordId($doc->recordId);
231 231
             }
232 232
 
233
-            if ($document === null) {
233
+            if ($document === NULL) {
234 234
                 // create new Document object
235 235
                 $document = GeneralUtility::makeInstance(Document::class);
236 236
             }
Please login to merge, or discard this patch.
Classes/Updates/MigrateSettings.php 3 patches
Spacing   +3 added lines, -3 removed lines patch added patch discarded remove patch
@@ -54,8 +54,8 @@  discard block
 block discarded – undo
54 54
      */
55 55
     public function getDescription(): string
56 56
     {
57
-        return 'This wizard migrates existing front end plugins of the extension Kitodo.Presentation (dlf) to' .
58
-            ' make use of the Extbase naming scheme. Therefore it updates the field values' .
57
+        return 'This wizard migrates existing front end plugins of the extension Kitodo.Presentation (dlf) to'.
58
+            ' make use of the Extbase naming scheme. Therefore it updates the field values'.
59 59
             ' "pi_flexform" within the tt_content table';
60 60
     }
61 61
 
@@ -170,7 +170,7 @@  discard block
 block discarded – undo
170 170
         foreach ($fields as $field) {
171 171
             // change the index attribute if it doesn't start with 'settings.' yet
172 172
             if (strpos($field['index'], 'settings.') === false) {
173
-                $field['index'] = 'settings.' . $field['index'];
173
+                $field['index'] = 'settings.'.$field['index'];
174 174
             }
175 175
         }
176 176
 
Please login to merge, or discard this patch.
Braces   +1 added lines, -2 removed lines patch added patch discarded remove patch
@@ -23,8 +23,7 @@
 block discarded – undo
23 23
  * Class MigrateSettings
24 24
  * @internal
25 25
  */
26
-class MigrateSettings implements UpgradeWizardInterface
27
-{
26
+class MigrateSettings implements UpgradeWizardInterface {
28 27
 
29 28
     /**
30 29
      * Return the identifier for this wizard
Please login to merge, or discard this patch.
Upper-Lower-Casing   +5 added lines, -5 removed lines patch added patch discarded remove patch
@@ -97,11 +97,11 @@  discard block
 block discarded – undo
97 97
 
98 98
             // exit if at least one update statement is not successful
99 99
             if (!((bool) $updateResult)) {
100
-                return false;
100
+                return FALSE;
101 101
             }
102 102
         }
103 103
 
104
-        return true;
104
+        return TRUE;
105 105
     }
106 106
 
107 107
     /**
@@ -113,7 +113,7 @@  discard block
 block discarded – undo
113 113
      */
114 114
     public function updateNecessary(): bool
115 115
     {
116
-        $oldSettingsFound = false;
116
+        $oldSettingsFound = FALSE;
117 117
 
118 118
         $connection = GeneralUtility::makeInstance(ConnectionPool::class)->getConnectionForTable('tt_content');
119 119
 
@@ -131,7 +131,7 @@  discard block
 block discarded – undo
131 131
         // Update the found record sets
132 132
         while ($record = $statement->fetch()) {
133 133
             $oldSettingsFound = $this->checkForOldSettings($record['pi_flexform']);
134
-            if ($oldSettingsFound === true) {
134
+            if ($oldSettingsFound === TRUE) {
135 135
                 // We found at least one field to be updated --> break here
136 136
                 break;
137 137
             }
@@ -169,7 +169,7 @@  discard block
 block discarded – undo
169 169
 
170 170
         foreach ($fields as $field) {
171 171
             // change the index attribute if it doesn't start with 'settings.' yet
172
-            if (strpos($field['index'], 'settings.') === false) {
172
+            if (strpos($field['index'], 'settings.') === FALSE) {
173 173
                 $field['index'] = 'settings.' . $field['index'];
174 174
             }
175 175
         }
Please login to merge, or discard this patch.