@@ -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 | } |
@@ -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 | |
@@ -64,7 +64,7 @@ discard block |
||
| 64 | 64 | */ |
| 65 | 65 | foreach ($model->getMultiUnitColumns() as $unitBasedColumn => $options) { |
| 66 | 66 | if (isset($model->attributes[$unitBasedColumn])) { |
| 67 | - $model->{$unitBasedColumn.$model->getUnitConversionDataPostfix()} = json_encode( |
|
| 67 | + $model->{$unitBasedColumn . $model->getUnitConversionDataPostfix()} = json_encode( |
|
| 68 | 68 | $model->calculateMultiUnitConversionData( |
| 69 | 69 | $model->attributes[$unitBasedColumn], |
| 70 | 70 | $model->getMultiUnitFieldUnit($unitBasedColumn), |
@@ -89,7 +89,7 @@ discard block |
||
| 89 | 89 | * @var Model|MultiUnitSupport $model |
| 90 | 90 | */ |
| 91 | 91 | foreach (Arr::only($model->getMultiUnitColumns(), array_keys($model->getDirty())) as $unitBasedColumn => $options) { |
| 92 | - $model->{$unitBasedColumn.$model->getUnitConversionDataPostfix()} = json_encode($model->calculateMultiUnitConversionData($model->getDirty()[$unitBasedColumn], new $options['default_unit'](), $options['supported_units'])); |
|
| 92 | + $model->{$unitBasedColumn . $model->getUnitConversionDataPostfix()} = json_encode($model->calculateMultiUnitConversionData($model->getDirty()[$unitBasedColumn], new $options['default_unit'](), $options['supported_units'])); |
|
| 93 | 93 | } |
| 94 | 94 | }); |
| 95 | 95 | } |
@@ -117,7 +117,7 @@ discard block |
||
| 117 | 117 | |
| 118 | 118 | public function getMultiUnitExistingConversionData($field) |
| 119 | 119 | { |
| 120 | - return json_decode($this->{$field.$this->getUnitConversionDataPostfix()} ?? null); |
|
| 120 | + return json_decode($this->{$field . $this->getUnitConversionDataPostfix()} ?? null); |
|
| 121 | 121 | } |
| 122 | 122 | |
| 123 | 123 | /** |
@@ -204,7 +204,7 @@ discard block |
||
| 204 | 204 | } |
| 205 | 205 | } |
| 206 | 206 | } |
| 207 | - if(is_string($unit)) |
|
| 207 | + if (is_string($unit)) |
|
| 208 | 208 | throw new NotSupportedMultiUnitField($field); |
| 209 | 209 | $existingConversionData = $this->getMultiUnitExistingConversionData($field); |
| 210 | 210 | if (!is_null($existingConversionData) && !is_null($existingConversionData->{$unit->getSymbol()})) { |
@@ -261,13 +261,13 @@ discard block |
||
| 261 | 261 | */ |
| 262 | 262 | protected function getMultiUnitFieldUnit($field) |
| 263 | 263 | { |
| 264 | - if (isset($this->{$field.$this->getUnitAttributePostfix()})) { |
|
| 264 | + if (isset($this->{$field . $this->getUnitAttributePostfix()})) { |
|
| 265 | 265 | foreach ($this->getMultiUnitFieldSupportedUnits($field) as $unitClass) { |
| 266 | 266 | /** |
| 267 | 267 | * @var AbstractUnit $unit |
| 268 | 268 | */ |
| 269 | 269 | $unit = new $unitClass(); |
| 270 | - if (strtolower($unit->getSymbol()) == strtolower($this->{$field.$this->getUnitAttributePostfix()})) { |
|
| 270 | + if (strtolower($unit->getSymbol()) == strtolower($this->{$field . $this->getUnitAttributePostfix()})) { |
|
| 271 | 271 | return $unit; |
| 272 | 272 | } |
| 273 | 273 | } |
@@ -279,14 +279,14 @@ discard block |
||
| 279 | 279 | protected function forgetMultiUnitFieldUnitInput($field) |
| 280 | 280 | { |
| 281 | 281 | //prevent column_units to by saved to DB |
| 282 | - if (isset($this->attributes[$field.$this->getUnitAttributePostfix()])) { |
|
| 283 | - $this->syncOriginalAttribute($field.$this->getUnitAttributePostfix()); |
|
| 282 | + if (isset($this->attributes[$field . $this->getUnitAttributePostfix()])) { |
|
| 283 | + $this->syncOriginalAttribute($field . $this->getUnitAttributePostfix()); |
|
| 284 | 284 | } |
| 285 | 285 | } |
| 286 | 286 | |
| 287 | 287 | protected function setMultiUnitFieldUnit($field, AbstractUnit $unit) |
| 288 | 288 | { |
| 289 | - $this->{$field.$this->getUnitAttributePostfix()} = $unit->getSymbol(); |
|
| 289 | + $this->{$field . $this->getUnitAttributePostfix()} = $unit->getSymbol(); |
|
| 290 | 290 | $this->forgetMultiUnitFieldUnitInput($field); |
| 291 | 291 | } |
| 292 | 292 | |
@@ -204,8 +204,9 @@ |
||
| 204 | 204 | } |
| 205 | 205 | } |
| 206 | 206 | } |
| 207 | - if(is_string($unit)) |
|
| 208 | - throw new NotSupportedMultiUnitField($field); |
|
| 207 | + if(is_string($unit)) { |
|
| 208 | + throw new NotSupportedMultiUnitField($field); |
|
| 209 | + } |
|
| 209 | 210 | $existingConversionData = $this->getMultiUnitExistingConversionData($field); |
| 210 | 211 | if (!is_null($existingConversionData) && !is_null($existingConversionData->{$unit->getSymbol()})) { |
| 211 | 212 | return $existingConversionData->{$unit->getSymbol()}; |