Passed
Push — master ( dc3f28...9cb9a1 )
by Andreas
16:51
created
lib/org/openpsa/invoices/handler/projects.php 1 patch
Braces   +6 added lines, -3 removed lines patch added patch discarded remove patch
@@ -49,7 +49,8 @@  discard block
 block discarded – undo
49 49
             try {
50 50
                 $deliverable = org_openpsa_sales_salesproject_deliverable_dba::get_cached($task->get_agreement());
51 51
                 $item->deliverable = $deliverable->id;
52
-            } catch (midcom_error $e) {
52
+            }
53
+            catch (midcom_error $e) {
53 54
                 $e->log();
54 55
             }
55 56
             $item->invoice = $invoice->id;
@@ -121,7 +122,8 @@  discard block
 block discarded – undo
121 122
                 $customer = org_openpsa_contacts_group_dba::get_cached($customer_id);
122 123
                 $data['customer_label'] = $customer->official;
123 124
                 $data['disabled'] = '';
124
-            } catch (midcom_error) {
125
+            }
126
+            catch (midcom_error) {
125 127
                 $data['customer_label'] = $this->_l10n->get('no customer');
126 128
                 $data['disabled'] = ' disabled="disabled"';
127 129
             }
@@ -144,7 +146,8 @@  discard block
 block discarded – undo
144 146
                     } else {
145 147
                         $data['invoiceable_units'] = $task->plannedHours;
146 148
                     }
147
-                } catch (midcom_error $e) {
149
+                }
150
+                catch (midcom_error $e) {
148 151
                     $e->log();
149 152
                     if ($this->_config->get('default_hourly_price')) {
150 153
                         $data['default_price'] = $this->_config->get('default_hourly_price');
Please login to merge, or discard this patch.
lib/org/openpsa/slideshow/style/edit.php 1 patch
Braces   +2 added lines, -1 removed lines patch added patch discarded remove patch
@@ -21,7 +21,8 @@
 block discarded – undo
21 21
         $original = new midcom_db_attachment($image->attachment);
22 22
         $original_url = midcom_db_attachment::get_url($original);
23 23
         $name = $original->name;
24
-    } catch (midcom_error) {
24
+    }
25
+    catch (midcom_error) {
25 26
         $url = MIDCOM_STATIC_URL . '/stock-icons/mime/gnome-text-blank.png';
26 27
         $name = $data['l10n']->get('attachment missing');
27 28
         $original_url = '';
Please login to merge, or discard this patch.
lib/org/openpsa/reports/viewer.php 1 patch
Braces   +2 added lines, -1 removed lines patch added patch discarded remove patch
@@ -98,7 +98,8 @@
 block discarded – undo
98 98
             $node_guid = $siteconfig->get_node_guid($component);
99 99
             try {
100 100
                 $available_generators[$component] = midcom_db_topic::get_cached($node_guid)->get_label();
101
-            } catch (midcom_error) {
101
+            }
102
+            catch (midcom_error) {
102 103
                 debug_add("topic for component '{$component}' not found or accessible");
103 104
             }
104 105
         }
Please login to merge, or discard this patch.
lib/org/openpsa/relatedto/exec/delete_dangling_links.php 1 patch
Braces   +2 added lines, -1 removed lines patch added patch discarded remove patch
@@ -25,7 +25,8 @@
 block discarded – undo
25 25
     try {
26 26
         midcom::get()->dbfactory->get_object_by_guid($result->fromGuid);
27 27
         midcom::get()->dbfactory->get_object_by_guid($result->toGuid);
28
-    } catch (midcom_error) {
28
+    }
29
+    catch (midcom_error) {
29 30
         echo $i . "/" . $total . ": Deleting relatedto #" . $result->id . "\n";
30 31
         $result->delete();
31 32
     }
Please login to merge, or discard this patch.
lib/org/openpsa/relatedto/handler/relatedto.php 2 patches
Braces   +6 added lines, -3 removed lines patch added patch discarded remove patch
@@ -107,7 +107,8 @@  discard block
 block discarded – undo
107 107
             //TODO: check for duplicates ?
108 108
             try {
109 109
                 $result = ['other_obj' => midcom::get()->dbfactory->get_object_by_guid($link[$other . 'Guid'])];
110
-            } catch (midcom_error) {
110
+            }
111
+            catch (midcom_error) {
111 112
                 continue;
112 113
             }
113 114
             $result['link'] = [
@@ -378,7 +379,8 @@  discard block
 block discarded – undo
378 379
             if (!($this->_object instanceof org_openpsa_relatedto_dba)) {
379 380
                 $response['status'] = "method requires guid of a link object as an argument";
380 381
             }
381
-        } catch (midcom_error $e) {
382
+        }
383
+        catch (midcom_error $e) {
382 384
             $response['status'] = "error: " . $e->getMessage();
383 385
         }
384 386
 
@@ -399,7 +401,8 @@  discard block
 block discarded – undo
399 401
             $relation = new org_openpsa_relatedto_dba($guid);
400 402
             $result = $relation->delete();
401 403
             $status = 'Last message: ' . midcom_connection::get_error_string();
402
-        } catch (midcom_error $e) {
404
+        }
405
+        catch (midcom_error $e) {
403 406
             $result = false;
404 407
             $status = "Object '{$guid}' could not be loaded, error:" . $e->getMessage();
405 408
         }
