Passed
Push — master ( c790fd...b67c6a )
by Andreas
12:04
created
lib/org/openpsa/invoices/invoice.php 2 patches
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.
Spacing   +2 added lines, -2 removed lines patch added patch discarded remove patch
@@ -208,7 +208,7 @@  discard block
 block discarded – undo
208 208
                 $invoice_item->pricePerUnit = $deliverable->pricePerUnit;
209 209
                 $invoice_item->deliverable = $deliverable->id;
210 210
                 //calculate price
211
-                if (   $deliverable->invoiceByActualUnits
211
+                if ($deliverable->invoiceByActualUnits
212 212
                     || $deliverable->plannedUnits == 0) {
213 213
                     $invoice_item->units = $hours;
214 214
                 } else {
@@ -249,7 +249,7 @@  discard block
 block discarded – undo
249 249
      */
250 250
     public function get_billing_data() : org_openpsa_invoices_billing_data_dba
251 251
     {
252
-        return $this->_billing_data ??= org_openpsa_invoices_billing_data_dba::get_by_object($this);;
252
+        return $this->_billing_data ??= org_openpsa_invoices_billing_data_dba::get_by_object($this); ;
253 253
     }
254 254
 
255 255
     public function get_customer()
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/calculator/default.php 1 patch
Spacing   +1 added lines, -1 removed lines patch added patch discarded remove patch
@@ -49,7 +49,7 @@
 block discarded – undo
49 49
 
50 50
     private function get_units($units = false) : float
51 51
     {
52
-        if (   $this->deliverable->invoiceByActualUnits
52
+        if ($this->deliverable->invoiceByActualUnits
53 53
             || $this->deliverable->plannedUnits == 0) {
54 54
             // In most cases we calculate the price based on the actual units entered
55 55
             return $units ?: $this->deliverable->units;
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/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.
lib/org/openpsa/expenses/handler/index.php 1 patch
Braces   +4 added lines, -2 removed lines patch added patch discarded remove patch
@@ -102,7 +102,8 @@  discard block
 block discarded – undo
102 102
         foreach ($hours as $guid => $row) {
103 103
             try {
104 104
                 $task = org_openpsa_projects_task_dba::get_cached($row['task']);
105
-            } catch (midcom_error $e) {
105
+            }
106
+            catch (midcom_error $e) {
106 107
                 // Task couldn't be loaded, probably because of ACL
107 108
                 continue;
108 109
             }
@@ -115,7 +116,8 @@  discard block
 block discarded – undo
115 116
                     $person_object = midcom_db_person::get_cached($row['person']);
116 117
                     $person_label = $this->_get_list_link($person_object->name, null, null, $row['person']);
117 118
                     $person_name = $person_object->name;
118
-                } catch (midcom_error $e) {
119
+                }
120
+                catch (midcom_error $e) {
119 121
                     $person_label = $this->_l10n->get('no person');
120 122
                     $person_name = '';
121 123
                 }
Please login to merge, or discard this patch.
lib/org/openpsa/sales/salesproject/deliverable.php 1 patch
Spacing   +7 added lines, -7 removed lines patch added patch discarded remove patch
@@ -71,7 +71,7 @@  discard block
 block discarded – undo
71 71
     {
72 72
         $this->calculate_price(false);
73 73
 
74
-        if (   $this->orgOpenpsaObtype == org_openpsa_products_product_dba::DELIVERY_SUBSCRIPTION
74
+        if ($this->orgOpenpsaObtype == org_openpsa_products_product_dba::DELIVERY_SUBSCRIPTION
75 75
             && $this->continuous) {
76 76
             $this->end = 0;
77 77
         } elseif ($this->end < $this->start) {
@@ -138,7 +138,7 @@  discard block
 block discarded – undo
138 138
         $calculator->run($this);
139 139
         $cost = $calculator->get_cost();
140 140
         $price = $calculator->get_price();
141
-        if (   $price != $this->price
141
+        if ($price != $this->price
142 142
             || $cost != $this->cost) {
143 143
             $this->price = $price;
144 144
             $this->cost = $cost;
@@ -178,7 +178,7 @@  discard block
 block discarded – undo
178 178
         $units = $hours['invoiceable'];
179 179
         $uninvoiceableUnits = $hours['reported'] - ($hours['invoiceable'] + $hours['invoiced']);
180 180
 
181
-        if (   $units != $this->units
181
+        if ($units != $this->units
182 182
             || $uninvoiceableUnits != $this->uninvoiceableUnits) {
183 183
             debug_add("agreement values have changed, setting units to " . $units . ", uninvoiceable: " . $uninvoiceableUnits);
184 184
             $this->units = $units;
@@ -229,11 +229,11 @@  discard block
 block discarded – undo
229 229
                 break;
230 230
             case 'q':
231 231
                 // Quarterly recurring subscription
232
-                $identifier = ceil(((int)$date->format('n')) / 4) . 'Q' . $date->format('y');
232
+                $identifier = ceil(((int) $date->format('n')) / 4) . 'Q' . $date->format('y');
233 233
                 break;
234 234
             case 'hy':
235 235
                 // Half-yearly recurring subscription
236
-                $identifier = ceil(((int)$date->format('n')) / 6) . '/' . $date->format('Y');
236
+                $identifier = ceil(((int) $date->format('n')) / 6) . '/' . $date->format('Y');
237 237
                 break;
238 238
             case 'y':
239 239
                 // Yearly recurring subscription
@@ -261,7 +261,7 @@  discard block
 block discarded – undo
261 261
 
262 262
     public function invoice() : bool
263 263
     {
264
-        if (   $this->state >= self::STATE_INVOICED
264
+        if ($this->state >= self::STATE_INVOICED
265 265
             || $this->orgOpenpsaObtype == org_openpsa_products_product_dba::DELIVERY_SUBSCRIPTION) {
266 266
             return false;
267 267
         }
@@ -364,7 +364,7 @@  discard block
 block discarded – undo
364 364
             midcom::get()->uimessages->add(midcom::get()->i18n->get_string('org.openpsa.sales', 'org.openpsa.sales'), sprintf(midcom::get()->i18n->get_string('marked deliverable "%s" delivered', 'org.openpsa.sales'), $this->title));
365 365
 
366 366
             // Check if we need to create task or ship goods
367
-            if (   $update_deliveries
367
+            if ($update_deliveries
368 368
                 && $product->orgOpenpsaObtype === org_openpsa_products_product_dba::TYPE_SERVICE) {
369 369
                 // Change status of tasks connected to the deliverable
370 370
                 $qb = org_openpsa_projects_task_dba::new_query_builder();
Please login to merge, or discard this patch.
src/midcom/datamanager/extension/type/schemaType.php 1 patch
Spacing   +5 added lines, -5 removed lines patch added patch discarded remove patch
@@ -35,11 +35,11 @@  discard block
 block discarded – undo
35 35
         $resolver
36 36
             ->setRequired('schema')
37 37
             ->setAllowedTypes('schema', [schema::class, 'string'])
38
-            ->setDefault('action', function (Options $options, $value) {
38
+            ->setDefault('action', function(Options $options, $value) {
39 39
                 return $options['schema']->get('action');
40 40
             });
41 41
 
42
-        $resolver->setNormalizer('csrf_protection', function (Options $options, $value) {
42
+        $resolver->setNormalizer('csrf_protection', function(Options $options, $value) {
43 43
             foreach ($options['schema']->get('fields') as $config) {
44 44
                 if ($config['widget'] === 'csrf') {
45 45
                     return true;
@@ -47,7 +47,7 @@  discard block
 block discarded – undo
47 47
             }
48 48
             return false;
49 49
         });
50
-        $resolver->setNormalizer('constraints', function (Options $options, $value) {
50
+        $resolver->setNormalizer('constraints', function(Options $options, $value) {
51 51
             $validation = $options['schema']->get('validation');
52 52
             if (!empty($validation)) {
53 53
                 $cb_wrapper = new cb_wrapper($validation);
@@ -55,7 +55,7 @@  discard block
 block discarded – undo
55 55
             }
56 56
             return $value;
57 57
         });
58
-        $resolver->setNormalizer('schema', function (Options $options, $value) {
58
+        $resolver->setNormalizer('schema', function(Options $options, $value) {
59 59
             if (is_string($value)) {
60 60
                 $schemadb = schemadb::from_path($value);
61 61
                 return $schemadb->get_first();
@@ -80,7 +80,7 @@  discard block
 block discarded – undo
80 80
         // this is mainly there to skip validation in case the user pressed cancel
81 81
         $builder->addEventListener(FormEvents::POST_SUBMIT, function(PostSubmitEvent $event) {
82 82
             $form = $event->getForm();
83
-            if (   $form instanceof Form
83
+            if ($form instanceof Form
84 84
                 && $form->getClickedButton()
85 85
                 && $form->getClickedButton()->getConfig()->getOption('operation') == controller::CANCEL) {
86 86
                 $event->stopPropagation();
Please login to merge, or discard this patch.
src/midcom/datamanager/extension/type/subformType.php 1 patch
Spacing   +3 added lines, -3 removed lines patch added patch discarded remove patch
@@ -38,7 +38,7 @@  discard block
 block discarded – undo
38 38
                 'max_count' => 0
39 39
             ]
40 40
         ]);
41
-        $resolver->setNormalizer('constraints', function (Options $options, $value) {
41
+        $resolver->setNormalizer('constraints', function(Options $options, $value) {
42 42
             $validation = [];
43 43
             if ($options['type_config']['max_count'] > 0) {
44 44
                 $validation['max'] = $options['type_config']['max_count'];
@@ -51,12 +51,12 @@  discard block
 block discarded – undo
51 51
             }
52 52
             return $validation;
53 53
         });
54
-        $resolver->setNormalizer('entry_options', function (Options $options, $value) {
54
+        $resolver->setNormalizer('entry_options', function(Options $options, $value) {
55 55
             return array_replace([
56 56
                 'widget_config' => $options['widget_config']
57 57
             ], (array) $value);
58 58
         });
59
-        $resolver->setNormalizer('widget_config', function (Options $options, $value) {
59
+        $resolver->setNormalizer('widget_config', function(Options $options, $value) {
60 60
             if (!array_key_exists('sortable', $value)) {
61 61
                 $value['sortable'] = false;
62 62
             }
Please login to merge, or discard this patch.