@@ -16,14 +16,14 @@ discard block |
||
16 | 16 | private function getUnitConversionDataColumns() |
17 | 17 | { |
18 | 18 | return array_map(function ($column) { |
19 | - return $column.$this->getUnitConversionDataPostfix(); |
|
19 | + return $column . $this->getUnitConversionDataPostfix(); |
|
20 | 20 | }, array_keys($this->getMultiUnitColumns())); |
21 | 21 | } |
22 | 22 | |
23 | 23 | private function getUnitConversionUnitColumns() |
24 | 24 | { |
25 | 25 | return array_map(function ($column) { |
26 | - return $column.$this->getUnitAttributePostfix(); |
|
26 | + return $column . $this->getUnitAttributePostfix(); |
|
27 | 27 | }, array_keys($this->getMultiUnitColumns())); |
28 | 28 | } |
29 | 29 | |
@@ -63,8 +63,8 @@ discard block |
||
63 | 63 | * @var Model|MultiUnitSupport $model |
64 | 64 | */ |
65 | 65 | foreach ($model->getMultiUnitColumns() as $unitBasedColumn => $options) { |
66 | - if(isset($model->attributes[$unitBasedColumn])) { |
|
67 | - $model->{$unitBasedColumn.$model->getUnitConversionDataPostfix()} = json_encode( |
|
66 | + if (isset($model->attributes[$unitBasedColumn])) { |
|
67 | + $model->{$unitBasedColumn . $model->getUnitConversionDataPostfix()} = json_encode( |
|
68 | 68 | $model->calculateMultiUnitConversionData( |
69 | 69 | $model->attributes[$unitBasedColumn], |
70 | 70 | $model->getMultiUnitFieldUnit($unitBasedColumn), |
@@ -79,7 +79,7 @@ discard block |
||
79 | 79 | } |
80 | 80 | //prevent saving of unit columns |
81 | 81 | foreach ($model->getUnitConversionUnitColumns() as $unitColumn) { |
82 | - if(isset($model->attributes[$unitColumn])) |
|
82 | + if (isset($model->attributes[$unitColumn])) |
|
83 | 83 | unset($model->attributes[$unitColumn]); |
84 | 84 | } |
85 | 85 | }); |
@@ -88,7 +88,7 @@ discard block |
||
88 | 88 | * @var Model|MultiUnitSupport $model |
89 | 89 | */ |
90 | 90 | foreach (Arr::only($model->getMultiUnitColumns(), array_keys($model->getDirty())) as $unitBasedColumn => $options) { |
91 | - $model->{$unitBasedColumn.$model->getUnitConversionDataPostfix()} = json_encode($model->calculateMultiUnitConversionData($model->getDirty()[$unitBasedColumn], new $options['default_unit'](), $options['supported_units'])); |
|
91 | + $model->{$unitBasedColumn . $model->getUnitConversionDataPostfix()} = json_encode($model->calculateMultiUnitConversionData($model->getDirty()[$unitBasedColumn], new $options['default_unit'](), $options['supported_units'])); |
|
92 | 92 | } |
93 | 93 | }); |
94 | 94 | } |
@@ -116,7 +116,7 @@ discard block |
||
116 | 116 | |
117 | 117 | public function getMultiUnitExistingConversionData($field) |
118 | 118 | { |
119 | - return json_decode($this->{$field.$this->getUnitConversionDataPostfix()} ?? null); |
|
119 | + return json_decode($this->{$field . $this->getUnitConversionDataPostfix()} ?? null); |
|
120 | 120 | } |
121 | 121 | |
122 | 122 | /** |
@@ -220,13 +220,13 @@ discard block |
||
220 | 220 | */ |
221 | 221 | protected function getMultiUnitFieldUnit($field) |
222 | 222 | { |
223 | - if (isset($this->{$field.$this->getUnitAttributePostfix()})) { |
|
223 | + if (isset($this->{$field . $this->getUnitAttributePostfix()})) { |
|
224 | 224 | foreach ($this->getMultiUnitFieldSupportedUnits($field) as $unitClass) { |
225 | 225 | /** |
226 | 226 | * @var AbstractUnit $unit |
227 | 227 | */ |
228 | 228 | $unit = new $unitClass(); |
229 | - if (strtolower($unit->getSymbol()) == strtolower($this->{$field.$this->getUnitAttributePostfix()})) { |
|
229 | + if (strtolower($unit->getSymbol()) == strtolower($this->{$field . $this->getUnitAttributePostfix()})) { |
|
230 | 230 | return $unit; |
231 | 231 | } |
232 | 232 | } |
@@ -238,14 +238,14 @@ discard block |
||
238 | 238 | protected function forgetMultiUnitFieldUnitInput($field) |
239 | 239 | { |
240 | 240 | //prevent column_units to by saved to DB |
241 | - if (isset($this->attributes[$field.$this->getUnitAttributePostfix()])) { |
|
242 | - $this->syncOriginalAttribute($field.$this->getUnitAttributePostfix()); |
|
241 | + if (isset($this->attributes[$field . $this->getUnitAttributePostfix()])) { |
|
242 | + $this->syncOriginalAttribute($field . $this->getUnitAttributePostfix()); |
|
243 | 243 | } |
244 | 244 | } |
245 | 245 | |
246 | 246 | protected function setMultiUnitFieldUnit($field, AbstractUnit $unit) |
247 | 247 | { |
248 | - $this->{$field.$this->getUnitAttributePostfix()} = $unit->getSymbol(); |
|
248 | + $this->{$field . $this->getUnitAttributePostfix()} = $unit->getSymbol(); |
|
249 | 249 | $this->forgetMultiUnitFieldUnitInput($field); |
250 | 250 | } |
251 | 251 |
@@ -79,8 +79,9 @@ |
||
79 | 79 | } |
80 | 80 | //prevent saving of unit columns |
81 | 81 | foreach ($model->getUnitConversionUnitColumns() as $unitColumn) { |
82 | - if(isset($model->attributes[$unitColumn])) |
|
83 | - unset($model->attributes[$unitColumn]); |
|
82 | + if(isset($model->attributes[$unitColumn])) { |
|
83 | + unset($model->attributes[$unitColumn]); |
|
84 | + } |
|
84 | 85 | } |
85 | 86 | }); |
86 | 87 | static::updating(function ($model) { |