@@ -10,12 +10,18 @@ discard block |
||
| 10 | 10 | return false; |
| 11 | 11 | } |
| 12 | 12 | trap($file); |
| 13 | - if(!$value) return false; |
|
| 13 | + if(!$value) { |
|
| 14 | + return false; |
|
| 15 | + } |
|
| 14 | 16 | |
| 15 | 17 | trap($attribute, $value, $params); |
| 16 | 18 | return false; |
| 17 | - if(!isset($validator->attributes()['files'])) return false; |
|
| 18 | - if(!isset($validator->attributes()['files'][$attribute])) return false; |
|
| 19 | + if(!isset($validator->attributes()['files'])) { |
|
| 20 | + return false; |
|
| 21 | + } |
|
| 22 | + if(!isset($validator->attributes()['files'][$attribute])) { |
|
| 23 | + return false; |
|
| 24 | + } |
|
| 19 | 25 | |
| 20 | 26 | $values = $validator->attributes()['files'][$attribute]; |
| 21 | 27 | |
@@ -37,7 +43,9 @@ discard block |
||
| 37 | 43 | { |
| 38 | 44 | trap($values['files'][$attribute]); |
| 39 | 45 | |
| 40 | - if(!isset($values['files'], $values['files'][$attribute])) return null; |
|
| 46 | + if(!isset($values['files'], $values['files'][$attribute])) { |
|
| 47 | + return null; |
|
| 48 | + } |
|
| 41 | 49 | |
| 42 | 50 | return $values['files'][$attribute]; |
| 43 | 51 | } |
@@ -36,7 +36,4 @@ |
||
| 36 | 36 | |
| 37 | 37 | private function getMedia(HasAsset $model, $locale = null) |
| 38 | 38 | { |
| 39 | - return $model->assets($this->key(), $locale)->all(); |
|
| 40 | - } |
|
| 41 | ->>>>>>> 0b857885b773fe2d5321aefa1f512733906e1067 |
|
| 42 | -} |
|
| 39 | + return $model->assets($this->key(), $locale |
|
| 43 | 40 | \ No newline at end of file |
@@ -28,6 +28,4 @@ |
||
| 28 | 28 | |
| 29 | 29 | >>>>>>> 0b857885b773fe2d5321aefa1f512733906e1067 |
| 30 | 30 | /** @var UploadMedia */ |
| 31 | - app(UploadMedia::class)->fromUploadComponent($this->model, $files, $filesOrder); |
|
| 32 | - } |
|
| 33 | -} |
|
| 31 | + app(UploadMedia::class)->fromUploadComponent($this->model, $files, $filesOrder |
|
| 34 | 32 | \ No newline at end of file |