Passed
Push — master ( 87de88...fdfb7f )
by Andreas
11:09
created
lib/org/openpsa/relatedto/style/show_entries_html.php 2 patches
Spacing   +1 added lines, -1 removed lines patch added patch discarded remove patch
@@ -46,7 +46,7 @@
 block discarded – undo
46 46
             <?php
47 47
             //index is needed for sorting
48 48
             echo "'index_name',";
49
-            echo "'" . $data['l10n']->get('entry title') ."',";
49
+            echo "'" . $data['l10n']->get('entry title') . "',";
50 50
             echo "'" . $data['l10n']->get('entry text') . "',";
51 51
             echo "'" . $data['l10n']->get('entry created') . "',";
52 52
             echo "'index_creator', '" . $data['l10n_midcom']->get('creator') . "',";
Please login to merge, or discard this patch.
Braces   +2 added lines, -1 removed lines patch added patch discarded remove patch
@@ -25,7 +25,8 @@
 block discarded – undo
25 25
             $row['creator_index'] = $creator->rname;
26 26
             $creator_card = org_openpsa_widgets_contact::get($entry->metadata->creator);
27 27
             $row['creator'] = $creator_card->show_inline();
28
-        } catch (midcom_error) {
28
+        }
29
+        catch (midcom_error) {
29 30
             $row['creator_index'] = '';
30 31
             $row['creator'] = '';
31 32
         }
Please login to merge, or discard this patch.
lib/midgard/admin/asgard/handler/object/attachments.php 1 patch
Spacing   +3 added lines, -3 removed lines patch added patch discarded remove patch
@@ -98,13 +98,13 @@  discard block
 block discarded – undo
98 98
         }
99 99
 
100 100
         $mimetype = $request->request->get('midgard_admin_asgard_mimetype');
