Passed
Push — master ( d76e03...3657f2 )
by Andreas
19:39
created
lib/midcom/services/auth/main.php 1 patch
Spacing   +2 added lines, -2 removed lines patch added patch discarded remove patch
@@ -238,7 +238,7 @@  discard block
 block discarded – undo
238 238
             return true;
239 239
         }
240 240
         if ($user === null) {
241
-            $user =& $this->user;
241
+            $user = & $this->user;
242 242
         }
243 243
 
244 244
         if ($user == 'EVERYONE') {
@@ -435,7 +435,7 @@  discard block
 block discarded – undo
435 435
     public function require_admin_or_ip(string $domain) : bool
436 436
     {
437 437
         $ips = midcom::get()->config->get('indexer_reindex_allowed_ips');
438
-        if (   $ips
438
+        if ($ips
439 439
             && in_array($_SERVER['REMOTE_ADDR'], $ips)) {
440 440
             if (!$this->request_sudo($domain)) {
441 441
                 throw new midcom_error('Failed to acquire SUDO rights. Aborting.');
Please login to merge, or discard this patch.
lib/midgard/admin/asgard/navigation.php 1 patch
Spacing   +13 added lines, -13 removed lines patch added patch discarded remove patch
@@ -43,7 +43,7 @@  discard block
 block discarded – undo
43 43
         parent::__construct();
44 44
 
45 45
         $this->_object = $object;
46
-        $this->_request_data =& $request_data;
46
+        $this->_request_data = & $request_data;
47 47
 
48 48
         $this->root_types = midcom_helper_reflector_tree::get_root_classes();
49 49
 
@@ -59,7 +59,7 @@  discard block
 block discarded – undo
59 59
             // we go through the path bottom up and show the first root type we find
60 60
             foreach (array_reverse($this->_object_path) as $node) {
61 61
                 foreach ($this->root_types as $root_type) {
62
-                    if (   is_a($node, $root_type)
62
+                    if (is_a($node, $root_type)
63 63
                         || midcom_helper_reflector::is_same_class($root_type, $node->__midcom_class_name__)) {
64 64
                         $this->expanded_root_types[] = $root_type;
65 65
                         break;
@@ -71,7 +71,7 @@  discard block
 block discarded – undo
71 71
 
72 72
     protected function _is_collapsed(string $type, int $total) : bool
73 73
     {
74
-        return (   $total > $this->_config->get('max_navigation_entries')
74
+        return ($total > $this->_config->get('max_navigation_entries')
75 75
                 && empty($_GET['show_all_' . $type]));
76 76
     }
77 77
 
@@ -87,7 +87,7 @@  discard block
 block discarded – undo
87 87
         foreach ($ref->get_child_classes() as $class) {
88 88
             $qb = $ref->_child_objects_type_qb($class, $object, false);
89 89
 
90
-            if (   !$qb
90
+            if (!$qb
91 91
                 || !($count = $qb->count_unchecked())) {
92 92
                 continue;
93 93
             }
@@ -133,7 +133,7 @@  discard block
 block discarded – undo
133 133
     {
134 134
         $qb = $ref->_root_objects_qb();
135 135
 
136
-        if (   !$qb
136
+        if (!$qb
137 137
             || !($total = $qb->count_unchecked())) {
138 138
             return;
139 139
         }
@@ -211,7 +211,7 @@  discard block
 block discarded – undo
211 211
         }
212 212
 
213 213
         echo "<a href=\"" . midcom_connection::get_url('self') . "__mfa/asgard/object/{$mode}/{$object->guid}/\" title=\"GUID: {$object->guid}, ID: {$object->id}\">{$icon}{$label}</a>\n";
214
-        if (   $selected
214
+        if ($selected
215 215
             || $autoexpand) {
216 216
             $this->_list_child_elements($object, $level + 1);
217 217
         }
@@ -231,7 +231,7 @@  discard block
 block discarded – undo
231 231
                 continue;
232 232
             }
233 233
 
234
-            if (   method_exists($class, 'navigation')
234
+            if (method_exists($class, 'navigation')
235 235
                 && ($this->_request_data['plugin_name'] == "asgard_{$component}")) {
236 236
                 $this->_request_data['expanded'] = true;
237 237
                 midcom_show_style('midgard_admin_asgard_navigation_section_header');
@@ -265,13 +265,13 @@  discard block
 block discarded – undo
265 265
         if ($this->_is_selected($object)) {
266 266
             $css_class .= ' selected';
267 267
         }
268
-        if (   is_object($this->_object)
269
-            && (   $object->guid == $this->_object->guid
270
-                || (   is_a($this->_object, midcom_db_parameter::class)
268
+        if (is_object($this->_object)
269
+            && ($object->guid == $this->_object->guid
270
+                || (is_a($this->_object, midcom_db_parameter::class)
271 271
                     && $object->guid == $this->_object->parentguid))) {
272 272
             $css_class .= ' current';
273 273
         }
274
-        if ( !$object->can_do('midgard:update')) {
274
+        if (!$object->can_do('midgard:update')) {
275 275
             $css_class .= ' readonly';
276 276
         }
277 277
         return $css_class;
@@ -314,7 +314,7 @@  discard block
 block discarded – undo
314 314
 
315 315
         // If the regular expression has been set, check which types should be shown
316 316
         if ($regexp !== '//') {
317
-            $label_mapping = array_filter($label_mapping, function ($root_type) use ($regexp, $exclude) {
317
+            $label_mapping = array_filter($label_mapping, function($root_type) use ($regexp, $exclude) {
318 318
                 return preg_match($regexp, $root_type) == $exclude;
319 319
             }, ARRAY_FILTER_USE_KEY);
320 320
         }
@@ -344,7 +344,7 @@  discard block
 block discarded – undo
344 344
          * click if nothing is expanded
345 345
          */
346 346
         $types_shown = false;
347
-        if (    !empty($expanded_types)
347
+        if (!empty($expanded_types)
348 348
              && midgard_admin_asgard_plugin::get_preference('navigation_type') === 'dropdown') {
349 349
             $this->_draw_select_navigation();
350 350
             $types_shown = true;
Please login to merge, or discard this patch.
lib/midgard/admin/asgard/style/ASGARD_ROOT.php 1 patch
Spacing   +1 added lines, -1 removed lines patch added patch discarded remove patch
@@ -16,7 +16,7 @@
 block discarded – undo
16 16
 
17 17
                             $edited = (int) $view_metadata->get('revised');
18 18
                             $revision = $view_metadata->get('revision');
19
-                            if (   $revision > 1
19
+                            if ($revision > 1
20 20
                                 && $edited != $created) {
21 21
                                 try {
22 22
                                     $editor = new midcom_db_person($view_metadata->get('revisor'));
Please login to merge, or discard this patch.
lib/midgard/admin/asgard/plugin.php 1 patch
Spacing   +2 added lines, -2 removed lines patch added patch discarded remove patch
@@ -164,7 +164,7 @@  discard block
 block discarded – undo
164 164
 
165 165
         $parent = $object->get_parent();
166 166
 
167
-        if (   is_a($object, midcom_db_parameter::class)
167
+        if (is_a($object, midcom_db_parameter::class)
168 168
             && !empty($parent->guid)) {
169 169
             // Add "parameters" list to breadcrumb if we're in a param
170 170
             $breadcrumb[] = [
@@ -174,7 +174,7 @@  discard block
 block discarded – undo
174 174
         }
175 175
 
176 176
         $i = 0;
177
-        while (   !empty($parent->guid)
177
+        while (!empty($parent->guid)
178 178
                && $i < 10) {
179 179
             $i++;
180 180
             $parent_reflector = midcom_helper_reflector::get($parent);
Please login to merge, or discard this patch.
lib/midgard/admin/asgard/schemadb.php 1 patch
Spacing   +4 added lines, -4 removed lines patch added patch discarded remove patch
@@ -64,7 +64,7 @@  discard block
 block discarded – undo
64 64
 
65 65
     protected function add_string_field(string $key, string $type)
66 66
     {
67
-        if (   $key == 'component'
67
+        if ($key == 'component'
68 68
             && $type == midcom_db_topic::class) {
69 69
             $this->_add_component_dropdown($key);
70 70
             return;
@@ -134,12 +134,12 @@  discard block
 block discarded – undo
134 134
         parent::add_longtext_field($key);
135 135
 
136 136
         // Check the user preference and configuration
137
-        if (   in_array($key, ['content', 'description'])
137
+        if (in_array($key, ['content', 'description'])
138 138
             && midgard_admin_asgard_plugin::get_preference('tinymce_enabled')) {
139 139
             $this->schema['fields'][$key]['widget'] = 'tinymce';
140 140
         }
141 141
 
142
-        if (   in_array($key, ['value', 'code'])
142
+        if (in_array($key, ['value', 'code'])
143 143
             && midgard_admin_asgard_plugin::get_preference('codemirror_enabled')) {
144 144
             $this->schema['fields'][$key]['widget'] = 'codemirror';
145 145
         }
@@ -257,7 +257,7 @@  discard block
 block discarded – undo
257 257
         if ($score1 > $score2) {
258 258
             return 1;
259 259
         }
260
-        if (   $score1 < 3
260
+        if ($score1 < 3
261 261
             || $score1 > 6) {
262 262
             return strnatcmp($first, $second);
263 263
         }
Please login to merge, or discard this patch.
lib/midgard/admin/asgard/handler/component/configuration.php 1 patch
Spacing   +2 added lines, -2 removed lines patch added patch discarded remove patch
@@ -277,7 +277,7 @@  discard block
 block discarded – undo
277 277
     {
278 278
         $success = true;
279 279
         foreach ($this->_request_data['config']->_global as $global_key => $global_value) {
280
-            if (   isset($config[$global_key])
280
+            if (isset($config[$global_key])
281 281
                 && $config[$global_key] != $global_value) {
282 282
                 continue;
283 283
                 // Skip the ones we will set next
@@ -290,7 +290,7 @@  discard block
 block discarded – undo
290 290
         }
291 291
 
292 292
         foreach ($config as $key => $value) {
293
-            if (   is_array($value)
293
+            if (is_array($value)
294 294
                 || is_object($value)) {
295 295
                 /**
296 296
                  * See http://trac.midgard-project.org/ticket/1442
Please login to merge, or discard this patch.
lib/midgard/admin/asgard/schemadb/config.php 1 patch
Spacing   +2 added lines, -2 removed lines patch added patch discarded remove patch
@@ -61,11 +61,11 @@
 block discarded – undo
61 61
                 $fields[$key] = $this->detect_schema($key, $value);
62 62
             }
63 63
 
64
-            if (   !isset($this->config->_local[$key])
64
+            if (!isset($this->config->_local[$key])
65 65
                 || $this->config->_local[$key] == $this->config->_global[$key]) {
66 66
                 // No local configuration setting, note to user that this is the global value
67 67
                 $fields[$key]['title'] = $schema->get_l10n()->get($fields[$key]['title']);
68
-                $fields[$key]['title'] .= " <span class=\"global\">(" . midcom::get()->i18n->get_string('global value', 'midgard.admin.asgard') .")</span>";
68
+                $fields[$key]['title'] .= " <span class=\"global\">(" . midcom::get()->i18n->get_string('global value', 'midgard.admin.asgard') . ")</span>";
69 69
             }
70 70
         }
71 71
 
Please login to merge, or discard this patch.
lib/midcom/admin/help/help.php 1 patch
Spacing   +3 added lines, -3 removed lines patch added patch discarded remove patch
@@ -179,9 +179,9 @@  discard block
 block discarded – undo
179 179
         $files = [];
180 180
         $pattern = $component_dir . '*.{' . $this->_i18n->get_current_language() . ',' . $this->_i18n->get_fallback_language() . '}.txt';
181 181
 
182
-        foreach (glob($pattern, GLOB_NOSORT|GLOB_BRACE) as $path) {
182
+        foreach (glob($pattern, GLOB_NOSORT | GLOB_BRACE) as $path) {
183 183
             $entry = basename($path);
184
-            if (   str_starts_with($entry, 'index')
184
+            if (str_starts_with($entry, 'index')
185 185
                 || str_starts_with($entry, 'handler')
186 186
                 || str_starts_with($entry, 'urlmethod')) {
187 187
                 // Ignore dotfiles, handlers & index.lang.txt
@@ -232,7 +232,7 @@  discard block
 block discarded – undo
232 232
         $data = [];
233 233
 
234 234
         $exec_path = midcom::get()->componentloader->path_to_snippetpath($component) . '/exec/';
235
-        if (   !is_dir($exec_path)
235
+        if (!is_dir($exec_path)
236 236
             || !is_readable($exec_path)) {
237 237
             // Directory not accessible, skip loading it
238 238
             return $data;
Please login to merge, or discard this patch.
lib/org/openpsa/calendar/event.php 1 patch
Spacing   +2 added lines, -2 removed lines patch added patch discarded remove patch
@@ -141,7 +141,7 @@  discard block
 block discarded – undo
141 141
         }
142 142
 
143 143
         //Check up
144
-        if (   !$this->up
144
+        if (!$this->up
145 145
             && $this->title != '__org_openpsa_calendar') {
146 146
             $root_event = org_openpsa_calendar_interface::find_root_event();
147 147
             $this->up = $root_event->id;
@@ -166,7 +166,7 @@  discard block
 block discarded – undo
166 166
 
167 167
     private function _check_timerange() : bool
168 168
     {
169
-        if (   !$this->start
169
+        if (!$this->start
170 170
             || !$this->end) {
171 171
             debug_add('Event must have start and end timestamps');
172 172
             midcom_connection::set_error(MGD_ERR_RANGE);
Please login to merge, or discard this patch.