Please login to merge, or discard this patch.
Spacing   +2 added lines, -2 removed lines patch added patch discarded remove patch
@@ -185,10 +185,10 @@
 block discarded – undo
185 185
      *
186 186
      * @param array $link The necessary link information
187 187
      */
188
-    private function _render_line(array $link, midcom_core_dbaobject &$other_obj)
188
+    private function _render_line(array $link, midcom_core_dbaobject & $other_obj)
189 189
     {
190 190
         $this->_request_data['link'] = $link;
191
-        $this->_request_data['other_obj'] =& $other_obj;
191
+        $this->_request_data['other_obj'] = & $other_obj;
192 192
         $this->_request_data['icon'] = midcom_helper_reflector::get_object_icon($other_obj);
193 193
 
194 194
         if ($other_obj::class != $link['class']) {
Please login to merge, or discard this patch.
lib/org/openpsa/user/midcom/interfaces.php 1 patch
Braces   +4 added lines, -2 removed lines patch added patch discarded remove patch
@@ -23,7 +23,8 @@  discard block
 block discarded – undo
23 23
         midcom::get()->auth->request_sudo($this->_component);
24 24
         try {
25 25
             $person = new midcom_db_person($args['guid']);
26
-        } catch (midcom_error) {
26
+        }
27
+        catch (midcom_error) {
27 28
             $handler->print_error('Person with guid #' . $args['guid'] . ' does not exist');
28 29
             midcom::get()->auth->drop_sudo();
29 30
             return false;
@@ -31,7 +32,8 @@  discard block
 block discarded – undo
31 32
         $accounthelper = new org_openpsa_user_accounthelper($person);
32 33
         try {
33 34
             $accounthelper->reopen_account();
34
-        } catch (midcom_error $e) {
35
+        }
36
+        catch (midcom_error $e) {
35 37
             $handler->print_error($e->getMessage());
36 38
             midcom::get()->auth->drop_sudo();
37 39
             return false;
Please login to merge, or discard this patch.
lib/org/openpsa/directmarketing/handler/export.php 1 patch
Braces   +4 added lines, -2 removed lines patch added patch discarded remove patch
@@ -67,7 +67,8 @@  discard block
 block discarded – undo
67 67
     {
68 68
         try {
69 69
             $person = new org_openpsa_contacts_person_dba($member->person);
70
-        } catch (midcom_error $e) {
70
+        }
71
+        catch (midcom_error $e) {
71 72
             $e->log();
72 73
             return;
73 74
         }
@@ -91,7 +92,8 @@  discard block
 block discarded – undo
91 92
                 $row['organization_member'] = $membership;
92 93
                 try {
93 94
                     $row['organization'] = org_openpsa_contacts_group_dba::get_cached($membership->gid);
94
-                } catch (midcom_error) {
95
+                }
96
+                catch (midcom_error) {
95 97
                     debug_add("Error fetching org_openpsa_contacts_group_dba #{$membership->gid}, skipping", MIDCOM_LOG_WARN);
96 98
                     continue;
97 99
                 }
Please login to merge, or discard this patch.
lib/org/openpsa/directmarketing/handler/subscriber.php 1 patch
Braces   +4 added lines, -2 removed lines patch added patch discarded remove patch
@@ -37,7 +37,8 @@  discard block
 block discarded – undo
37 37
             // Add person to campaign
38 38
             try {
39 39
                 $campaign = new org_openpsa_directmarketing_campaign_dba($add_to);
40
-            } catch (midcom_error) {
40
+            }
41
+            catch (midcom_error) {
41 42
                 // FIXME: More informative error message
42 43
                 $this->notify('Failed adding person %s to campaign %s', $add_to, 'error');
43 44
                 return;
@@ -84,7 +85,8 @@  discard block
 block discarded – undo
84 85
             try {
85 86
                 $campaigns[$membership->campaign] = new org_openpsa_directmarketing_campaign_dba($membership->campaign);
86 87
                 $campaign_membership_map[$membership->campaign] = $membership;
87
-            } catch (midcom_error $e) {
88
+            }
89
+            catch (midcom_error $e) {
88 90
                 debug_add('Failed to load campaign ' . $membership->campaign . ', reason: ' . $e->getMessage());
89 91
             }
90 92
         }
Please login to merge, or discard this patch.
lib/org/openpsa/products/handler/product/view.php 1 patch
Braces   +2 added lines, -1 removed lines patch added patch discarded remove patch
@@ -74,7 +74,8 @@
 block discarded – undo
74 74
                 $productgroup = new org_openpsa_products_product_group_dba($this->_product->productGroup);
75 75
                 $replacements['<PRODUCTGROUP_TITLE>'] = $productgroup->title;
76 76
                 $replacements['<PRODUCTGROUP_CODE>'] = $productgroup->code;
77
-            } catch (midcom_error) {
77
+            }
78
+            catch (midcom_error) {
78 79
                 $replacements['<PRODUCTGROUP_TITLE>'] = '';
79 80
                 $replacements['<PRODUCTGROUP_CODE>'] = '';
80 81
             }
Please login to merge, or discard this patch.