101
-        if (   !empty($mimetype)
101
+        if (!empty($mimetype)
102 102
             && $local_file->mimetype != $mimetype) {
103 103
             $local_file->mimetype = $mimetype;
104 104
             $needs_update = true;
105 105
         }
106 106
 
107
-        if (   $needs_update
107
+        if ($needs_update
108 108
             && !$local_file->update()) {
109 109
             return null;
110 110
         }
@@ -234,7 +234,7 @@  discard block
 block discarded – undo
234 234
         $this->bind_view_to_object($this->_file);
235 235
 
236 236
         $filename = $this->_process_form($request);
237
-        if (   $filename
237
+        if ($filename
238 238
             && $filename != $data['filename']) {
239 239
             return $this->relocate_to_file($filename);
240 240
         }
Please login to merge, or discard this patch.
lib/org/openpsa/slideshow/image.php 1 patch
Braces   +4 added lines, -2 removed lines patch added patch discarded remove patch
@@ -48,7 +48,8 @@  discard block
 block discarded – undo
48 48
 
49 49
         try {
50 50
             $folder = midcom_db_topic::get_cached($this->topic);
51
-        } catch (midcom_error $e) {
51
+        }
52
+        catch (midcom_error $e) {
52 53
             $e->log();
53 54
         }
54 55
         $folder->delete_attachment(self::FOLDER_THUMBNAIL);
@@ -58,7 +59,8 @@  discard block
 block discarded – undo
58 59
     {
59 60
         try {
60 61
             return new midcom_db_attachment($this->$type);
61
-        } catch (midcom_error $e) {
62
+        }
63
+        catch (midcom_error $e) {
62 64
             $e->log();
63 65
             return null;
64 66
         }
Please login to merge, or discard this patch.
lib/org/openpsa/relatedto/plugin.php 1 patch
Braces   +2 added lines, -1 removed lines patch added patch discarded remove patch
@@ -104,7 +104,8 @@
 block discarded – undo
104 104
     {
105 105
         $ret = ['org_openpsa_relatedto' => []];
106 106
         foreach ($array as $rel) {
107
-            if (!midcom::get()->dbfactory->is_a($rel, org_openpsa_relatedto_dba::class)) { //Matches also 'org_openpsa_relatedto'
107
+            if (!midcom::get()->dbfactory->is_a($rel, org_openpsa_relatedto_dba::class)) {
108
+//Matches also 'org_openpsa_relatedto'
108 109
                 //Wrong type of object found in array, cruelly abort the whole procedure
109 110
                 return null;
110 111
             }
Please login to merge, or discard this patch.
lib/midcom/core/dbaobject.php 2 patches
Spacing   +2 added lines, -2 removed lines patch added patch discarded remove patch
@@ -94,7 +94,7 @@  discard block
 block discarded – undo
94 94
             }
95 95
             $this->set_object($id);
96 96
         } else {
97
-            if (   is_int($id)
97
+            if (is_int($id)
98 98
                 && $id < 1) {
99 99
                 throw new midcom_error($id . ' is not a valid database ID');
100 100
             }
@@ -108,7 +108,7 @@  discard block
 block discarded – undo
108 108
             }
109 109
 
110 110
             //Some useful information for performance tuning
111
-            if (   midcom::get()->config->get('log_level') >= MIDCOM_LOG_DEBUG
111
+            if (midcom::get()->config->get('log_level') >= MIDCOM_LOG_DEBUG
112 112
                 && $this->__object->guid) {
113 113
                 static $guids = [];
114 114
                 static $total = 0;
Please login to merge, or discard this patch.
Braces   +2 added lines, -1 removed lines patch added patch discarded remove patch
@@ -102,7 +102,8 @@
 block discarded – undo
102 102
             try {
103 103
                 $mgdschemaclass = $this->__mgdschema_class_name__;
104 104
                 $this->set_object(new $mgdschemaclass($id));
105
-            } catch (mgd_exception $e) {
105
+            }
106
+            catch (mgd_exception $e) {
106 107
                 debug_add('Constructing ' . $this->__mgdschema_class_name__ . ' object ' . $id . ' failed, reason: ' . $e->getMessage(), MIDCOM_LOG_WARN);
107 108
                 throw new midcom_error_midgard($e, $id);
108 109
             }
Please login to merge, or discard this patch.
lib/midcom/services/indexer/document.php 2 patches
Spacing   +1 added lines, -1 removed lines patch added patch discarded remove patch
@@ -405,7 +405,7 @@
 block discarded – undo
405 405
     {
406 406
         // Complete fields
407 407
         $this->indexed = time();
408
-        if (   $this->author == ''
408
+        if ($this->author == ''
409 409
             && isset($this->creator->name)) {
410 410
             $this->author = $this->creator->name;
411 411
         }
Please login to merge, or discard this patch.
Braces   +2 added lines, -1 removed lines patch added patch discarded remove patch
@@ -510,7 +510,8 @@
 block discarded – undo
510 510
     {
511 511
         try {
512 512
             return midcom_db_person::get_cached($guid);
513
-        } catch (midcom_error) {
513
+        }
514
+        catch (midcom_error) {
514 515
             return null;
515 516
         }
516 517
     }
Please login to merge, or discard this patch.
lib/org/openpsa/contacts/duplicates/merge.php 1 patch
Spacing   +4 added lines, -4 removed lines patch added patch discarded remove patch
@@ -88,7 +88,7 @@  discard block
 block discarded – undo
88 88
                             $dup = $this->check_duplicate($results, $result, $conf['duplicate_check']);
89 89
 
90 90
                             if ($dup !== true) {
91
-                                if (   !is_object($dup)
91
+                                if (!is_object($dup)
92 92
                                     || !array_key_exists($dup->id, $todelete)) {
93 93
                                     $todelete[$result->id] = $result;
94 94
                                 }
@@ -97,7 +97,7 @@  discard block
 block discarded – undo
97 97
                         }
98 98
                     }
99 99
                 }
100
-                if (   $needs_update
100
+                if ($needs_update
101 101
                     && !$result->update()) {
102 102
                     throw new midcom_error("Failed to update {$classname} #{$result->id}, errstr: " . midcom_connection::get_error_string());
103 103
                 }
@@ -145,7 +145,7 @@  discard block
 block discarded – undo
145 145
         }
146 146
 
147 147
         foreach ($results as $result) {
148
-            if (   $result->$field === $object->$field
148
+            if ($result->$field === $object->$field
149 149
                 && $result->id !== $object->id) {
150 150
                 return $result;
151 151
             }
@@ -163,7 +163,7 @@  discard block
 block discarded – undo
163 163
         $changed = false;
164 164
         foreach ($person2 as $property => $value) {
165 165
             // Copy only simple properties not marked to be skipped missing from person1
166
-            if (   !empty($person2->$property)
166
+            if (!empty($person2->$property)
167 167
                 && empty($person1->$property)
168 168
                 && !isset($skip_properties[$property])
169 169
                 && is_scalar($value)) {
Please login to merge, or discard this patch.
lib/midcom/helper/nav/leaf.php 2 patches
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.
Braces   +2 added lines, -1 removed lines patch added patch discarded remove patch
@@ -49,7 +49,8 @@
 block discarded – undo
49 49
         } elseif (!empty($this->data[MIDCOM_NAV_GUID])) {
50 50
             try {
51 51
                 $this->data[MIDCOM_NAV_OBJECT] = midcom::get()->dbfactory->get_object_by_guid($this->data[MIDCOM_NAV_GUID]);
52
-            } catch (midcom_error) {
52
+            }
53
+            catch (midcom_error) {
53 54
             }
54 55
         } else {
55 56
             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.
lib/midcom/helper/nav/node.php 1 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 (   !$user_id
31
+        return (!$user_id
32 32
                 || !$this->guid
33 33
                 || midcom::get()->auth->acl->can_do_byguid('midgard:read', $this->guid, midcom_db_topic::class, $user_id));
34 34
     }
Please login to merge, or discard this patch.