Passed
Push — master ( ac4e12...523107 )
by Andreas
25:53
created
lib/net/nehmer/static/midcom/interfaces.php 2 patches
Spacing   +1 added lines, -1 removed lines patch added patch discarded remove patch
@@ -68,7 +68,7 @@
 block discarded – undo
68 68
         }
69 69
 
70 70
         $config = $this->get_config_for_topic($topic);
71
-        if (   $object->name == 'index'
71
+        if ($object->name == 'index'
72 72
             && !$config->get('autoindex')) {
73 73
             return '';
74 74
         }
Please login to merge, or discard this patch.
Braces   +2 added lines, -1 removed lines patch added patch discarded remove patch
@@ -29,7 +29,8 @@
 block discarded – undo
29 29
         foreach ($qb->execute() as $article) {
30 30
             try {
31 31
                 $datamanager->set_storage($article);
32
-            } catch (midcom_error $e) {
32
+            }
33
+            catch (midcom_error $e) {
33 34
                 $e->log(MIDCOM_LOG_WARN);
34 35
                 continue;
35 36
             }
Please login to merge, or discard this patch.
lib/net/nemein/redirector/viewer.php 2 patches
Braces   +2 added lines, -1 removed lines patch added patch discarded remove patch
@@ -152,7 +152,8 @@
 block discarded – undo
152 152
                     try {
153 153
                         $topic = new midcom_db_topic($id);
154 154
                         $id = $topic->id;
155
-                    } catch (midcom_error $e) {
155
+                    }
156
+                    catch (midcom_error $e) {
156 157
                         $e->log();
157 158
                         break;
158 159
                     }
Please login to merge, or discard this patch.
Spacing   +2 added lines, -2 removed lines patch added patch discarded remove patch
@@ -19,8 +19,8 @@
 block discarded – undo
19 19
     public function _on_initialize()
20 20
     {
21 21
         // Match /
22
-        if (   $this->_config->get('redirection_type') === null
23
-            || (   $this->_topic->can_do('net.nemein.redirector:noredirect')
22
+        if ($this->_config->get('redirection_type') === null
23
+            || ($this->_topic->can_do('net.nemein.redirector:noredirect')
24 24
                 && !$this->_config->get('admin_redirection'))) {
25 25
             $this->_request_switch['redirect'] = [
26 26
                 'handler' => [net_nemein_redirector_handler_tinyurl::class, 'list'],
Please login to merge, or discard this patch.
lib/net/nemein/wiki/handler/feed.php 1 patch
Braces   +2 added lines, -1 removed lines patch added patch discarded remove patch
@@ -66,7 +66,8 @@
 block discarded – undo
66 66
             try {
67 67
                 $author = new midcom_db_person($wikipage->metadata->revisor);
68 68
                 $item->author = $author->name;
69
-            } catch (midcom_error $e) {
69
+            }
70
+            catch (midcom_error $e) {
70 71
                 $e->log();
71 72
             }
72 73
 
Please login to merge, or discard this patch.
lib/net/nemein/wiki/handler/latest.php 1 patch
Spacing   +2 added lines, -2 removed lines patch added patch discarded remove patch
@@ -50,7 +50,7 @@  discard block
 block discarded – undo
50 50
                     return;
51 51
                 }
52 52
 
53
-                if (   $history['date'] < $from
53
+                if ($history['date'] < $from
54 54
                     || $history['date'] > $to) {
55 55
                     // We can ignore revisions outside the timeframe
56 56
                     continue;
@@ -93,7 +93,7 @@  discard block
 block discarded – undo
93 93
         $this->_seek_updated($from);
94 94
 
95 95
         $i = 0;
96
-        while (   $this->_updated_pages < $this->_max_pages
96
+        while ($this->_updated_pages < $this->_max_pages
97 97
                && $i < 20) {
98 98
             // Expand seek by another two weeks
99 99
             $to = $from;
Please login to merge, or discard this patch.
lib/net/nemein/wiki/wikipage.php 2 patches
Spacing   +1 added lines, -1 removed lines patch added patch discarded remove patch
@@ -29,7 +29,7 @@
 block discarded – undo
29 29
 
30 30
     public function _on_creating()
31 31
     {
32
-        if (   $this->title == ''
32
+        if ($this->title == ''
33 33
             || !$this->topic) {
34 34
             // We must have wikiword and topic at this stage
35 35
             return false;
Please login to merge, or discard this patch.
Braces   +2 added lines, -1 removed lines patch added patch discarded remove patch
@@ -193,7 +193,8 @@
 block discarded – undo
193 193
 
194 194
         try {
195 195
             $diff_fields = $rcs_handler->get_diff($prev_version, $this_version);
196
-        } catch (midcom_error $e) {
196
+        }
197
+        catch (midcom_error $e) {
197 198
             $e->log();
198 199
             return '';
199 200
         }
Please login to merge, or discard this patch.
lib/net/nemein/rss/parser/item.php 1 patch
Spacing   +1 added lines, -1 removed lines patch added patch discarded remove patch
@@ -61,7 +61,7 @@
 block discarded – undo
61 61
     public function get_link($key = 0, $rel = 'alternate')
62 62
     {
63 63
         $link = parent::get_link($key, $rel);
64
-        if (   $rel !== 'alternate'
64
+        if ($rel !== 'alternate'
65 65
             || $key !== 0) {
66 66
             return $link;
67 67
         }
Please login to merge, or discard this patch.
lib/midcom/helper/nav/main.php 2 patches
Braces   +2 added lines, -1 removed lines patch added patch discarded remove patch
@@ -296,7 +296,8 @@
 block discarded – undo
296 296
         // the tree. This is, for example, used by the on-delete cache invalidation.
297 297
         try {
298 298
             $object = midcom::get()->dbfactory->get_object_by_guid($guid);
299
-        } catch (midcom_error $e) {
299
+        }
300
+        catch (midcom_error $e) {
300 301
             debug_add("Could not load GUID {$guid}, trying to continue anyway. Last error was: " . $e->getMessage(), MIDCOM_LOG_WARN);
301 302
         }
302 303
         if (!empty($object)) {
Please login to merge, or discard this patch.
Spacing   +2 added lines, -2 removed lines patch added patch discarded remove patch
@@ -422,7 +422,7 @@  discard block
 block discarded – undo
422 422
                     $entry = "<span class=\"{$current_class}\">{$entry}</span>";
423 423
                 }
424 424
             } else {
425
-                if (   !empty($data['napobject'][MIDCOM_NAV_GUID])
425
+                if (!empty($data['napobject'][MIDCOM_NAV_GUID])
426 426
                     && in_array($data['napobject'][MIDCOM_NAV_GUID], $skip_guids)) {
427 427
                     continue;
428 428
                 }
@@ -537,7 +537,7 @@  discard block
 block discarded – undo
537 537
                     $id = "custom-{$key}";
538 538
 
539 539
                     $url = "{$prefix}{$entry[MIDCOM_NAV_URL]}";
540
-                    if (   str_starts_with($entry[MIDCOM_NAV_URL], '/')
540
+                    if (str_starts_with($entry[MIDCOM_NAV_URL], '/')
541 541
                         || preg_match('|^https?://|', $entry[MIDCOM_NAV_URL])) {
542 542
                         $url = $entry[MIDCOM_NAV_URL];
543 543
                     }
Please login to merge, or discard this patch.
lib/midcom/helper/nav/leaf.php 2 patches
Braces   +2 added lines, -1 removed lines patch added patch discarded remove patch
@@ -52,7 +52,8 @@
 block discarded – undo
52 52
         } elseif (!empty($this->data[MIDCOM_NAV_GUID])) {
53 53
             try {
54 54
                 $this->data[MIDCOM_NAV_OBJECT] = midcom::get()->dbfactory->get_object_by_guid($this->data[MIDCOM_NAV_GUID]);
55
-            } catch (midcom_error $e) {
55
+            }
56
+            catch (midcom_error $e) {
56 57
             }
57 58
         } else {
58 59
             debug_add("Warning: The leaf {$this->leafid} of topic {$topic->id} does set neither a GUID nor an object.");
Please login to merge, or discard this patch.
Spacing   +1 added lines, -1 removed lines patch added patch discarded remove patch
@@ -28,7 +28,7 @@
 block discarded – undo
28 28
 
29 29
     public function is_readable_by(string $user_id) : bool
30 30
     {
31
-        return (   empty($this->object)
31
+        return (empty($this->object)
32 32
                 || !$this->guid
33 33
                 || !$user_id
34 34
                 || midcom::get()->auth->acl->can_do_byguid('midgard:read', $this->guid, $this->object->__midcom_class_name__, $user_id));
Please login to merge, or discard this patch.
lib/midcom/helper/metadata.php 2 patches
Braces   +2 added lines, -1 removed lines patch added patch discarded remove patch
@@ -658,7 +658,8 @@
 block discarded – undo
658 658
             && mgd_is_guid($guid)) {
659 659
             try {
660 660
                 $object = midcom::get()->dbfactory->get_object_by_guid($guid);
661
-            } catch (midcom_error $e) {
661
+            }
662
+            catch (midcom_error $e) {
662 663
                 debug_add("Failed to create a metadata instance for the GUID {$guid}: " . $e->getMessage(), MIDCOM_LOG_WARN);
663 664
                 debug_print_r("Source was:", $source);
664 665
 
Please login to merge, or discard this patch.
Spacing   +9 added lines, -9 removed lines patch added patch discarded remove patch
@@ -292,7 +292,7 @@  discard block
 block discarded – undo
292 292
     {
293 293
         if (in_array($key, $this->field_config['timebased'])) {
294 294
             // This is ugly, but seems the only possible way...
295
-            if (   isset($this->__metadata->$key)
295
+            if (isset($this->__metadata->$key)
296 296
                 && (string) $this->__metadata->$key !== "0001-01-01T00:00:00+00:00") {
297 297
                 return (int) $this->__metadata->$key->format('U');
298 298
             }
@@ -354,11 +354,11 @@  discard block
 block discarded – undo
354 354
         }
355 355
 
356 356
         $now = time();
357
-        if (   $this->get('schedulestart')
357
+        if ($this->get('schedulestart')
358 358
             && $this->get('schedulestart') > $now) {
359 359
             return false;
360 360
         }
361
-        if (   $this->get('scheduleend')
361
+        if ($this->get('scheduleend')
362 362
             && $this->get('scheduleend') < $now) {
363 363
             return false;
364 364
         }
@@ -374,9 +374,9 @@  discard block
 block discarded – undo
374 374
     public function is_object_visible_onsite() : bool
375 375
     {
376 376
         return
377
-        (   (   midcom::get()->config->get('show_hidden_objects')
377
+        ((midcom::get()->config->get('show_hidden_objects')
378 378
              || $this->is_visible())
379
-         && (   midcom::get()->config->get('show_unapproved_objects')
379
+         && (midcom::get()->config->get('show_unapproved_objects')
380 380
              || $this->is_approved())
381 381
         );
382 382
     }
@@ -434,7 +434,7 @@  discard block
 block discarded – undo
434 434
             $guid = $source;
435 435
         }
436 436
 
437
-        if (   $object === null
437
+        if ($object === null
438 438
             && mgd_is_guid($guid)) {
439 439
             try {
440 440
                 $object = midcom::get()->dbfactory->get_object_by_guid($guid);
@@ -467,7 +467,7 @@  discard block
 block discarded – undo
467 467
         }
468 468
 
469 469
         // Lock was created by the user, return "not locked"
470
-        if (   !empty(midcom::get()->auth->user->guid)
470
+        if (!empty(midcom::get()->auth->user->guid)
471 471
             && $this->get('locker') === midcom::get()->auth->user->guid) {
472 472
             return false;
473 473
         }
@@ -500,7 +500,7 @@  discard block
 block discarded – undo
500 500
      */
501 501
     public function can_unlock() : bool
502 502
     {
503
-        return (   $this->__object->can_do('midcom:unlock')
503
+        return ($this->__object->can_do('midcom:unlock')
504 504
                 || midcom::get()->auth->can_user_do('midcom:unlock', null, midcom_services_auth::class));
505 505
     }
506 506
 
@@ -511,7 +511,7 @@  discard block
 block discarded – undo
511 511
      */
512 512
     public function unlock() : bool
513 513
     {
514
-        if (   $this->can_unlock()
514
+        if ($this->can_unlock()
515 515
             && $this->__object->unlock()) {
516 516
             $this->_cache = [];
517 517
             return true;
Please login to merge, or discard this patch.