@@ -48,11 +48,11 @@ discard block |
||
| 48 | 48 | 'verifier' => $verifier = base64_encode(Str::random($length)), |
| 49 | 49 | // Convert "+" to "-" & "/" to "_" & remove trailing "=" |
| 50 | 50 | 'challenge' => rtrim( |
| 51 | - characters: '=', |
|
| 52 | - string: strtr( |
|
| 53 | - from: '+/', |
|
| 54 | - string: base64_encode(hash(algo: 'sha256', data: $verifier, binary: true)), |
|
| 55 | - to: '-_', |
|
| 51 | + characters : '=', |
|
| 52 | + string : strtr( |
|
| 53 | + from : '+/', |
|
| 54 | + string : base64_encode(hash(algo : 'sha256', data : $verifier, binary : true)), |
|
| 55 | + to : '-_', |
|
| 56 | 56 | ), |
| 57 | 57 | ), |
| 58 | 58 | ] |
@@ -101,7 +101,7 @@ discard block |
||
| 101 | 101 | $grant_type = $this->token->grant_type ?? $params['grant_type']; |
| 102 | 102 | |
| 103 | 103 | if (is_null($this->configs['oauth'][$grant_type]['id'] ?? null)) { |
| 104 | - throw new ClientConfigurationException('The "client_id" for "'.$grant_type.'" cannot be null'); |
|
| 104 | + throw new ClientConfigurationException('The "client_id" for "' . $grant_type . '" cannot be null'); |
|
| 105 | 105 | } |
| 106 | 106 | |
| 107 | 107 | try { |
@@ -120,10 +120,10 @@ discard block |
||
| 120 | 120 | ], |
| 121 | 121 | ], |
| 122 | 122 | uri: $this->uri( |
| 123 | - path: 'token?'.http_build_query( |
|
| 123 | + path: 'token?' . http_build_query( |
|
| 124 | 124 | $this->configs['tenant'] ? ['tenant' => $this->configs['tenant']] : [], |
| 125 | 125 | ), |
| 126 | - url: $this->configs['oauth']['authorization_server'] |
|
| 126 | + url : $this->configs['oauth']['authorization_server'] |
|
| 127 | 127 | ), |
| 128 | 128 | ) |
| 129 | 129 | ->getBody() |
@@ -198,7 +198,7 @@ discard block |
||
| 198 | 198 | } |
| 199 | 199 | |
| 200 | 200 | return $this->uri( |
| 201 | - path: 'authorize?'.http_build_query( |
|
| 201 | + path: 'authorize?' . http_build_query( |
|
| 202 | 202 | [ |
| 203 | 203 | 'client_id' => $this->configs['oauth']['authorization_code']['id'], |
| 204 | 204 | ...$challenge |
@@ -212,7 +212,7 @@ discard block |
||
| 212 | 212 | 'scope' => $scope ?? $this->token->scope, |
| 213 | 213 | ...$this->configs['tenant'] ? ['tenant' => $this->configs['tenant']] : [], |
| 214 | 214 | ]), |
| 215 | - url: $this->configs['oauth']['authorization_server'] |
|
| 215 | + url : $this->configs['oauth']['authorization_server'] |
|
| 216 | 216 | ); |
| 217 | 217 | } |
| 218 | 218 | |
@@ -248,10 +248,10 @@ discard block |
||
| 248 | 248 | { |
| 249 | 249 | try { |
| 250 | 250 | return json_decode( |
| 251 | - associative: true, |
|
| 252 | - json: $this->guzzle->request( |
|
| 253 | - method: $method, |
|
| 254 | - options: [ |
|
| 251 | + associative : true, |
|
| 252 | + json : $this->guzzle->request( |
|
| 253 | + method : $method, |
|
| 254 | + options : [ |
|
| 255 | 255 | 'debug' => $this->debug, |
| 256 | 256 | 'headers' => [ |
| 257 | 257 | 'Authorization' => (string) $this->getToken(), |
@@ -259,7 +259,7 @@ discard block |
||
| 259 | 259 | ], |
| 260 | 260 | 'body' => empty($data) ? null : json_encode($data), |
| 261 | 261 | ], |
| 262 | - uri: $this->uri($path), |
|
| 262 | + uri : $this->uri($path), |
|
| 263 | 263 | ) |
| 264 | 264 | ->getBody() |
| 265 | 265 | ->getContents(), |
@@ -289,7 +289,7 @@ discard block |
||
| 289 | 289 | throw new ClientConfigurationException('The "authorization_server" cannot be null'); |
| 290 | 290 | } |
| 291 | 291 | |
| 292 | - if (! filter_var($this->configs['oauth']['authorization_server'], FILTER_VALIDATE_URL)) { |
|
| 292 | + if (!filter_var($this->configs['oauth']['authorization_server'], FILTER_VALIDATE_URL)) { |
|
| 293 | 293 | throw new ClientConfigurationException( |
| 294 | 294 | sprintf('A valid url must be provided for "authorization_server" [%s]', $this->configs['oauth']['authorization_server']) |
| 295 | 295 | ); |
@@ -299,7 +299,7 @@ discard block |
||
| 299 | 299 | throw new ClientConfigurationException('The "resource_server" cannot be null'); |
| 300 | 300 | } |
| 301 | 301 | |
| 302 | - if (! filter_var($this->configs['resource_server'], FILTER_VALIDATE_URL)) { |
|
| 302 | + if (!filter_var($this->configs['resource_server'], FILTER_VALIDATE_URL)) { |
|
| 303 | 303 | throw new ClientConfigurationException( |
| 304 | 304 | sprintf('A valid url must be provided for "resource_server" [%s]', $this->configs['resource_server']) |
| 305 | 305 | ); |
@@ -321,10 +321,10 @@ discard block |
||
| 321 | 321 | /** |
| 322 | 322 | * Set the token & refresh if needed |
| 323 | 323 | */ |
| 324 | - public function setToken(Token|string $token): self |
|
| 324 | + public function setToken(Token | string $token): self |
|
| 325 | 325 | { |
| 326 | 326 | $this->token = is_string($token) |
| 327 | - ? new Token(access_token: $token) |
|
| 327 | + ? new Token(access_token : $token) |
|
| 328 | 328 | : $token; |
| 329 | 329 | |
| 330 | 330 | return $this; |
@@ -346,7 +346,7 @@ discard block |
||
| 346 | 346 | $path = ltrim($path ?? '/', '/'); |
| 347 | 347 | |
| 348 | 348 | return rtrim($url ?? $this->configs['resource_server'], '/') |
| 349 | - .($path ? (Str::startsWith($path, '?') ? null : '/').$path : '/'); |
|
| 349 | + .($path ? (Str::startsWith($path, '?') ? null : '/') . $path : '/'); |
|
| 350 | 350 | } |
| 351 | 351 | |
| 352 | 352 | /** |
@@ -33,7 +33,7 @@ discard block |
||
| 33 | 33 | |
| 34 | 34 | public function __toString(): string |
| 35 | 35 | { |
| 36 | - return $this->token_type.' '.$this->access_token; |
|
| 36 | + return $this->token_type . ' ' . $this->access_token; |
|
| 37 | 37 | } |
| 38 | 38 | |
| 39 | 39 | /** |
@@ -63,8 +63,8 @@ discard block |
||
| 63 | 63 | */ |
| 64 | 64 | public function isValid(?string $scope = null): bool |
| 65 | 65 | { |
| 66 | - return ! is_null($this->access_token) && |
|
| 67 | - ! $this->isExpired() && |
|
| 66 | + return !is_null($this->access_token) && |
|
| 67 | + !$this->isExpired() && |
|
| 68 | 68 | ($scope ? $this->allowedScope($scope) : true); |
| 69 | 69 | } |
| 70 | 70 | |
@@ -28,7 +28,7 @@ |
||
| 28 | 28 | */ |
| 29 | 29 | public function handle(Request $request, Closure $next) |
| 30 | 30 | { |
| 31 | - if (! $request->user()->halo_token) { |
|
| 31 | + if (!$request->user()->halo_token) { |
|
| 32 | 32 | // Set intended route, so that after linking account, user is put where they were going |
| 33 | 33 | $this->redirector->setIntendedUrl($request->path()); |
| 34 | 34 | |
@@ -33,7 +33,7 @@ discard block |
||
| 33 | 33 | */ |
| 34 | 34 | public function register() |
| 35 | 35 | { |
| 36 | - $this->mergeConfigFrom(__DIR__.'/../../config/halo.php', 'halo'); |
|
| 36 | + $this->mergeConfigFrom(__DIR__ . '/../../config/halo.php', 'halo'); |
|
| 37 | 37 | } |
| 38 | 38 | |
| 39 | 39 | /** |
@@ -54,19 +54,19 @@ discard block |
||
| 54 | 54 | protected function registerPublishes() |
| 55 | 55 | { |
| 56 | 56 | if ($this->app->runningInConsole()) { |
| 57 | - $this->loadMigrationsFrom(__DIR__.'/../../database/migrations'); |
|
| 57 | + $this->loadMigrationsFrom(__DIR__ . '/../../database/migrations'); |
|
| 58 | 58 | |
| 59 | 59 | $this->publishes( |
| 60 | 60 | groups: 'halo-config', |
| 61 | 61 | paths: [ |
| 62 | - __DIR__.'/../../config/halo.php' => config_path('halo.php'), |
|
| 62 | + __DIR__ . '/../../config/halo.php' => config_path('halo.php'), |
|
| 63 | 63 | ], |
| 64 | 64 | ); |
| 65 | 65 | |
| 66 | 66 | $this->publishes( |
| 67 | 67 | groups: 'halo-migrations', |
| 68 | 68 | paths: [ |
| 69 | - __DIR__.'/../../database/migrations' => database_path('migrations'), |
|
| 69 | + __DIR__ . '/../../database/migrations' => database_path('migrations'), |
|
| 70 | 70 | ], |
| 71 | 71 | ); |
| 72 | 72 | } |
@@ -83,7 +83,7 @@ discard block |
||
| 83 | 83 | 'namespace' => 'Spinen\Halo\Http\Controllers', |
| 84 | 84 | 'middleware' => Config::get('halo.oauth.authorization_code.route.middleware', ['web']), |
| 85 | 85 | ], |
| 86 | - routes: fn () => $this->loadRoutesFrom(realpath(__DIR__.'/../../routes/web.php')) |
|
| 86 | + routes: fn () => $this->loadRoutesFrom(realpath(__DIR__ . '/../../routes/web.php')) |
|
| 87 | 87 | ); |
| 88 | 88 | } |
| 89 | 89 | } |
@@ -42,7 +42,7 @@ discard block |
||
| 42 | 42 | /** |
| 43 | 43 | * Get the foreign key's name |
| 44 | 44 | */ |
| 45 | - public function getForeignKey(): int|string|null |
|
| 45 | + public function getForeignKey(): int | string | null |
|
| 46 | 46 | { |
| 47 | 47 | return $this->getChild()->{$this->getForeignKeyName()}; |
| 48 | 48 | } |
@@ -65,7 +65,7 @@ discard block |
||
| 65 | 65 | */ |
| 66 | 66 | public function getResults(): ?Model |
| 67 | 67 | { |
| 68 | - if (! $this->getForeignKey()) { |
|
| 68 | + if (!$this->getForeignKey()) { |
|
| 69 | 69 | return null; |
| 70 | 70 | } |
| 71 | 71 | |
@@ -217,7 +217,7 @@ discard block |
||
| 217 | 217 | */ |
| 218 | 218 | protected function assumeForeignKey($related): string |
| 219 | 219 | { |
| 220 | - return Str::snake((new $related())->getResponseKey()).'_id'; |
|
| 220 | + return Str::snake((new $related())->getResponseKey()) . '_id'; |
|
| 221 | 221 | } |
| 222 | 222 | |
| 223 | 223 | /** |
@@ -346,21 +346,21 @@ discard block |
||
| 346 | 346 | |
| 347 | 347 | // If have an id, then put it on the end |
| 348 | 348 | if ($this->getKey()) { |
| 349 | - $path .= '/'.$this->getKey(); |
|
| 349 | + $path .= '/' . $this->getKey(); |
|
| 350 | 350 | } |
| 351 | 351 | |
| 352 | 352 | // Stick any extra things on the end |
| 353 | - if (! is_null($extra)) { |
|
| 354 | - $path .= '/'.ltrim($extra, '/'); |
|
| 353 | + if (!is_null($extra)) { |
|
| 354 | + $path .= '/' . ltrim($extra, '/'); |
|
| 355 | 355 | } |
| 356 | 356 | |
| 357 | 357 | // Convert query to querystring format and put on the end |
| 358 | - if (! empty($query)) { |
|
| 359 | - $path .= '?'.http_build_query($query); |
|
| 358 | + if (!empty($query)) { |
|
| 359 | + $path .= '?' . http_build_query($query); |
|
| 360 | 360 | } |
| 361 | 361 | |
| 362 | 362 | // If there is a parentModel & not have an id (unless for nested), then prepend parentModel |
| 363 | - if (! is_null($this->parentModel) && (! $this->getKey() || $this->isNested())) { |
|
| 363 | + if (!is_null($this->parentModel) && (!$this->getKey() || $this->isNested())) { |
|
| 364 | 364 | return $this->parentModel->getPath($path); |
| 365 | 365 | } |
| 366 | 366 | |
@@ -378,7 +378,7 @@ discard block |
||
| 378 | 378 | { |
| 379 | 379 | $relation = $this->{$method}(); |
| 380 | 380 | |
| 381 | - if (! $relation instanceof Relation) { |
|
| 381 | + if (!$relation instanceof Relation) { |
|
| 382 | 382 | $exception_message = is_null($relation) |
| 383 | 383 | ? '%s::%s must return a relationship instance, but "null" was returned. Was the "return" keyword used?' |
| 384 | 384 | : '%s::%s must return a relationship instance.'; |
@@ -390,7 +390,7 @@ discard block |
||
| 390 | 390 | |
| 391 | 391 | return tap( |
| 392 | 392 | $relation->getResults(), |
| 393 | - function ($results) use ($method) { |
|
| 393 | + function($results) use ($method) { |
|
| 394 | 394 | $this->setRelation($method, $results); |
| 395 | 395 | } |
| 396 | 396 | ); |
@@ -431,7 +431,7 @@ discard block |
||
| 431 | 431 | $model = (new $related([], $this->parentModel))->setClient($this->getClient()); |
| 432 | 432 | |
| 433 | 433 | return (new Collection($given))->map( |
| 434 | - function ($attributes) use ($model, $reset) { |
|
| 434 | + function($attributes) use ($model, $reset) { |
|
| 435 | 435 | return $model->newFromBuilder($reset ? reset($attributes) : $attributes); |
| 436 | 436 | } |
| 437 | 437 | ); |
@@ -536,7 +536,7 @@ discard block |
||
| 536 | 536 | */ |
| 537 | 537 | public function offsetExists($offset): bool |
| 538 | 538 | { |
| 539 | - return ! is_null($this->getAttribute($offset)); |
|
| 539 | + return !is_null($this->getAttribute($offset)); |
|
| 540 | 540 | } |
| 541 | 541 | |
| 542 | 542 | /** |
@@ -616,7 +616,7 @@ discard block |
||
| 616 | 616 | } |
| 617 | 617 | |
| 618 | 618 | try { |
| 619 | - if (! $this->isDirty()) { |
|
| 619 | + if (!$this->isDirty()) { |
|
| 620 | 620 | return true; |
| 621 | 621 | } |
| 622 | 622 | |
@@ -661,7 +661,7 @@ discard block |
||
| 661 | 661 | */ |
| 662 | 662 | public function saveOrFail(): bool |
| 663 | 663 | { |
| 664 | - if (! $this->save()) { |
|
| 664 | + if (!$this->save()) { |
|
| 665 | 665 | throw new UnableToSaveException(); |
| 666 | 666 | } |
| 667 | 667 | |
@@ -113,7 +113,7 @@ discard block |
||
| 113 | 113 | */ |
| 114 | 114 | public function __call(string $name, array $arguments) |
| 115 | 115 | { |
| 116 | - if (! isset($this->parentModel) && array_key_exists($name, $this->rootModels)) { |
|
| 116 | + if (!isset($this->parentModel) && array_key_exists($name, $this->rootModels)) { |
|
| 117 | 117 | return $this->newInstanceForModel($this->rootModels[$name]); |
| 118 | 118 | } |
| 119 | 119 | |
@@ -129,7 +129,7 @@ discard block |
||
| 129 | 129 | * @throws NoClientException |
| 130 | 130 | * @throws TokenException |
| 131 | 131 | */ |
| 132 | - public function __get(string $name): Collection|Model|null |
|
| 132 | + public function __get(string $name): Collection | Model | null |
|
| 133 | 133 | { |
| 134 | 134 | return match(true) { |
| 135 | 135 | $name === 'agent' => $this->newInstanceForModel(Agent::class) |
@@ -138,7 +138,7 @@ discard block |
||
| 138 | 138 | $name === 'user' => $this->newInstanceForModel(User::class) |
| 139 | 139 | ->get(extra: 'me') |
| 140 | 140 | ->first(), |
| 141 | - ! $this->parentModel && array_key_exists($name, $this->rootModels) => $this->{$name}() |
|
| 141 | + !$this->parentModel && array_key_exists($name, $this->rootModels) => $this->{$name}() |
|
| 142 | 142 | ->get(), |
| 143 | 143 | default => null, |
| 144 | 144 | }; |
@@ -177,7 +177,7 @@ discard block |
||
| 177 | 177 | * @throws NoClientException |
| 178 | 178 | * @throws TokenException |
| 179 | 179 | */ |
| 180 | - public function get(array|string $properties = ['*'], ?string $extra = null): Collection|Model |
|
| 180 | + public function get(array | string $properties = ['*'], ?string $extra = null): Collection | Model |
|
| 181 | 181 | { |
| 182 | 182 | $properties = Arr::wrap($properties); |
| 183 | 183 | |
@@ -211,11 +211,11 @@ discard block |
||
| 211 | 211 | */ |
| 212 | 212 | public function getModel(): Model |
| 213 | 213 | { |
| 214 | - if (! isset($this->class)) { |
|
| 214 | + if (!isset($this->class)) { |
|
| 215 | 215 | throw new InvalidRelationshipException(); |
| 216 | 216 | } |
| 217 | 217 | |
| 218 | - if (! isset($this->model)) { |
|
| 218 | + if (!isset($this->model)) { |
|
| 219 | 219 | $this->model = (new $this->class([], $this->parentModel))->setClient($this->client); |
| 220 | 220 | } |
| 221 | 221 | |
@@ -241,7 +241,7 @@ discard block |
||
| 241 | 241 | * @throws NoClientException |
| 242 | 242 | * @throws TokenException |
| 243 | 243 | */ |
| 244 | - public function find(int|string $id, array|string $properties = ['*']): Model |
|
| 244 | + public function find(int | string $id, array | string $properties = ['*']): Model |
|
| 245 | 245 | { |
| 246 | 246 | return $this->where($this->getModel()->getKeyName(), $id) |
| 247 | 247 | ->get($properties) |
@@ -327,7 +327,7 @@ discard block |
||
| 327 | 327 | */ |
| 328 | 328 | public function setClass(string $class): self |
| 329 | 329 | { |
| 330 | - if (! class_exists($class)) { |
|
| 330 | + if (!class_exists($class)) { |
|
| 331 | 331 | throw new ModelNotFoundException(sprintf('The model [%s] not found.', $class)); |
| 332 | 332 | } |
| 333 | 333 | |
@@ -373,7 +373,7 @@ discard block |
||
| 373 | 373 | * |
| 374 | 374 | * @throws InvalidRelationshipException |
| 375 | 375 | */ |
| 376 | - public function whereId(int|string|null $id): self |
|
| 376 | + public function whereId(int | string | null $id): self |
|
| 377 | 377 | { |
| 378 | 378 | return $this->where($this->getModel()->getKeyName(), $id); |
| 379 | 379 | } |
@@ -21,7 +21,7 @@ |
||
| 21 | 21 | */ |
| 22 | 22 | public function getClient(): Client |
| 23 | 23 | { |
| 24 | - if (! isset($this->client) && $this->parentModel) { |
|
| 24 | + if (!isset($this->client) && $this->parentModel) { |
|
| 25 | 25 | $this->client = $this->parentModel->getClient(); |
| 26 | 26 | } |
| 27 | 27 | |
@@ -63,13 +63,13 @@ |
||
| 63 | 63 | public function haloToken(): Attribute |
| 64 | 64 | { |
| 65 | 65 | return Attribute::make( |
| 66 | - get: fn ($value, array $attributes): ?Token => ! is_null($attributes['halo_token']) |
|
| 66 | + get: fn ($value, array $attributes): ?Token => !is_null($attributes['halo_token']) |
|
| 67 | 67 | ? unserialize(Crypt::decryptString($attributes['halo_token'])) |
| 68 | 68 | : null, |
| 69 | - set: function ($value): ?string { |
|
| 69 | + set : function($value): ?string { |
|
| 70 | 70 | // If setting the password & already have a client, then |
| 71 | 71 | // empty the client to use new password in client |
| 72 | - if (! is_null($this->builder)) { |
|
| 72 | + if (!is_null($this->builder)) { |
|
| 73 | 73 | $this->builder = null; |
| 74 | 74 | } |
| 75 | 75 | |