Passed
Push — master ( 7914e8...e0d2b5 )
by Andreas
10:02
created
lib/org/openpsa/contacts/handler/duplicates.php 1 patch
Braces   +4 added lines, -2 removed lines patch added patch discarded remove patch
@@ -82,7 +82,8 @@  discard block
 block discarded – undo
82 82
             try {
83 83
                 $object1 = $this->load($param->parentguid);
84 84
                 $object2 = $this->load($param->name);
85
-            } catch (midcom_error $e) {
85
+            }
86
+            catch (midcom_error $e) {
86 87
                 $i++;
87 88
                 continue;
88 89
             }
@@ -160,7 +161,8 @@  discard block
 block discarded – undo
160 161
                 try {
161 162
                     $merger = new org_openpsa_contacts_duplicates_merge($this->mode, $this->_config);
162 163
                     $merger->merge_delete($object1, $object2);
163
-                } catch (midcom_error $e) {
164
+                }
165
+                catch (midcom_error $e) {
164 166
                     // TODO: Localize
165 167
                     midcom::get()->uimessages->add($this->_l10n->get('org.openpsa.contacts'), 'Merge failed, errstr: ' . $e->getMessage(), 'error');
166 168
                 }
Please login to merge, or discard this patch.
src/midcom/console/command/cleanup/parameters.php 1 patch
Braces   +2 added lines, -1 removed lines patch added patch discarded remove patch
@@ -49,7 +49,8 @@
 block discarded – undo
49 49
                 try {
50 50
                     \midgard_object_class::get_object_by_guid($param->parentguid);
51 51
                     $seen[$param->parentguid] = true;
52
-                } catch (\Exception $e) {
52
+                }
53
+                catch (\Exception $e) {
53 54
                     $seen[$param->parentguid] = false;
54 55
                 }
55 56
             }
Please login to merge, or discard this patch.
lib/org/openpsa/invoices/invoice.php 1 patch
Braces   +4 added lines, -2 removed lines patch added patch discarded remove patch
@@ -120,14 +120,16 @@
 block discarded – undo
120 120
         if (!empty($this->customer)) {
121 121
             try {
122 122
                 return org_openpsa_contacts_group_dba::get_cached($this->customer);
123
-            } catch (midcom_error $e) {
123
+            }
124
+            catch (midcom_error $e) {
124 125
                 $e->log();
125 126
             }
126 127
         }
127 128
         if (!empty($this->customerContact)) {
128 129
             try {
129 130
                 return org_openpsa_contacts_person_dba::get_cached($this->customerContact);
130
-            } catch (midcom_error $e) {
131
+            }
132
+            catch (midcom_error $e) {
131 133
                 $e->log();
132 134
             }
133 135
         }
Please login to merge, or discard this patch.
lib/org/openpsa/expenses/hour/report.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
             if ($this->old_task) {
99 99
                 self::update_cache(new org_openpsa_projects_task_dba($this->old_task));
100 100
             }
101
-        } catch (midcom_error $e) {
101
+        }
102
+        catch (midcom_error $e) {
102 103
             $e->log();
103 104
         }
104 105
 
Please login to merge, or discard this patch.
lib/org/openpsa/expenses/midcom/interfaces.php 1 patch
Braces   +2 added lines, -1 removed lines patch added patch discarded remove patch
@@ -48,7 +48,8 @@
 block discarded – undo
48 48
         foreach (array_unique($tasks_to_update) as $id) {
49 49
             try {
50 50
                 org_openpsa_expenses_hour_report_dba::update_cache(new org_openpsa_projects_task_dba($id));
51
-            } catch (midcom_error $e) {
51
+            }
52
+            catch (midcom_error $e) {
52 53
                 $e->log();
53 54
             }
54 55
         }
Please login to merge, or discard this patch.
lib/org/openpsa/sales/midcom/interfaces.php 1 patch
Braces   +8 added lines, -4 removed lines patch added patch discarded remove patch
@@ -31,7 +31,8 @@  discard block
 block discarded – undo
31 31
             try {
32 32
                 $agreement = new org_openpsa_sales_salesproject_deliverable_dba($agreement);
33 33
                 $agreement->update_units();
34
-            } catch (midcom_error $e) {
34
+            }
35
+            catch (midcom_error $e) {
35 36
                 $e->log();
36 37
             }
37 38
         }
@@ -49,7 +50,8 @@  discard block
 block discarded – undo
49 50
 
50 51
         try {
51 52
             $deliverable = new org_openpsa_sales_salesproject_deliverable_dba($args['deliverable']);
52
-        } catch (midcom_error $e) {
53
+        }
54
+        catch (midcom_error $e) {
53 55
             $handler->print_error("Deliverable {$args['deliverable']} not found: " . midcom_connection::get_error_string());
54 56
             return false;
55 57
         }
@@ -69,7 +71,8 @@  discard block
 block discarded – undo
69 71
         }
