@@ -164,7 +164,7 @@ |
||
| 164 | 164 | } |
| 165 | 165 | |
| 166 | 166 | /** |
| 167 | - * @param $field |
|
| 167 | + * @param string $field |
|
| 168 | 168 | * @param AbstractUnit|null $unit |
| 169 | 169 | * |
| 170 | 170 | * @return mixed |
@@ -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,7 +63,7 @@ discard block |
||
| 63 | 63 | * @var Model|MultiUnitSupport $model |
| 64 | 64 | */ |
| 65 | 65 | foreach ($model->getMultiUnitColumns() as $unitBasedColumn => $options) { |
| 66 | - $model->{$unitBasedColumn.$model->getUnitConversionDataPostfix()} = json_encode($model->calculateMultiUnitConversionData($model->attributes[$unitBasedColumn], $model->getMultiUnitFieldUnit($unitBasedColumn), $options['supported_units'])); |
|
| 66 | + $model->{$unitBasedColumn . $model->getUnitConversionDataPostfix()} = json_encode($model->calculateMultiUnitConversionData($model->attributes[$unitBasedColumn], $model->getMultiUnitFieldUnit($unitBasedColumn), $options['supported_units'])); |
|
| 67 | 67 | $model->{$unitBasedColumn} = $model->processMultiUnitFieldChanges($unitBasedColumn, $model->{$unitBasedColumn}); |
| 68 | 68 | } |
| 69 | 69 | //prevent saving of unit columns |
@@ -76,7 +76,7 @@ discard block |
||
| 76 | 76 | * @var Model|MultiUnitSupport $model |
| 77 | 77 | */ |
| 78 | 78 | foreach (Arr::only($model->getMultiUnitColumns(), array_keys($model->getDirty())) as $unitBasedColumn => $options) { |
| 79 | - $model->{$unitBasedColumn.$model->getUnitConversionDataPostfix()} = json_encode($model->calculateMultiUnitConversionData($model->getDirty()[$unitBasedColumn], new $options['default_unit'](), $options['supported_units'])); |
|
| 79 | + $model->{$unitBasedColumn . $model->getUnitConversionDataPostfix()} = json_encode($model->calculateMultiUnitConversionData($model->getDirty()[$unitBasedColumn], new $options['default_unit'](), $options['supported_units'])); |
|
| 80 | 80 | } |
| 81 | 81 | }); |
| 82 | 82 | } |
@@ -104,7 +104,7 @@ discard block |
||
| 104 | 104 | |
| 105 | 105 | public function getMultiUnitExistingConversionData($field) |
| 106 | 106 | { |
| 107 | - return json_decode($this->{$field.$this->getUnitConversionDataPostfix()} ?? null); |
|
| 107 | + return json_decode($this->{$field . $this->getUnitConversionDataPostfix()} ?? null); |
|
| 108 | 108 | } |
| 109 | 109 | |
| 110 | 110 | /** |
@@ -205,13 +205,13 @@ discard block |
||
| 205 | 205 | */ |
| 206 | 206 | protected function getMultiUnitFieldUnit($field) |
| 207 | 207 | { |
| 208 | - if (isset($this->{$field.$this->getUnitAttributePostfix()})) { |
|
| 208 | + if (isset($this->{$field . $this->getUnitAttributePostfix()})) { |
|
| 209 | 209 | foreach ($this->getMultiUnitFieldSupportedUnits($field) as $unitClass) { |
| 210 | 210 | /** |
| 211 | 211 | * @var AbstractUnit $unit |
| 212 | 212 | */ |
| 213 | 213 | $unit = new $unitClass(); |
| 214 | - if (strtolower($unit->getSymbol()) == strtolower($this->{$field.$this->getUnitAttributePostfix()})) { |
|
| 214 | + if (strtolower($unit->getSymbol()) == strtolower($this->{$field . $this->getUnitAttributePostfix()})) { |
|
| 215 | 215 | return $unit; |
| 216 | 216 | } |
| 217 | 217 | } |
@@ -223,14 +223,14 @@ discard block |
||
| 223 | 223 | protected function forgetMultiUnitFieldUnitInput($field) |
| 224 | 224 | { |
| 225 | 225 | //prevent column_units to by saved to DB |
| 226 | - if (isset($this->attributes[$field.$this->getUnitAttributePostfix()])) { |
|
| 227 | - $this->syncOriginalAttribute($field.$this->getUnitAttributePostfix()); |
|
| 226 | + if (isset($this->attributes[$field . $this->getUnitAttributePostfix()])) { |
|
| 227 | + $this->syncOriginalAttribute($field . $this->getUnitAttributePostfix()); |
|
| 228 | 228 | } |
| 229 | 229 | } |
| 230 | 230 | |
| 231 | 231 | protected function setMultiUnitFieldUnit($field, AbstractUnit $unit) |
| 232 | 232 | { |
| 233 | - $this->{$field.$this->getUnitAttributePostfix()} = $unit->getSymbol(); |
|
| 233 | + $this->{$field . $this->getUnitAttributePostfix()} = $unit->getSymbol(); |
|
| 234 | 234 | $this->forgetMultiUnitFieldUnitInput($field); |
| 235 | 235 | } |
| 236 | 236 | |
@@ -8,6 +8,6 @@ |
||
| 8 | 8 | { |
| 9 | 9 | public function __construct($field, $code = 0, Throwable $previous = null) |
| 10 | 10 | { |
| 11 | - parent::__construct('Requested field "'.$field.'" is not multi-unit field', $code, $previous); |
|
| 11 | + parent::__construct('Requested field "' . $field . '" is not multi-unit field', $code, $previous); |
|
| 12 | 12 | } |
| 13 | 13 | } |
@@ -20,7 +20,7 @@ discard block |
||
| 20 | 20 | if ($this->app->runningInConsole()) { |
| 21 | 21 | if (!str_contains($this->app->version(), 'Lumen')) { |
| 22 | 22 | $this->publishes([ |
| 23 | - __DIR__.'/../config/multi-units.php' => config_path('multi-units.php'), |
|
| 23 | + __DIR__ . '/../config/multi-units.php' => config_path('multi-units.php'), |
|
| 24 | 24 | ], 'config'); |
| 25 | 25 | } |
| 26 | 26 | } |
@@ -50,6 +50,6 @@ discard block |
||
| 50 | 50 | */ |
| 51 | 51 | public function register() |
| 52 | 52 | { |
| 53 | - $this->mergeConfigFrom(__DIR__.'/../config/multi-units.php', 'multi-units'); |
|
| 53 | + $this->mergeConfigFrom(__DIR__ . '/../config/multi-units.php', 'multi-units'); |
|
| 54 | 54 | } |
| 55 | 55 | } |