@@ -51,7 +51,7 @@ |
||
| 51 | 51 | |
| 52 | 52 | See https://github.com/zsturgess/overwatch/blob/master/app/Resources/docs/installing.md#cleaning-up-results |
| 53 | 53 | |
| 54 | -EOF |
|
| 54 | +eof |
|
| 55 | 55 | ) |
| 56 | 56 | ; |
| 57 | 57 | } |
@@ -232,9 +232,19 @@ |
||
| 232 | 232 | /** |
| 233 | 233 | * FOSUserBundle needs groups to have roles. We don't. |
| 234 | 234 | */ |
| 235 | - public function getRoles() { return []; } |
|
| 236 | - public function setRoles(array $roles) { return $this; } |
|
| 237 | - public function addRole($role) { return $this; } |
|
| 238 | - public function removeRole($role) { return $this; } |
|
| 239 | - public function hasRole($role) { return false; } |
|
| 235 | + public function getRoles() |
|
| 236 | + { |
|
| 237 | +return []; } |
|
| 238 | + public function setRoles(array $roles) |
|
| 239 | + { |
|
| 240 | +return $this; } |
|
| 241 | + public function addRole($role) |
|
| 242 | + { |
|
| 243 | +return $this; } |
|
| 244 | + public function removeRole($role) |
|
| 245 | + { |
|
| 246 | +return $this; } |
|
| 247 | + public function hasRole($role) |
|
| 248 | + { |
|
| 249 | +return false; } |
|
| 240 | 250 | } |
@@ -139,7 +139,8 @@ discard block |
||
| 139 | 139 | * |
| 140 | 140 | * @return string |
| 141 | 141 | */ |
| 142 | - public function getTelephoneNumber() { |
|
| 142 | + public function getTelephoneNumber() |
|
| 143 | + { |
|
| 143 | 144 | return $this->telephoneNumber; |
| 144 | 145 | } |
| 145 | 146 | |
@@ -149,7 +150,8 @@ discard block |
||
| 149 | 150 | * @param string $telephoneNumber |
| 150 | 151 | * @return User |
| 151 | 152 | */ |
| 152 | - public function setTelephoneNumber($telephoneNumber) { |
|
| 153 | + public function setTelephoneNumber($telephoneNumber) |
|
| 154 | + { |
|
| 153 | 155 | $this->telephoneNumber = $telephoneNumber; |
| 154 | 156 | |
| 155 | 157 | return $this; |
@@ -44,6 +44,6 @@ |
||
| 44 | 44 | } |
| 45 | 45 | } |
| 46 | 46 | |
| 47 | - throw new Result\ExpectationFailedException("Expected $actual to resolve to $expected, actually resolves to $found"); |
|
| 47 | + throw new Result\ExpectationFailedException("expected $actual to resolve to $expected, actually resolves to $found"); |
|
| 48 | 48 | } |
| 49 | 49 | } |
@@ -43,7 +43,7 @@ discard block |
||
| 43 | 43 | } catch (\Exception $e) { |
| 44 | 44 | //Transform exception under certain circumstances, else re-throw. |
| 45 | 45 | if ($e instanceof \GuzzleHttp\Exception\RequestException && !$e->hasResponse()) { |
| 46 | - throw new Result\ExpectationFailedException("Expected $actual to respond HTTP $expected, actually failed to respond", 0, $e); |
|
| 46 | + throw new Result\ExpectationFailedException("expected $actual to respond HTTP $expected, actually failed to respond", 0, $e); |
|
| 47 | 47 | } |
| 48 | 48 | |
| 49 | 49 | throw $e; |
@@ -53,7 +53,7 @@ discard block |
||
| 53 | 53 | |
| 54 | 54 | if ($this->isValidStatusCode($expected)) { |
| 55 | 55 | if ((int) $expected !== $result) { |
| 56 | - throw new Result\ExpectationFailedException("Expected $actual to respond HTTP $expected, actually responded HTTP $result"); |
|
| 56 | + throw new Result\ExpectationFailedException("expected $actual to respond HTTP $expected, actually responded HTTP $result"); |
|
| 57 | 57 | } |
| 58 | 58 | } else { |
| 59 | 59 | if (in_array($result, $this->config["unsatisfactory_codes"])) { |
@@ -170,7 +170,8 @@ |
||
| 170 | 170 | * } |
| 171 | 171 | * ) |
| 172 | 172 | */ |
| 173 | - public function updateUser(Request $request) { |
|
| 173 | + public function updateUser(Request $request) |
|
| 174 | + { |
|
| 174 | 175 | $user = $this->getUser(); |
| 175 | 176 | $user |
| 176 | 177 | ->setAlertSetting($request->request->get('alertSetting', $user->getAlertSetting())) |