70 72
         try {
71 73
             $deliverable = new org_openpsa_sales_salesproject_deliverable_dba($args['deliverable']);
72
-        } catch (midcom_error $e) {
74
+        }
75
+        catch (midcom_error $e) {
73 76
             $handler->print_error('no deliverable with passed GUID: ' . $args['deliverable'] . ', aborting');
74 77
             return false;
75 78
         }
@@ -77,7 +80,8 @@  discard block
 block discarded – undo
77 80
         //get the owner of the salesproject the deliverable belongs to
78 81
         try {
79 82
             $project = new org_openpsa_sales_salesproject_dba($deliverable->salesproject);
80
-        } catch (midcom_error $e) {
83
+        }
84
+        catch (midcom_error $e) {
81 85
             $handler->print_error('Failed to load salesproject: ' . $e->getMessage());
82 86
             return false;
83 87
         }
Please login to merge, or discard this patch.
lib/org/openpsa/invoices/style/admin-read.php 1 patch
Braces   +2 added lines, -1 removed lines patch added patch discarded remove patch
@@ -8,7 +8,8 @@
 block discarded – undo
8 8
     if ($customer->orgOpenpsaObtype < org_openpsa_contacts_group_dba::ORGANIZATION) {
9 9
         $customer = false;
10 10
     }
11
-} catch (midcom_error $e) {
11
+}
12
+catch (midcom_error $e) {
12 13
     $customer = false;
13 14
 }
14 15
 
Please login to merge, or discard this patch.
lib/org/openpsa/invoices/handler/list.php 1 patch
Braces   +6 added lines, -3 removed lines patch added patch discarded remove patch
@@ -96,7 +96,8 @@  discard block
 block discarded – undo
96 96
                 $customer = org_openpsa_contacts_group_dba::get_cached($invoice->customer);
97 97
                 $entry['customer'] = "<a href=\"{$this->router->generate('list_customer_all', ['guid' => $customer->guid])}\">" . $customer->get_label() . "</a>";
98 98
                 $entry['index_customer'] = $customer->get_label();
99
-            } catch (midcom_error $e) {
99
+            }
100
+            catch (midcom_error $e) {
100 101
                 $entry['customer'] = '';
101 102
                 $entry['index_customer'] = '';
102 103
             }
@@ -110,7 +111,8 @@  discard block
 block discarded – undo
110 111
                 $entry['contact'] = "<a href=\"{$this->router->generate('list_customer_all', ['guid' => $contact->guid])}\">" . $contact->get_label() . "</a>";
111 112
                 $entry['contact'] = $contact_widget->show_inline();
112 113
                 $entry['index_contact'] = $contact->get_label();
113
-            } catch (midcom_error $e) {
114
+            }
115
+            catch (midcom_error $e) {
114 116
                 $entry['contact'] = '';
115 117
                 $entry['index_contact'] = '';
116 118
             }
@@ -257,7 +259,8 @@  discard block
 block discarded – undo
257 259
     {
258 260
         try {
259 261
             $this->_customer = new org_openpsa_contacts_group_dba($guid);
260
-        } catch (midcom_error $e) {
262
+        }
263
+        catch (midcom_error $e) {
261 264
             $this->_customer = new org_openpsa_contacts_person_dba($guid);
262 265
         }
263 266
         $data['customer'] = $this->_customer;
Please login to merge, or discard this patch.
lib/org/openpsa/sales/style/show-salesproject-grid.php 1 patch
Braces   +6 added lines, -3 removed lines patch added patch discarded remove patch
@@ -31,7 +31,8 @@  discard block
 block discarded – undo
31 31
                 if ($data['contacts_url']) {
32 32
                     $row['customer'] = "<a href=\"{$data['contacts_url']}group/{$customer->guid}/\">{$label}</a>";
33 33
                 }
34
-            } catch (midcom_error $e) {
34
+            }
35
+            catch (midcom_error $e) {
35 36
                 $e->log();
36 37
             }
37 38
         }
@@ -44,7 +45,8 @@  discard block
 block discarded – undo
44 45
             $contact_widget = org_openpsa_widgets_contact::get($salesproject->customerContact);
45 46
             $row['index_customerContact'] = $customer->get_label();
46 47
             $row['customerContact'] = $contact_widget->show_inline();
47
-        } catch (midcom_error $e) {
48
+        }
49
+        catch (midcom_error $e) {
48 50
             $e->log();
49 51
         }
50 52
     }
@@ -56,7 +58,8 @@  discard block
 block discarded – undo
56 58
         $owner_widget = org_openpsa_widgets_contact::get($salesproject->owner);
57 59
         $row['index_owner'] = $owner->rname;
58 60
         $row['owner'] = $owner_widget->show_inline();
59
-    } catch (midcom_error $e) {
61
+    }
62
+    catch (midcom_error $e) {
60 63
         $row['index_owner'] = '';
61 64
         $row['owner'] = '';
62 65
     }
Please login to merge, or discard this patch.