Test Setup Failed
Pull Request — master (#190)
by
unknown
12:55 queued 03:21
created
lib/midcom/core/privilege.php 1 patch
Braces   +2 added lines, -1 removed lines patch added patch discarded remove patch
@@ -145,7 +145,8 @@
 block discarded – undo
145 145
         if (is_null($this->__cached_object)) {
146 146
             try {
147 147
                 $this->__cached_object = midcom::get()->dbfactory->get_object_by_guid($this->objectguid);
148
-            } catch (midcom_error $e) {
148
+            }
149
+            catch (midcom_error $e) {
149 150
                 return false;
150 151
             }
151 152
         }
Please login to merge, or discard this patch.
lib/midcom/core/context.php 1 patch
Braces   +2 added lines, -1 removed lines patch added patch discarded remove patch
@@ -181,7 +181,8 @@
 block discarded – undo
181 181
         } else {
182 182
             try {
183 183
                 $root_node = midcom_db_topic::get_cached($guid);
184
-            } catch (midcom_error $e) {
184
+            }
185
+            catch (midcom_error $e) {
185 186
                 if ($e instanceof midcom_error_forbidden) {
186 187
                     throw $e;
187 188
                 }
Please login to merge, or discard this patch.
lib/midgard/admin/asgard/handler/component/configuration.php 1 patch
Braces   +2 added lines, -1 removed lines patch added patch discarded remove patch
@@ -405,7 +405,8 @@
 block discarded – undo
405 405
 
406 406
         try {
407 407
             $this->_check_config($config);
408
-        } catch (Exception $e) {
408
+        }
409
+        catch (Exception $e) {
409 410
             midcom::get()->uimessages->add(
410 411
                 $this->_l10n_midcom->get('component configuration'),
411 412
                 sprintf($this->_l10n->get('configuration save failed: %s'), $e->getMessage()),
Please login to merge, or discard this patch.
lib/midgard/admin/asgard/toolbar.php 1 patch
Braces   +2 added lines, -1 removed lines patch added patch discarded remove patch
@@ -117,7 +117,8 @@
 block discarded – undo
117 117
                                 }
118 118
                                 break;
119 119
                         }
120
-                    } catch (midcom_error $e) {
120
+                    }
121
+                    catch (midcom_error $e) {
121 122
                         $e->log();
122 123
                     }
123 124
                 }
Please login to merge, or discard this patch.
lib/midgard/admin/user/handler/list.php 1 patch
Braces   +2 added lines, -1 removed lines patch added patch discarded remove patch
@@ -217,7 +217,8 @@
 block discarded – undo
217 217
 
218 218
         try {
219 219
             $account = new midcom_core_account($person);
220
-        } catch (midcom_error $e) {
220
+        }
221
+        catch (midcom_error $e) {
221 222
             midcom::get()->uimessages->add($this->_l10n->get('midgard.admin.user'), sprintf($this->_l10n->get('failed to get the user with id %s'), $person->id), 'error');
222 223
             return;
223 224
         }
Please login to merge, or discard this patch.
lib/org/openpsa/projects/workflow.php 1 patch
Braces   +2 added lines, -1 removed lines patch added patch discarded remove patch
@@ -356,7 +356,8 @@
 block discarded – undo
356 356
                 // The agreement allows invoicing only approved hours, therefore don't mark unapproved
357 357
                 $qb->add_constraint('metadata.isapproved', '=', true);
358 358
             }
359
-        } catch (midcom_error $e) {
359
+        }
360
+        catch (midcom_error $e) {
360 361
             $e->log();
361 362
         }
362 363
 
Please login to merge, or discard this patch.
lib/org/openpsa/projects/handler/task/crud.php 1 patch
Braces   +6 added lines, -3 removed lines patch added patch discarded remove patch
@@ -121,7 +121,8 @@  discard block
 block discarded – undo
121 121
                     );
122 122
                 }
123 123
 
124
-            } catch (midcom_error $e) {
124
+            }
125
+            catch (midcom_error $e) {
125 126
             }
126 127
         }
127 128
 
@@ -151,7 +152,8 @@  discard block
 block discarded – undo
151 152
             // This task is to be connected to a project
152 153
             try {
153 154
                 $this->_parent = new org_openpsa_projects_project($args[1]);
154
-            } catch (midcom_error $e) {
155
+            }
156
+            catch (midcom_error $e) {
155 157
                 return false;
156 158
             }
157 159
 
@@ -163,7 +165,8 @@  discard block
 block discarded – undo
163 165
         } elseif ($this->_mode == 'delete') {
164 166
             try {
165 167
                 $this->_parent = new org_openpsa_projects_project($this->_object->project);
166
-            } catch (midcom_error $e) {
168
+            }
169
+            catch (midcom_error $e) {
167 170
                 $e->log();
168 171
             }
169 172
         }
Please login to merge, or discard this patch.
lib/org/openpsa/projects/handler/task/list.php 1 patch
Braces   +4 added lines, -2 removed lines patch added patch discarded remove patch
@@ -426,7 +426,8 @@  discard block
 block discarded – undo
426 426
             $prefix = midcom_core_context::get()->get_key(MIDCOM_CONTEXT_ANCHORPREFIX);
427 427
             $ret['project'] = '<a href="' . $prefix . 'project/' . $project->guid . '/">' . $project->title . '</a>';
428 428
             $ret['index_project'] = $project->title;
429
-        } catch (midcom_error $e) {
429
+        }
430
+        catch (midcom_error $e) {
430 431
             $e->log();
431 432
         }
432 433
 
@@ -437,7 +438,8 @@  discard block
 block discarded – undo
437 438
                 $customer_url = "{$this->_request_data['contacts_url']}group/{$customer->guid}/";
438 439
                 $ret['customer'] = "<a href='{$customer_url}' title='{$customer->official}'>{$customer->get_label()}</a>";
439 440
                 $ret['index_customer'] = $customer->name;
440
-            } catch (midcom_error $e) {
441
+            }
442
+            catch (midcom_error $e) {
441 443
                 $ret['customer'] = '';
442 444
                 $ret['index_customer'] = '';
443 445
             }
Please login to merge, or discard this patch.
lib/org/openpsa/projects/task.php 1 patch
Braces   +6 added lines, -3 removed lines patch added patch discarded remove patch
@@ -240,7 +240,8 @@  discard block
 block discarded – undo
240 240
                     $salesproject = org_openpsa_sales_salesproject_dba::get_cached($agreement->salesproject);
241 241
                     $this->customer = $salesproject->customer;
242 242
                 }
243
-            } catch (midcom_error $e) {
243
+            }
244
+            catch (midcom_error $e) {
244 245
             }
245 246
         } else {
246 247
             // No agreement, we can't be invoiceable
@@ -275,7 +276,8 @@  discard block
 block discarded – undo
275 276
         try {
276 277
             $agreement = new org_openpsa_sales_salesproject_deliverable_dba($this->agreement);
277 278
             $agreement->update_units($this->id, $hours);
278
-        } catch (midcom_error $e) {
279
+        }
280
+        catch (midcom_error $e) {
279 281
         }
280 282
 
281 283
         if ($update) {
@@ -302,7 +304,8 @@  discard block
 block discarded – undo
302 304
         try {
303 305
             $agreement = new org_openpsa_sales_salesproject_deliverable_dba($this->agreement);
304 306
             $invoice_approved_only = $agreement->invoiceApprovedOnly;
305
-        } catch (midcom_error $e) {
307
+        }
308
+        catch (midcom_error $e) {
306 309
             $invoice_approved_only = false;
307 310
         }
308 311
 
Please login to merge, or discard this patch.