Passed
Pull Request — master (#204)
by
unknown
23:41
created
lib/org/openpsa/contacts/duplicates/check.php 1 patch
Braces   +2 added lines, -1 removed lines patch added patch discarded remove patch
@@ -382,7 +382,8 @@
 block discarded – undo
382 382
             try {
383 383
                 $obj1 = $class::get_cached($arr1['guid']);
384 384
                 $obj2 = $class::get_cached($arr2['guid']);
385
-            } catch (midcom_error $e) {
385
+            }
386
+            catch (midcom_error $e) {
386 387
                 $e->log();
387 388
                 continue;
388 389
             }
Please login to merge, or discard this patch.
lib/org/openpsa/reports/handler/invoices/report.php 1 patch
Braces   +2 added lines, -1 removed lines patch added patch discarded remove patch
@@ -114,7 +114,8 @@
 block discarded – undo
114 114
                         && $deliverable->end > $this->_request_data['start'])) {
115 115
                     $invoices = array_merge($invoices, $this->_get_invoices_for_subscription($deliverable, $at_entry));
116 116
                 }
117
-            } catch (midcom_error $e) {
117
+            }
118
+            catch (midcom_error $e) {
118 119
             }
119 120
         }
120 121
         $invoices = array_merge($invoices, $this->_get_deliverable_invoices());
Please login to merge, or discard this patch.
lib/org/openpsa/reports/handler/sales/report.php 1 patch
Braces   +2 added lines, -1 removed lines patch added patch discarded remove patch
@@ -71,7 +71,8 @@
 block discarded – undo
71 71
             $owner = org_openpsa_contacts_person_dba::get_cached($salesproject->owner);
72 72
             $row['index_owner'] = $owner->name;
73 73
             $row['owner'] = org_openpsa_widgets_contact::get($owner->guid)->show_inline();
74
-        } catch (midcom_error $e) {
74
+        }
75
+        catch (midcom_error $e) {
75 76
             $e->log();
76 77
         }
77 78
         $row['amount'] = $object->pricePerUnit * $object->units;
Please login to merge, or discard this patch.
lib/org/openpsa/widgets/contact.php 1 patch
Braces   +4 added lines, -2 removed lines patch added patch discarded remove patch
@@ -114,7 +114,8 @@  discard block
 block discarded – undo
114 114
 
115 115
         try {
116 116
             $person = org_openpsa_contacts_person_dba::get_cached($src);
117
-        } catch (midcom_error $e) {
117
+        }
118
+        catch (midcom_error $e) {
118 119
             $widget = new self();
119 120
             $cache[$src] = $widget;
120 121
             return $widget;
@@ -323,7 +324,8 @@  discard block
 block discarded – undo
323 324
         foreach ($memberships as $data) {
324 325
             try {
325 326
                 $group = org_openpsa_contacts_group_dba::get_cached($data['gid']);
326
-            } catch (midcom_error $e) {
327
+            }
328
+            catch (midcom_error $e) {
327 329
                 $e->log();
328 330
                 continue;
329 331
             }
Please login to merge, or discard this patch.
lib/org/openpsa/directmarketing/midcom/interfaces.php 1 patch
Braces   +4 added lines, -2 removed lines patch added patch discarded remove patch
@@ -57,7 +57,8 @@  discard block
 block discarded – undo
57 57
         try {
58 58
             midcom::get()->dynamic_load($batch_url);
59 59
             $ret = true;
60
-        } catch (midcom_error $e) {
60
+        }
61
+        catch (midcom_error $e) {
61 62
             $ret = $e->getMessage();
62 63
         }
63 64
         ob_end_clean();
@@ -83,7 +84,8 @@  discard block
 block discarded – undo
83 84
         midcom::get()->auth->request_sudo($this->_component);
84 85
         try {
85 86
             $campaign = new org_openpsa_directmarketing_campaign_dba($args['campaign_guid']);
86
-        } catch (midcom_error $e) {
87
+        }
88
+        catch (midcom_error $e) {
87 89
             $handler->print_error("{$args['campaign_guid']} is not a valid campaign GUID");
88 90
             return false;
89 91
         }
Please login to merge, or discard this patch.
lib/org/openpsa/directmarketing/campaign/ruleresolver.php 1 patch
Braces   +2 added lines, -1 removed lines patch added patch discarded remove patch
@@ -269,7 +269,8 @@
 block discarded – undo
269 269
             $guid = $mc_parameter->get_subkey($parameter_key, 'parentguid');
270 270
             try {
271 271
                 $parent = midcom::get()->dbfactory->get_object_by_guid($guid);
272
-            } catch (midcom_error $e) {
272
+            }
273
+            catch (midcom_error $e) {
273 274
                 $e->log();
274 275
                 continue;
275 276
             }
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
@@ -59,7 +59,8 @@  discard block
 block discarded – undo
59 59
     {
60 60
         try {
61 61
             $person = new org_openpsa_contacts_person_dba($member->person);
62
-        } catch (midcom_error $e) {
62
+        }
63
+        catch (midcom_error $e) {
63 64
             $e->log();
64 65
             return;
65 66
         }
@@ -82,7 +83,8 @@  discard block
 block discarded – undo
82 83
                 $row['organization_member'] = $membership;
83 84
                 try {
84 85
                     $row['organization'] = org_openpsa_contacts_group_dba::get_cached($membership->gid);
85
-                } catch (midcom_error $e) {
86
+                }
87
+                catch (midcom_error $e) {
86 88
                     debug_add("Error fetching org_openpsa_contacts_group_dba #{$membership->gid}, skipping", MIDCOM_LOG_WARN);
87 89
                     continue;
88 90
                 }
Please login to merge, or discard this patch.
lib/org/openpsa/directmarketing/handler/message/report.php 1 patch
Braces   +2 added lines, -1 removed lines patch added patch discarded remove patch
@@ -142,7 +142,8 @@
 block discarded – undo
142 142
                 try {
143 143
                     $person = org_openpsa_contacts_person_dba::get_cached($link->person);
144 144
                     $segment = $person->get_parameter('org.openpsa.directmarketing.segments', $segmentation_param);
145
-                } catch (midcom_error $e) {
145
+                }
146
+                catch (midcom_error $e) {
146 147
                 }
147 148
                 if (empty($segment)) {
148 149
                     $segment = $this->_l10n->get('no segment');
Please login to merge, or discard this patch.
lib/org/openpsa/directmarketing/importer.php 1 patch
Braces   +2 added lines, -1 removed lines patch added patch discarded remove patch
@@ -300,7 +300,8 @@
 block discarded – undo
300 300
                     $organization = $this->_import_subscribers_organization($subscriber);
301 301
                     $this->_import_subscribers_organization_member($subscriber, $person, $organization);
302 302
                 }
303
-            } catch (midcom_error $e) {
303
+            }
304
+            catch (midcom_error $e) {
304 305
                 $e->log();
305 306
                 // Clean up possibly created data
306 307
                 $this->_clean_new_objects();
Please login to merge, or discard this patch.