@@ -56,8 +56,8 @@ discard block |
||
56 | 56 | $request->input('preferred_name') |
57 | 57 | ); |
58 | 58 | |
59 | - foreach($dataUser->getAdditionalAttributes() as $additionalAttribute) { |
|
60 | - if($request->has($additionalAttribute)) { |
|
59 | + foreach ($dataUser->getAdditionalAttributes() as $additionalAttribute) { |
|
60 | + if ($request->has($additionalAttribute)) { |
|
61 | 61 | $dataUser->saveAdditionalAttribute($additionalAttribute, $request->input($additionalAttribute)); |
62 | 62 | } |
63 | 63 | } |
@@ -78,24 +78,24 @@ discard block |
||
78 | 78 | { |
79 | 79 | $dataUser = $user->data(); |
80 | 80 | |
81 | - if($request->input('first_name') !== null) { |
|
81 | + if ($request->input('first_name') !== null) { |
|
82 | 82 | $dataUser->setFirstName($request->input('first_name')); |
83 | 83 | } |
84 | - if($request->input('last_name') !== null) { |
|
84 | + if ($request->input('last_name') !== null) { |
|
85 | 85 | $dataUser->setLastName($request->input('last_name')); |
86 | 86 | } |
87 | - if($request->input('email') !== null) { |
|
87 | + if ($request->input('email') !== null) { |
|
88 | 88 | $dataUser->setEmail($request->input('email')); |
89 | 89 | } |
90 | - if($request->input('dob') !== null) { |
|
90 | + if ($request->input('dob') !== null) { |
|
91 | 91 | $dataUser->setDob(Carbon::make($request->input('dob'))); |
92 | 92 | } |
93 | - if($request->input('preferred_name') !== null) { |
|
93 | + if ($request->input('preferred_name') !== null) { |
|
94 | 94 | $dataUser->setPreferredName($request->input('preferred_name')); |
95 | 95 | } |
96 | 96 | |
97 | - foreach($dataUser->getAdditionalAttributes() as $additionalAttribute) { |
|
98 | - if($request->has($additionalAttribute)) { |
|
97 | + foreach ($dataUser->getAdditionalAttributes() as $additionalAttribute) { |
|
98 | + if ($request->has($additionalAttribute)) { |
|
99 | 99 | $dataUser->saveAdditionalAttribute($additionalAttribute, $request->input($additionalAttribute)); |
100 | 100 | } |
101 | 101 | } |
@@ -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 | ); |
@@ -30,22 +30,22 @@ |
||
30 | 30 | { |
31 | 31 | $baseAttributes = $attributes; |
32 | 32 | $additionalAttributes = []; |
33 | - foreach(\BristolSU\ControlDB\Models\DataPosition::getAdditionalAttributes() as $property) { |
|
34 | - if(array_key_exists($property, $baseAttributes)) { |
|
33 | + foreach (\BristolSU\ControlDB\Models\DataPosition::getAdditionalAttributes() as $property) { |
|
34 | + if (array_key_exists($property, $baseAttributes)) { |
|
35 | 35 | $additionalAttributes[$property] = $baseAttributes[$property]; |
36 | 36 | unset($baseAttributes[$property]); |
37 | 37 | } |
38 | 38 | } |
39 | 39 | $users = \BristolSU\ControlDB\Models\DataPosition::where($baseAttributes)->get()->filter(function(\BristolSU\ControlDB\Models\DataPosition $dataPosition) use ($additionalAttributes) { |
40 | - foreach($additionalAttributes as $additionalAttribute => $value) { |
|
41 | - if($dataPosition->getAdditionalAttribute($additionalAttribute) !== $value) { |
|
40 | + foreach ($additionalAttributes as $additionalAttribute => $value) { |
|
41 | + if ($dataPosition->getAdditionalAttribute($additionalAttribute) !== $value) { |
|
42 | 42 | return false; |
43 | 43 | } |
44 | 44 | } |
45 | 45 | return true; |
46 | 46 | })->values(); |
47 | 47 | |
48 | - if($users->count() > 0) { |
|
48 | + if ($users->count() > 0) { |
|
49 | 49 | return $users->first(); |
50 | 50 | } |
51 | 51 | throw (new ModelNotFoundException())->setModel(DataPosition::class); |
@@ -30,22 +30,22 @@ |
||
30 | 30 | { |
31 | 31 | $baseAttributes = $attributes; |
32 | 32 | $additionalAttributes = []; |
33 | - foreach(\BristolSU\ControlDB\Models\DataRole::getAdditionalAttributes() as $property) { |
|
34 | - if(array_key_exists($property, $baseAttributes)) { |
|
33 | + foreach (\BristolSU\ControlDB\Models\DataRole::getAdditionalAttributes() as $property) { |
|
34 | + if (array_key_exists($property, $baseAttributes)) { |
|
35 | 35 | $additionalAttributes[$property] = $baseAttributes[$property]; |
36 | 36 | unset($baseAttributes[$property]); |
37 | 37 | } |
38 | 38 | } |
39 | 39 | $users = \BristolSU\ControlDB\Models\DataRole::where($baseAttributes)->get()->filter(function(\BristolSU\ControlDB\Models\DataRole $dataRole) use ($additionalAttributes) { |
40 | - foreach($additionalAttributes as $additionalAttribute => $value) { |
|
41 | - if($dataRole->getAdditionalAttribute($additionalAttribute) !== $value) { |
|
40 | + foreach ($additionalAttributes as $additionalAttribute => $value) { |
|
41 | + if ($dataRole->getAdditionalAttribute($additionalAttribute) !== $value) { |
|
42 | 42 | return false; |
43 | 43 | } |
44 | 44 | } |
45 | 45 | return true; |
46 | 46 | })->values(); |
47 | 47 | |
48 | - if($users->count() > 0) { |
|
48 | + if ($users->count() > 0) { |
|
49 | 49 | return $users->first(); |
50 | 50 | } |
51 | 51 | throw (new ModelNotFoundException())->setModel(DataRole::class); |
@@ -35,7 +35,7 @@ |
||
35 | 35 | unset($baseAttributes[$property]); |
36 | 36 | } |
37 | 37 | } |
38 | - $users = \BristolSU\ControlDB\Models\DataUser::where($baseAttributes)->get()->filter(function (\BristolSU\ControlDB\Models\DataUser $dataUser) use ($additionalAttributes) { |
|
38 | + $users = \BristolSU\ControlDB\Models\DataUser::where($baseAttributes)->get()->filter(function(\BristolSU\ControlDB\Models\DataUser $dataUser) use ($additionalAttributes) { |
|
39 | 39 | foreach ($additionalAttributes as $additionalAttribute => $value) { |
40 | 40 | if ($dataUser->getAdditionalAttribute($additionalAttribute) !== $value) { |
41 | 41 | return false; |
@@ -28,22 +28,22 @@ |
||
28 | 28 | { |
29 | 29 | $baseAttributes = $attributes; |
30 | 30 | $additionalAttributes = []; |
31 | - foreach(\BristolSU\ControlDB\Models\DataGroup::getAdditionalAttributes() as $property) { |
|
32 | - if(array_key_exists($property, $baseAttributes)) { |
|
31 | + foreach (\BristolSU\ControlDB\Models\DataGroup::getAdditionalAttributes() as $property) { |
|
32 | + if (array_key_exists($property, $baseAttributes)) { |
|
33 | 33 | $additionalAttributes[$property] = $baseAttributes[$property]; |
34 | 34 | unset($baseAttributes[$property]); |
35 | 35 | } |
36 | 36 | } |
37 | 37 | $users = \BristolSU\ControlDB\Models\DataGroup::where($baseAttributes)->get()->filter(function(\BristolSU\ControlDB\Models\DataGroup $dataGroup) use ($additionalAttributes) { |
38 | - foreach($additionalAttributes as $additionalAttribute => $value) { |
|
39 | - if($dataGroup->getAdditionalAttribute($additionalAttribute) !== $value) { |
|
38 | + foreach ($additionalAttributes as $additionalAttribute => $value) { |
|
39 | + if ($dataGroup->getAdditionalAttribute($additionalAttribute) !== $value) { |
|
40 | 40 | return false; |
41 | 41 | } |
42 | 42 | } |
43 | 43 | return true; |
44 | 44 | })->values(); |
45 | 45 | |
46 | - if($users->count() > 0) { |
|
46 | + if ($users->count() > 0) { |
|
47 | 47 | return $users->first(); |
48 | 48 | } |
49 | 49 | throw (new ModelNotFoundException())->setModel(DataGroup::class); |
@@ -110,10 +110,10 @@ discard block |
||
110 | 110 | */ |
111 | 111 | protected function registerConfig() |
112 | 112 | { |
113 | - $this->publishes([__DIR__ .'/../config/control.php' => config_path('control.php'), |
|
113 | + $this->publishes([__DIR__.'/../config/control.php' => config_path('control.php'), |
|
114 | 114 | ], 'config'); |
115 | 115 | $this->mergeConfigFrom( |
116 | - __DIR__ .'/../config/control.php', 'control' |
|
116 | + __DIR__.'/../config/control.php', 'control' |
|
117 | 117 | ); |
118 | 118 | } |
119 | 119 | |
@@ -125,13 +125,13 @@ discard block |
||
125 | 125 | public function registerFactories() |
126 | 126 | { |
127 | 127 | if (!app()->environment('production') && class_exists(\Faker\Factory::class)) { |
128 | - $this->app->make(Factory::class)->load(__DIR__ .'/../database/factories'); |
|
128 | + $this->app->make(Factory::class)->load(__DIR__.'/../database/factories'); |
|
129 | 129 | } |
130 | 130 | } |
131 | 131 | |
132 | 132 | public function registerMigrations() |
133 | 133 | { |
134 | - $this->loadMigrationsFrom(__DIR__ . '/../database/migrations'); |
|
134 | + $this->loadMigrationsFrom(__DIR__.'/../database/migrations'); |
|
135 | 135 | } |
136 | 136 | |
137 | 137 | public function bindContracts() |
@@ -255,7 +255,7 @@ discard block |
||
255 | 255 | Route::prefix(config('control.api_prefix')) |
256 | 256 | ->middleware(config('control.api_middleware')) |
257 | 257 | ->namespace('BristolSU\ControlDB\Http\Controllers') |
258 | - ->group(__DIR__ . '/../routes/api.php'); |
|
258 | + ->group(__DIR__.'/../routes/api.php'); |
|
259 | 259 | } |
260 | 260 | |
261 | 261 |
@@ -30,7 +30,7 @@ discard block |
||
30 | 30 | */ |
31 | 31 | public function getById(int $id): RoleModel |
32 | 32 | { |
33 | - return $this->cache->remember(static::class . '@getById:' . $id, 5000, function() use ($id) { |
|
33 | + return $this->cache->remember(static::class.'@getById:'.$id, 5000, function() use ($id) { |
|
34 | 34 | return $this->roleRepository->getById($id); |
35 | 35 | }); |
36 | 36 | } |
@@ -48,7 +48,7 @@ discard block |
||
48 | 48 | */ |
49 | 49 | public function getByDataProviderId(int $dataProviderId): RoleModel |
50 | 50 | { |
51 | - return $this->cache->remember(static::class . '@getByDataProviderId:' . $dataProviderId, 5000, function() use ($dataProviderId) { |
|
51 | + return $this->cache->remember(static::class.'@getByDataProviderId:'.$dataProviderId, 5000, function() use ($dataProviderId) { |
|
52 | 52 | return $this->roleRepository->getByDataProviderId($dataProviderId); |
53 | 53 | }); |
54 | 54 | } |
@@ -55,7 +55,7 @@ |
||
55 | 55 | |
56 | 56 | public function getItem($column, $default = null) |
57 | 57 | { |
58 | - if(array_key_exists($column, $this->prepared) && $this->prepared[$column] !== null) { |
|
58 | + if (array_key_exists($column, $this->prepared) && $this->prepared[$column] !== null) { |
|
59 | 59 | return $this->prepared[$column]; |
60 | 60 | } |
61 | 61 | return $default; |