@@ -38,17 +38,17 @@ discard block |
||
| 38 | 38 | public function search(Request $request, GroupRepository $groupRepository, DataGroupRepository $dataGroupRepository) |
| 39 | 39 | { |
| 40 | 40 | $search = []; |
| 41 | - if($request->has('name')) { |
|
| 41 | + if ($request->has('name')) { |
|
| 42 | 42 | $search['name'] = $request->input('name'); |
| 43 | 43 | } |
| 44 | - if($request->has('email')) { |
|
| 44 | + if ($request->has('email')) { |
|
| 45 | 45 | $search['email'] = $request->input('email'); |
| 46 | 46 | } |
| 47 | 47 | $dataGroups = $dataGroupRepository->getAllWhere($search); |
| 48 | 48 | $groups = new Collection(); |
| 49 | - foreach($dataGroups as $dataGroup) { |
|
| 49 | + foreach ($dataGroups as $dataGroup) { |
|
| 50 | 50 | $group = $dataGroup->group(); |
| 51 | - if($group !== null) { |
|
| 51 | + if ($group !== null) { |
|
| 52 | 52 | $groups->push($group); |
| 53 | 53 | } |
| 54 | 54 | } |
@@ -84,8 +84,8 @@ discard block |
||
| 84 | 84 | $request->input('email') |
| 85 | 85 | ); |
| 86 | 86 | |
| 87 | - foreach($dataGroup->getAdditionalAttributes() as $additionalAttribute) { |
|
| 88 | - if($request->has($additionalAttribute)) { |
|
| 87 | + foreach ($dataGroup->getAdditionalAttributes() as $additionalAttribute) { |
|
| 88 | + if ($request->has($additionalAttribute)) { |
|
| 89 | 89 | $dataGroup->saveAdditionalAttribute($additionalAttribute, $request->input($additionalAttribute)); |
| 90 | 90 | } |
| 91 | 91 | } |
@@ -110,8 +110,8 @@ discard block |
||
| 110 | 110 | $request->input('email', $dataGroup->email()) |
| 111 | 111 | ); |
| 112 | 112 | |
| 113 | - foreach($dataGroup->getAdditionalAttributes() as $additionalAttribute) { |
|
| 114 | - if($request->has($additionalAttribute)) { |
|
| 113 | + foreach ($dataGroup->getAdditionalAttributes() as $additionalAttribute) { |
|
| 114 | + if ($request->has($additionalAttribute)) { |
|
| 115 | 115 | $dataGroup->saveAdditionalAttribute($additionalAttribute, $request->input($additionalAttribute)); |
| 116 | 116 | } |
| 117 | 117 | } |
@@ -62,8 +62,8 @@ discard block |
||
| 62 | 62 | $request->input('email') |
| 63 | 63 | ); |
| 64 | 64 | |
| 65 | - foreach($dataRole->getAdditionalAttributes() as $additionalAttribute) { |
|
| 66 | - if($request->has($additionalAttribute)) { |
|
| 65 | + foreach ($dataRole->getAdditionalAttributes() as $additionalAttribute) { |
|
| 66 | + if ($request->has($additionalAttribute)) { |
|
| 67 | 67 | $dataRole->saveAdditionalAttribute($additionalAttribute, $request->input($additionalAttribute)); |
| 68 | 68 | } |
| 69 | 69 | } |
@@ -97,8 +97,8 @@ discard block |
||
| 97 | 97 | $dataRole->id() |
| 98 | 98 | ); |
| 99 | 99 | |
| 100 | - foreach($dataRole->getAdditionalAttributes() as $additionalAttribute) { |
|
| 101 | - if($request->has($additionalAttribute)) { |
|
| 100 | + foreach ($dataRole->getAdditionalAttributes() as $additionalAttribute) { |
|
| 101 | + if ($request->has($additionalAttribute)) { |
|
| 102 | 102 | $dataRole->saveAdditionalAttribute($additionalAttribute, $request->input($additionalAttribute)); |
| 103 | 103 | } |
| 104 | 104 | } |
@@ -58,7 +58,7 @@ discard block |
||
| 58 | 58 | */ |
| 59 | 59 | public function getAdditionalAttribute(string $key) |
| 60 | 60 | { |
| 61 | - return (array_key_exists($key, ($this->{$this->getColumnName()}??[])) |
|
| 61 | + return (array_key_exists($key, ($this->{$this->getColumnName()} ?? [])) |
|
| 62 | 62 | ? $this->{$this->getColumnName()}[$key] : null); |
| 63 | 63 | } |
| 64 | 64 | |
@@ -70,7 +70,7 @@ discard block |
||
| 70 | 70 | */ |
| 71 | 71 | public function setAdditionalAttribute(string $key, $value) |
| 72 | 72 | { |
| 73 | - $this->attributes[$this->getColumnName()] = array_merge(($this->{$this->getColumnName()}??[]), [$key => $value]); |
|
| 73 | + $this->attributes[$this->getColumnName()] = array_merge(($this->{$this->getColumnName()} ?? []), [$key => $value]); |
|
| 74 | 74 | } |
| 75 | 75 | |
| 76 | 76 | /** |
@@ -126,10 +126,10 @@ discard block |
||
| 126 | 126 | */ |
| 127 | 127 | public function getAdditionalAttributesAttribute() |
| 128 | 128 | { |
| 129 | - if(!array_key_exists($this->getColumnName(), $this->attributes)) { |
|
| 129 | + if (!array_key_exists($this->getColumnName(), $this->attributes)) { |
|
| 130 | 130 | return []; |
| 131 | 131 | } |
| 132 | - if(is_string($this->attributes[$this->getColumnName()])) { |
|
| 132 | + if (is_string($this->attributes[$this->getColumnName()])) { |
|
| 133 | 133 | return (json_decode($this->attributes[$this->getColumnName()], true) ?? []); |
| 134 | 134 | } |
| 135 | 135 | return $this->attributes[$this->getColumnName()]; |
@@ -161,7 +161,7 @@ discard block |
||
| 161 | 161 | $additionalAccessors = array_map(function($propertyKey) { |
| 162 | 162 | return 'get'.Str::studly($propertyKey).'Attribute'; |
| 163 | 163 | }, static::getAdditionalAttributes()); |
| 164 | - if(in_array($method, $additionalAccessors)) { |
|
| 164 | + if (in_array($method, $additionalAccessors)) { |
|
| 165 | 165 | return $this->getAdditionalAttribute( |
| 166 | 166 | Str::snake(Str::substr(Str::substr($method, 3), 0, -9)) |
| 167 | 167 | ); |
@@ -171,7 +171,7 @@ discard block |
||
| 171 | 171 | $additionalAccessors = array_map(function($propertyKey) { |
| 172 | 172 | return 'set'.Str::studly($propertyKey).'Attribute'; |
| 173 | 173 | }, static::getAdditionalAttributes()); |
| 174 | - if(in_array($method, $additionalAccessors)) { |
|
| 174 | + if (in_array($method, $additionalAccessors)) { |
|
| 175 | 175 | $this->setAdditionalAttribute( |
| 176 | 176 | Str::snake(Str::substr(Str::substr($method, 3), 0, -9)), $args[0] |
| 177 | 177 | ); |