@@ -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 | } |
@@ -166,7 +166,7 @@ |
||
| 166 | 166 | } |
| 167 | 167 | |
| 168 | 168 | /** |
| 169 | - * @param $field |
|
| 169 | + * @param string $field |
|
| 170 | 170 | * @param AbstractUnit|null $unit |
| 171 | 171 | * |
| 172 | 172 | * @throws NotSupportedMultiUnitField |
@@ -18,14 +18,14 @@ discard block |
||
| 18 | 18 | private function getUnitConversionDataColumns() |
| 19 | 19 | { |
| 20 | 20 | return array_map(function ($column) { |
| 21 | - return $column.$this->getUnitConversionDataPostfix(); |
|
| 21 | + return $column . $this->getUnitConversionDataPostfix(); |
|
| 22 | 22 | }, array_keys($this->getMultiUnitColumns())); |
| 23 | 23 | } |
| 24 | 24 | |
| 25 | 25 | private function getUnitConversionUnitColumns() |
| 26 | 26 | { |
| 27 | 27 | return array_map(function ($column) { |
| 28 | - return $column.$this->getUnitAttributePostfix(); |
|
| 28 | + return $column . $this->getUnitAttributePostfix(); |
|
| 29 | 29 | }, array_keys($this->getMultiUnitColumns())); |
| 30 | 30 | } |
| 31 | 31 | |
@@ -66,7 +66,7 @@ discard block |
||
| 66 | 66 | */ |
| 67 | 67 | foreach ($model->getMultiUnitColumns() as $unitBasedColumn => $options) { |
| 68 | 68 | if (isset($model->attributes[$unitBasedColumn])) { |
| 69 | - $model->{$unitBasedColumn.$model->getUnitConversionDataPostfix()} = json_encode( |
|
| 69 | + $model->{$unitBasedColumn . $model->getUnitConversionDataPostfix()} = json_encode( |
|
| 70 | 70 | $model->calculateMultiUnitConversionData( |
| 71 | 71 | $model->attributes[$unitBasedColumn], |
| 72 | 72 | $model->getMultiUnitFieldUnit($unitBasedColumn, true), |
@@ -86,7 +86,7 @@ discard block |
||
| 86 | 86 | * @var Model|MultiUnitSupport $model |
| 87 | 87 | */ |
| 88 | 88 | foreach (Arr::only($model->getMultiUnitColumns(), array_keys($model->getDirty())) as $unitBasedColumn => $options) { |
| 89 | - $model->{$unitBasedColumn.$model->getUnitConversionDataPostfix()} = json_encode( |
|
| 89 | + $model->{$unitBasedColumn . $model->getUnitConversionDataPostfix()} = json_encode( |
|
| 90 | 90 | $model->calculateMultiUnitConversionData( |
| 91 | 91 | $model->getDirty()[$unitBasedColumn], |
| 92 | 92 | $model->getMultiUnitFieldUnit($unitBasedColumn, true), |
@@ -98,7 +98,7 @@ discard block |
||
| 98 | 98 | }); |
| 99 | 99 | } |
| 100 | 100 | |
| 101 | - private function forgetUnitsInput(){ |
|
| 101 | + private function forgetUnitsInput() { |
|
| 102 | 102 | //prevent saving of unit columns |
| 103 | 103 | foreach ($this->getUnitConversionUnitColumns() as $unitColumn) { |
| 104 | 104 | if (isset($this->attributes[$unitColumn])) { |
@@ -116,7 +116,7 @@ discard block |
||
| 116 | 116 | */ |
| 117 | 117 | private function calculateMultiUnitConversionData($value, AbstractUnit $unit, $requiredUnits) |
| 118 | 118 | { |
| 119 | - if(is_null($value)) |
|
| 119 | + if (is_null($value)) |
|
| 120 | 120 | return null; |
| 121 | 121 | |
| 122 | 122 | $conversionData = []; |
@@ -133,7 +133,7 @@ discard block |
||
| 133 | 133 | |
| 134 | 134 | public function getMultiUnitExistingConversionData($field) |
| 135 | 135 | { |
| 136 | - return json_decode($this->{$field.$this->getUnitConversionDataPostfix()} ?? null); |
|
| 136 | + return json_decode($this->{$field . $this->getUnitConversionDataPostfix()} ?? null); |
|
| 137 | 137 | } |
| 138 | 138 | |
| 139 | 139 | /** |
@@ -329,13 +329,13 @@ discard block |
||
| 329 | 329 | */ |
| 330 | 330 | protected function getMultiUnitFieldUnit($field, $preferDefault = false) |
| 331 | 331 | { |
| 332 | - if (isset($this->{$field.$this->getUnitAttributePostfix()})) { |
|
| 332 | + if (isset($this->{$field . $this->getUnitAttributePostfix()})) { |
|
| 333 | 333 | foreach ($this->getMultiUnitFieldSupportedUnits($field) as $unitClass) { |
| 334 | 334 | /** |
| 335 | 335 | * @var AbstractUnit $unit |
| 336 | 336 | */ |
| 337 | 337 | $unit = new $unitClass(); |
| 338 | - if (strtolower($unit->getId()) == strtolower($this->{$field.$this->getUnitAttributePostfix()})) { |
|
| 338 | + if (strtolower($unit->getId()) == strtolower($this->{$field . $this->getUnitAttributePostfix()})) { |
|
| 339 | 339 | return $unit; |
| 340 | 340 | } |
| 341 | 341 | } |
@@ -347,15 +347,15 @@ discard block |
||
| 347 | 347 | protected function forgetMultiUnitFieldUnitInput($field) |
| 348 | 348 | { |
| 349 | 349 | //prevent column_units to by saved to DB |
| 350 | - if (isset($this->attributes[$field.$this->getUnitAttributePostfix()])) { |
|
| 351 | - $this->syncOriginalAttribute($field.$this->getUnitAttributePostfix()); |
|
| 350 | + if (isset($this->attributes[$field . $this->getUnitAttributePostfix()])) { |
|
| 351 | + $this->syncOriginalAttribute($field . $this->getUnitAttributePostfix()); |
|
| 352 | 352 | } |
| 353 | 353 | } |
| 354 | 354 | |
| 355 | 355 | protected function setMultiUnitFieldUnit($field, AbstractUnit $unit) |
| 356 | 356 | { |
| 357 | - if (isset($this->{$field.$this->getUnitAttributePostfix()})) { |
|
| 358 | - $this->{$field.$this->getUnitAttributePostfix()} = $unit->getId(); |
|
| 357 | + if (isset($this->{$field . $this->getUnitAttributePostfix()})) { |
|
| 358 | + $this->{$field . $this->getUnitAttributePostfix()} = $unit->getId(); |
|
| 359 | 359 | } |
| 360 | 360 | $this->forgetMultiUnitFieldUnitInput($field); |
| 361 | 361 | } |
@@ -424,7 +424,7 @@ discard block |
||
| 424 | 424 | */ |
| 425 | 425 | private function processMultiUnitFieldChanges($field, $value) |
| 426 | 426 | { |
| 427 | - if(!is_null($value)) { |
|
| 427 | + if (!is_null($value)) { |
|
| 428 | 428 | $existingConversionData = $this->getMultiUnitExistingConversionData($field); |
| 429 | 429 | if (!is_null($existingConversionData)) { |
| 430 | 430 | $inputUnit = $this->getMultiUnitFieldUnit($field); |
@@ -116,8 +116,9 @@ |
||
| 116 | 116 | */ |
| 117 | 117 | private function calculateMultiUnitConversionData($value, AbstractUnit $unit, $requiredUnits) |
| 118 | 118 | { |
| 119 | - if(is_null($value)) |
|
| 120 | - return null; |
|
| 119 | + if(is_null($value)) { |
|
| 120 | + return null; |
|
| 121 | + } |
|
| 121 | 122 | |
| 122 | 123 | $conversionData = []; |
| 123 | 124 | foreach ($requiredUnits as $requiredUnitClass) { |
@@ -8,6 +8,6 @@ |
||
| 8 | 8 | { |
| 9 | 9 | public function __construct($field, $unit, $code = 0, Throwable $previous = null) |
| 10 | 10 | { |
| 11 | - parent::__construct('Requested field "'.$field.'" doesn\'t support '.$unit, $code, $previous); |
|
| 11 | + parent::__construct('Requested field "' . $field . '" doesn\'t support ' . $unit, $code, $previous); |
|
| 12 | 12 | } |
| 13 | 13 | } |