Passed
Pull Request — develop (#1)
by Jimmy
02:28
created
src/Api/Client.php 1 patch
Spacing   +20 added lines, -20 removed lines patch added patch discarded remove patch
@@ -48,11 +48,11 @@  discard block
 block discarded – undo
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
 block discarded – undo
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
 block discarded – undo
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
 block discarded – undo
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
 block discarded – undo
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
 block discarded – undo
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
 block discarded – undo
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
 block discarded – undo
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
 block discarded – undo
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
 block discarded – undo
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
 block discarded – undo
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
     /**
Please login to merge, or discard this patch.
src/Api/Token.php 1 patch
Spacing   +3 added lines, -3 removed lines patch added patch discarded remove patch
@@ -33,7 +33,7 @@  discard block
 block discarded – undo
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
 block discarded – undo
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
 
Please login to merge, or discard this patch.
src/Http/Middleware/Filter.php 1 patch
Spacing   +1 added lines, -1 removed lines patch added patch discarded remove patch
@@ -28,7 +28,7 @@
 block discarded – undo
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
 
Please login to merge, or discard this patch.
src/Providers/ServiceProvider.php 1 patch
Spacing   +5 added lines, -5 removed lines patch added patch discarded remove patch
@@ -33,7 +33,7 @@  discard block
 block discarded – undo
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
 block discarded – undo
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
 block discarded – undo
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
     }
Please login to merge, or discard this patch.
src/Support/Relations/BelongsTo.php 1 patch
Spacing   +2 added lines, -2 removed lines patch added patch discarded remove patch
@@ -42,7 +42,7 @@  discard block
 block discarded – undo
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
 block discarded – undo
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
 
Please login to merge, or discard this patch.
src/Concerns/HasClient.php 1 patch
Spacing   +1 added lines, -1 removed lines patch added patch discarded remove patch
@@ -21,7 +21,7 @@
 block discarded – undo
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
 
Please login to merge, or discard this patch.
src/Concerns/HasHalo.php 1 patch
Spacing   +3 added lines, -3 removed lines patch added patch discarded remove patch
@@ -63,13 +63,13 @@
 block discarded – undo
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
 
Please login to merge, or discard this patch.
src/Support/Model.php 1 patch
Spacing   +14 added lines, -14 removed lines patch added patch discarded remove patch
@@ -233,7 +233,7 @@  discard block
 block discarded – undo
233 233
      */
234 234
     protected function assumeForeignKey($related): string
235 235
     {
236
-        return Str::snake((new $related())->getResponseKey()).'_id';
236
+        return Str::snake((new $related())->getResponseKey()) . '_id';
237 237
     }
238 238
 
239 239
     /**
@@ -363,7 +363,7 @@  discard block
 block discarded – undo
363 363
      */
364 364
     public function getOrderByDirectionParameter(): string
365 365
     {
366
-        return $this->orderByDirectionParameter ?? $this->getOrderByParameter().'desc';
366
+        return $this->orderByDirectionParameter ?? $this->getOrderByParameter() . 'desc';
367 367
     }
368 368
 
369 369
     /**
@@ -390,20 +390,20 @@  discard block
 block discarded – undo
390 390
 
391 391
         // If have an id, then put it on the end
392 392
         if ($this->getKey()) {
393
-            $path .= '/'.$this->getKey();
393
+            $path .= '/' . $this->getKey();
394 394
         }
395 395
 
396 396
         // Stick any extra things on the end
397
-        if (! is_null($extra)) {
398
-            $path .= '/'.ltrim($extra, '/');
397
+        if (!is_null($extra)) {
398
+            $path .= '/' . ltrim($extra, '/');
399 399
         }
400 400
 
401
-        if (! empty($query)) {
402
-            $path .= '?'.http_build_query($this->convertBoolToString($query));
401
+        if (!empty($query)) {
402
+            $path .= '?' . http_build_query($this->convertBoolToString($query));
403 403
         }
404 404
 
405 405
         // If there is a parentModel & not have an id (unless for nested), then prepend parentModel
406
-        if (! is_null($this->parentModel) && (! $this->getKey() || $this->isNested())) {
406
+        if (!is_null($this->parentModel) && (!$this->getKey() || $this->isNested())) {
407 407
             return $this->parentModel->getPath($path);
408 408
         }
409 409
 
@@ -421,7 +421,7 @@  discard block
 block discarded – undo
421 421
     {
422 422
         $relation = $this->{$method}();
423 423
 
424
-        if (! $relation instanceof Relation) {
424
+        if (!$relation instanceof Relation) {
425 425
             $exception_message = is_null($relation)
426 426
                 ? '%s::%s must return a relationship instance, but "null" was returned. Was the "return" keyword used?'
427 427
                 : '%s::%s must return a relationship instance.';
@@ -433,7 +433,7 @@  discard block
 block discarded – undo
433 433
 
434 434
         return tap(
435 435
             $relation->getResults(),
436
-            function ($results) use ($method) {
436
+            function($results) use ($method) {
437 437
                 $this->setRelation($method, $results);
438 438
             }
439 439
         );
@@ -474,7 +474,7 @@  discard block
 block discarded – undo
474 474
         $model = (new $related([], $this->parentModel))->setClient($this->getClient());
475 475
 
476 476
         return (new Collection($given))->map(
477
-            function ($attributes) use ($model, $reset) {
477
+            function($attributes) use ($model, $reset) {
478 478
                 return $model->newFromBuilder($reset ? reset($attributes) : $attributes);
479 479
             }
480 480
         );
@@ -579,7 +579,7 @@  discard block
 block discarded – undo
579 579
      */
580 580
     public function offsetExists($offset): bool
581 581
     {
582
-        return ! is_null($this->getAttribute($offset));
582
+        return !is_null($this->getAttribute($offset));
583 583
     }
584 584
 
585 585
     /**
@@ -659,7 +659,7 @@  discard block
 block discarded – undo
659 659
         }
660 660
 
661 661
         try {
662
-            if (! $this->isDirty()) {
662
+            if (!$this->isDirty()) {
663 663
                 return true;
664 664
             }
665 665
 
@@ -704,7 +704,7 @@  discard block
 block discarded – undo
704 704
      */
705 705
     public function saveOrFail(): bool
706 706
     {
707
-        if (! $this->save()) {
707
+        if (!$this->save()) {
708 708
             throw new UnableToSaveException();
709 709
         }
710 710
 
Please login to merge, or discard this patch.
src/Support/Builder.php 1 patch
Spacing   +14 added lines, -14 removed lines patch added patch discarded remove patch
@@ -161,7 +161,7 @@  discard block
 block discarded – undo
161 161
      */
162 162
     public function __call(string $name, array $arguments)
163 163
     {
164
-        if (! isset($this->parentModel) && array_key_exists($name, $this->rootModels)) {
164
+        if (!isset($this->parentModel) && array_key_exists($name, $this->rootModels)) {
165 165
             return $this->newInstanceForModel($this->rootModels[$name]);
166 166
         }
167 167
 
@@ -182,7 +182,7 @@  discard block
 block discarded – undo
182 182
      * @throws NoClientException
183 183
      * @throws TokenException
184 184
      */
185
-    public function __get(string $name): Collection|Model|null
185
+    public function __get(string $name): Collection | Model | null
186 186
     {
187 187
         return match (true) {
188 188
             $name === 'agent' => $this->newInstanceForModel(Agent::class)
@@ -191,7 +191,7 @@  discard block
 block discarded – undo
191 191
             $name === 'user' => $this->newInstanceForModel(User::class)
192 192
                 ->get(extra: 'me')
193 193
                 ->first(),
194
-            ! $this->parentModel && array_key_exists($name, $this->rootModels) => $this->{$name}()
194
+            !$this->parentModel && array_key_exists($name, $this->rootModels) => $this->{$name}()
195 195
                 ->get(),
196 196
             default => null,
197 197
         };
@@ -230,7 +230,7 @@  discard block
 block discarded – undo
230 230
      * @throws NoClientException
231 231
      * @throws TokenException
232 232
      */
233
-    public function get(array|string $properties = ['*'], ?string $extra = null): Collection|Model
233
+    public function get(array | string $properties = ['*'], ?string $extra = null): Collection | Model
234 234
     {
235 235
         $properties = Arr::wrap($properties);
236 236
 
@@ -266,11 +266,11 @@  discard block
 block discarded – undo
266 266
      */
267 267
     public function getModel(): Model
268 268
     {
269
-        if (! isset($this->class)) {
269
+        if (!isset($this->class)) {
270 270
             throw new InvalidRelationshipException();
271 271
         }
272 272
 
273
-        if (! isset($this->model)) {
273
+        if (!isset($this->model)) {
274 274
             $this->model = (new $this->class([], $this->parentModel))->setClient($this->client);
275 275
         }
276 276
 
@@ -296,7 +296,7 @@  discard block
 block discarded – undo
296 296
      * @throws NoClientException
297 297
      * @throws TokenException
298 298
      */
299
-    public function find(int|string $id, array|string $properties = ['*']): Model
299
+    public function find(int | string $id, array | string $properties = ['*']): Model
300 300
     {
301 301
         return $this->whereId($id)
302 302
             ->get($properties)
@@ -318,7 +318,7 @@  discard block
 block discarded – undo
318 318
      *
319 319
      * @throws InvalidRelationshipException
320 320
      */
321
-    public function limit(int|string $count): self
321
+    public function limit(int | string $count): self
322 322
     {
323 323
         return $this->where('count', (int) $count);
324 324
     }
@@ -403,7 +403,7 @@  discard block
 block discarded – undo
403 403
      *
404 404
      * @throws InvalidRelationshipException
405 405
      */
406
-    public function page(int|string $number, int|string|null $size = null): self
406
+    public function page(int | string $number, int | string | null $size = null): self
407 407
     {
408 408
         return $this->where('page_no', (int) $number)
409 409
             ->when($size, fn (self $b): self => $b->paginate($size));
@@ -414,7 +414,7 @@  discard block
 block discarded – undo
414 414
      *
415 415
      * @throws InvalidRelationshipException
416 416
      */
417
-    public function pageinate(int|string|null $size = null): self
417
+    public function pageinate(int | string | null $size = null): self
418 418
     {
419 419
         return $this->paginate($size);
420 420
     }
@@ -424,7 +424,7 @@  discard block
 block discarded – undo
424 424
      *
425 425
      * @throws InvalidRelationshipException
426 426
      */
427
-    public function paginate(int|string|null $size = null): self
427
+    public function paginate(int | string | null $size = null): self
428 428
     {
429 429
         return $this->where('pageinate', true)
430 430
             ->when($size, fn (self $b): self => $b->where('page_size', (int) $size));
@@ -467,7 +467,7 @@  discard block
 block discarded – undo
467 467
      */
468 468
     public function setClass(string $class): self
469 469
     {
470
-        if (! class_exists($class)) {
470
+        if (!class_exists($class)) {
471 471
             throw new ModelNotFoundException(sprintf('The model [%s] not found.', $class));
472 472
         }
473 473
 
@@ -491,7 +491,7 @@  discard block
 block discarded – undo
491 491
      *
492 492
      * @throws InvalidRelationshipException
493 493
      */
494
-    public function take(int|string $count): self
494
+    public function take(int | string $count): self
495 495
     {
496 496
         return $this->limit($count);
497 497
     }
@@ -523,7 +523,7 @@  discard block
 block discarded – undo
523 523
      *
524 524
      * @throws InvalidRelationshipException
525 525
      */
526
-    public function whereId(int|string|null $id): self
526
+    public function whereId(int | string | null $id): self
527 527
     {
528 528
         return $this->where($this->getModel()->getKeyName(), $id);
529 529
     }
Please login to merge, or discard this patch.