spinen / halo-php-client

routes/web.php

Indentation +1 added lines, -1 removed lines

@@ -5,4 +5,4 @@
 use Spinen\Halo\Http\Controllers\HaloController;
 
 Route::get(rtrim(Config::get('halo.oauth.authorization_code.route.sso', '/halo/sso'), '/'), HaloController::class)
-     ->name('halo.sso.redirect_uri');
+        ->name('halo.sso.redirect_uri');

src/Api/Client.php

Indentation +45 added lines, -45 removed lines

@@ -27,16 +27,16 @@ 
         $this->setToken($token);
     }
 
-     /**
-      * Shortcut to 'DELETE' request
-      *
-      * @throws GuzzleException
-      * @throws TokenException
-      */
-     public function delete(string $path): ?array
-     {
-         return $this->request($path, [], 'DELETE');
-     }
+        /**
+         * Shortcut to 'DELETE' request
+         *
+         * @throws GuzzleException
+         * @throws TokenException
+         */
+        public function delete(string $path): ?array
+        {
+            return $this->request($path, [], 'DELETE');
+        }
 
     /**
      * Generate keys need for PKCE
@@ -272,41 +272,41 @@ 
         }
     }
 
-     /**
-      * Validate & set the configs
-      *
-      * @throws ClientConfigurationException
-      */
-     protected function setConfigs(array $configs): self
-     {
-         // Replace empty strings with nulls in config values
-         $this->configs = array_map(fn ($v) => $v === '' ? null : $v, $configs);
-
-         // Default to true if not set
-         $this->configs['oauth']['authorization_code']['pkce'] ??= true;
-
-         if (is_null($this->configs['oauth']['authorization_server'] ?? null)) {
-             throw new ClientConfigurationException('The "authorization_server" cannot be null');
-         }
-
-         if (! filter_var($this->configs['oauth']['authorization_server'], FILTER_VALIDATE_URL)) {
-             throw new ClientConfigurationException(
-                 sprintf('A valid url must be provided for "authorization_server" [%s]', $this->configs['oauth']['authorization_server'])
-             );
-         }
-
-         if (is_null($this->configs['resource_server'] ?? null)) {
-             throw new ClientConfigurationException('The "resource_server" cannot be null');
-         }
-
-         if (! filter_var($this->configs['resource_server'], FILTER_VALIDATE_URL)) {
-             throw new ClientConfigurationException(
-                 sprintf('A valid url must be provided for "resource_server" [%s]', $this->configs['resource_server'])
-             );
-         }
-
-         return $this;
-     }
+        /**
+         * Validate & set the configs
+         *
+         * @throws ClientConfigurationException
+         */
+        protected function setConfigs(array $configs): self
+        {
+            // Replace empty strings with nulls in config values
+            $this->configs = array_map(fn ($v) => $v === '' ? null : $v, $configs);
+
+            // Default to true if not set
+            $this->configs['oauth']['authorization_code']['pkce'] ??= true;
+
+            if (is_null($this->configs['oauth']['authorization_server'] ?? null)) {
+                throw new ClientConfigurationException('The "authorization_server" cannot be null');
+            }
+
+            if (! filter_var($this->configs['oauth']['authorization_server'], FILTER_VALIDATE_URL)) {
+                throw new ClientConfigurationException(
+                    sprintf('A valid url must be provided for "authorization_server" [%s]', $this->configs['oauth']['authorization_server'])
+                );
+            }
+
+            if (is_null($this->configs['resource_server'] ?? null)) {
+                throw new ClientConfigurationException('The "resource_server" cannot be null');
+            }
+
+            if (! filter_var($this->configs['resource_server'], FILTER_VALIDATE_URL)) {
+                throw new ClientConfigurationException(
+                    sprintf('A valid url must be provided for "resource_server" [%s]', $this->configs['resource_server'])
+                );
+            }
+
+            return $this;
+        }
 
     /**
      * Set debug

Spacing +20 added lines, -20 removed lines

@@ -48,11 +48,11 @@ 
                 'verifier' => $verifier = base64_encode(Str::random($length)),
                 // Convert "+" to "-" & "/" to "_" & remove trailing "="
                 'challenge' => rtrim(
-                    characters: '=',
-                    string: strtr(
-                        from: '+/',
-                        string: base64_encode(hash(algo: 'sha256', data: $verifier, binary: true)),
-                        to: '-_',
+                    characters : '=',
+                    string : strtr(
+                        from : '+/',
+                        string : base64_encode(hash(algo : 'sha256', data : $verifier, binary : true)),
+                        to : '-_',
                     ),
                 ),
             ]
@@ -101,7 +101,7 @@ 
         $grant_type = $this->token->grant_type ?? $params['grant_type'];
 
         if (is_null($this->configs['oauth'][$grant_type]['id'] ?? null)) {
-            throw new ClientConfigurationException('The "client_id" for "'.$grant_type.'" cannot be null');
+            throw new ClientConfigurationException('The "client_id" for "' . $grant_type . '" cannot be null');
         }
 
         try {
@@ -120,10 +120,10 @@ 
                         ],
                     ],
                     uri: $this->uri(
-                        path: 'token?'.http_build_query(
+                        path: 'token?' . http_build_query(
                             $this->configs['tenant'] ? ['tenant' => $this->configs['tenant']] : [],
                         ),
-                        url: $this->configs['oauth']['authorization_server']
+                        url : $this->configs['oauth']['authorization_server']
                     ),
                 )
                     ->getBody()
@@ -198,7 +198,7 @@ 
         }
 
         return $this->uri(
-            path: 'authorize?'.http_build_query(
+            path: 'authorize?' . http_build_query(
                 [
                     'client_id' => $this->configs['oauth']['authorization_code']['id'],
                     ...$challenge
@@ -212,7 +212,7 @@ 
                     'scope' => $scope ?? $this->token->scope,
                     ...$this->configs['tenant'] ? ['tenant' => $this->configs['tenant']] : [],
                 ]),
-            url: $this->configs['oauth']['authorization_server']
+            url : $this->configs['oauth']['authorization_server']
         );
     }
 
@@ -248,10 +248,10 @@ 
     {
         try {
             return json_decode(
-                associative: true,
-                json: $this->guzzle->request(
-                    method: $method,
-                    options: [
+                associative : true,
+                json : $this->guzzle->request(
+                    method : $method,
+                    options : [
                         'debug' => $this->debug,
                         'headers' => [
                             'Authorization' => (string) $this->getToken(),
@@ -259,7 +259,7 @@ 
                         ],
                         'body' => empty($data) ? null : json_encode($data),
                     ],
-                    uri: $this->uri($path),
+                    uri : $this->uri($path),
                 )
                     ->getBody()
                     ->getContents(),
@@ -289,7 +289,7 @@ 
              throw new ClientConfigurationException('The "authorization_server" cannot be null');
          }
 
-         if (! filter_var($this->configs['oauth']['authorization_server'], FILTER_VALIDATE_URL)) {
+         if (!filter_var($this->configs['oauth']['authorization_server'], FILTER_VALIDATE_URL)) {
              throw new ClientConfigurationException(
                  sprintf('A valid url must be provided for "authorization_server" [%s]', $this->configs['oauth']['authorization_server'])
              );
@@ -299,7 +299,7 @@ 
              throw new ClientConfigurationException('The "resource_server" cannot be null');
          }
 
-         if (! filter_var($this->configs['resource_server'], FILTER_VALIDATE_URL)) {
+         if (!filter_var($this->configs['resource_server'], FILTER_VALIDATE_URL)) {
              throw new ClientConfigurationException(
                  sprintf('A valid url must be provided for "resource_server" [%s]', $this->configs['resource_server'])
              );
@@ -321,10 +321,10 @@ 
     /**
      * Set the token & refresh if needed
      */
-    public function setToken(Token|string $token): self
+    public function setToken(Token | string $token): self
     {
         $this->token = is_string($token)
-            ? new Token(access_token: $token)
+            ? new Token(access_token : $token)
             : $token;
 
         return $this;
@@ -346,7 +346,7 @@ 
         $path = ltrim($path ?? '/', '/');
 
         return rtrim($url ?? $this->configs['resource_server'], '/')
-            .($path ? (Str::startsWith($path, '?') ? null : '/').$path : '/');
+            .($path ? (Str::startsWith($path, '?') ? null : '/') . $path : '/');
     }
 
     /**

src/Api/Token.php

Spacing +3 added lines, -3 removed lines

@@ -33,7 +33,7 @@ 
 
     public function __toString(): string
     {
-        return $this->token_type.' '.$this->access_token;
+        return $this->token_type . ' ' . $this->access_token;
     }
 
     /**
@@ -63,8 +63,8 @@ 
      */
     public function isValid(?string $scope = null): bool
     {
-        return ! is_null($this->access_token) &&
-            ! $this->isExpired() &&
+        return !is_null($this->access_token) &&
+            !$this->isExpired() &&
             ($scope ? $this->allowedScope($scope) : true);
     }
 

src/Http/Middleware/Filter.php

Spacing +1 added lines, -1 removed lines

@@ -28,7 +28,7 @@
      */
     public function handle(Request $request, Closure $next)
     {
-        if (! $request->user()->halo_token) {
+        if (!$request->user()->halo_token) {
             // Set intended route, so that after linking account, user is put where they were going
             $this->redirector->setIntendedUrl($request->path());
 

src/Providers/ServiceProvider.php

Spacing +5 added lines, -5 removed lines

@@ -33,7 +33,7 @@ 
      */
     public function register()
     {
-        $this->mergeConfigFrom(__DIR__.'/../../config/halo.php', 'halo');
+        $this->mergeConfigFrom(__DIR__ . '/../../config/halo.php', 'halo');
     }
 
     /**
@@ -54,19 +54,19 @@ 
     protected function registerPublishes()
     {
         if ($this->app->runningInConsole()) {
-            $this->loadMigrationsFrom(__DIR__.'/../../database/migrations');
+            $this->loadMigrationsFrom(__DIR__ . '/../../database/migrations');
 
             $this->publishes(
                 groups: 'halo-config',
                 paths: [
-                    __DIR__.'/../../config/halo.php' => config_path('halo.php'),
+                    __DIR__ . '/../../config/halo.php' => config_path('halo.php'),
                 ],
             );
 
             $this->publishes(
                 groups: 'halo-migrations',
                 paths: [
-                    __DIR__.'/../../database/migrations' => database_path('migrations'),
+                    __DIR__ . '/../../database/migrations' => database_path('migrations'),
                 ],
             );
         }
@@ -83,7 +83,7 @@ 
                     'namespace' => 'Spinen\Halo\Http\Controllers',
                     'middleware' => Config::get('halo.oauth.authorization_code.route.middleware', ['web']),
                 ],
-                routes: fn () => $this->loadRoutesFrom(realpath(__DIR__.'/../../routes/web.php'))
+                routes: fn () => $this->loadRoutesFrom(realpath(__DIR__ . '/../../routes/web.php'))
             );
         }
     }

src/Support/Relations/BelongsTo.php

Spacing +2 added lines, -2 removed lines

@@ -42,7 +42,7 @@ 
     /**
      * Get the foreign key's name
      */
-    public function getForeignKey(): int|string|null
+    public function getForeignKey(): int | string | null
     {
         return $this->getChild()->{$this->getForeignKeyName()};
     }
@@ -65,7 +65,7 @@ 
      */
     public function getResults(): ?Model
     {
-        if (! $this->getForeignKey()) {
+        if (!$this->getForeignKey()) {
             return null;
         }
 

src/Concerns/HasClient.php

Spacing +1 added lines, -1 removed lines

@@ -21,7 +21,7 @@
      */
     public function getClient(): Client
     {
-        if (! isset($this->client) && $this->parentModel) {
+        if (!isset($this->client) && $this->parentModel) {
             $this->client = $this->parentModel->getClient();
         }
 

src/Concerns/HasHalo.php

Spacing +3 added lines, -3 removed lines

@@ -63,13 +63,13 @@
     public function haloToken(): Attribute
     {
         return Attribute::make(
-            get: fn ($value, array $attributes): ?Token => ! is_null($attributes['halo_token'])
+            get: fn ($value, array $attributes): ?Token => !is_null($attributes['halo_token'])
               ? unserialize(Crypt::decryptString($attributes['halo_token']))
               : null,
-            set: function ($value): ?string {
+            set : function($value): ?string {
                 // If setting the password & already have a client, then
                 // empty the client to use new password in client
-                if (! is_null($this->builder)) {
+                if (!is_null($this->builder)) {
                     $this->builder = null;
                 }
 

src/Support/Builder.php

Spacing +19 added lines, -19 removed lines

@@ -189,7 +189,7 @@ 
      */
     public function __call(string $name, array $arguments)
     {
-        if (! isset($this->parentModel) && array_key_exists($name, $this->rootModels)) {
+        if (!isset($this->parentModel) && array_key_exists($name, $this->rootModels)) {
             return $this->newInstanceForModel($this->rootModels[$name]);
         }
 
@@ -210,7 +210,7 @@ 
      * @throws NoClientException
      * @throws TokenException
      */
-    public function __get(string $name): Collection|Model|null
+    public function __get(string $name): Collection | Model | null
     {
         return match (true) {
             $name === 'agent' => $this->newInstanceForModel(Agent::class)
@@ -222,7 +222,7 @@ 
             $name === 'user' => $this->newInstanceForModel(User::class)
                 ->get(extra: 'me')
                 ->first(),
-            ! $this->parentModel && array_key_exists($name, $this->rootModels) => $this->{$name}()
+            !$this->parentModel && array_key_exists($name, $this->rootModels) => $this->{$name}()
                 ->get(),
             default => null,
         };
@@ -259,7 +259,7 @@ 
      * @throws NoClientException
      * @throws TokenException
      */
-    public function delete(int|string $id): bool
+    public function delete(int | string $id): bool
     {
         //  TODO: Consider allowing $id to be null & deleting all
         return $this->make([$this->getModel()->getKeyName() => $id])
@@ -274,7 +274,7 @@ 
      * @throws NoClientException
      * @throws TokenException
      */
-    public function get(array|string $properties = ['*'], ?string $extra = null): Collection|Model
+    public function get(array | string $properties = ['*'], ?string $extra = null): Collection | Model
     {
         $properties = Arr::wrap($properties);
         $count = null;
@@ -311,7 +311,7 @@ 
                             ->toArray()
                 )
                 ->setClient($this->getClient()->setDebug(false)))
-            ->setPagination(count: $count, page: $page, pageSize: $pageSize);
+            ->setPagination(count : $count, page : $page, pageSize : $pageSize);
     }
 
     /**
@@ -321,11 +321,11 @@ 
      */
     public function getModel(): Model
     {
-        if (! isset($this->class)) {
+        if (!isset($this->class)) {
             throw new InvalidRelationshipException();
         }
 
-        if (! isset($this->model)) {
+        if (!isset($this->model)) {
             $this->model = (new $this->class([], $this->parentModel))->setClient($this->client);
         }
 
@@ -343,7 +343,7 @@ 
         $id = Arr::pull($w, $this->getModel()->getKeyName());
 
         return $this->getModel()
-            ->getPath($extra.(is_null($id) ? null : '/'.$id), $w);
+            ->getPath($extra . (is_null($id) ? null : '/' . $id), $w);
     }
 
     /**
@@ -354,7 +354,7 @@ 
      * @throws NoClientException
      * @throws TokenException
      */
-    public function find(int|string $id, array|string $properties = ['*']): Model
+    public function find(int | string $id, array | string $properties = ['*']): Model
     {
         return $this->whereId($id)
             ->get($properties)
@@ -376,7 +376,7 @@ 
      *
      * @throws InvalidRelationshipException
      */
-    public function limit(int|string $count): self
+    public function limit(int | string $count): self
     {
         return $this->where('count', (int) $count);
     }
@@ -461,7 +461,7 @@ 
      *
      * @throws InvalidRelationshipException
      */
-    public function page(int|string $number, int|string|null $size = null): self
+    public function page(int | string $number, int | string | null $size = null): self
     {
         return $this->where('page_no', (int) $number)
             ->when($size, fn (self $b): self => $b->paginate($size));
@@ -472,7 +472,7 @@ 
      *
      * @throws InvalidRelationshipException
      */
-    public function pageinate(int|string|null $size = null): self
+    public function pageinate(int | string | null $size = null): self
     {
         return $this->paginate($size);
     }
@@ -482,7 +482,7 @@ 
      *
      * @throws InvalidRelationshipException
      */
-    public function paginate(int|string|null $size = null): self
+    public function paginate(int | string | null $size = null): self
     {
         return $this->unless($size, fn (self $b): self => $b->where('pageinate', false))
             ->when($size, fn (self $b): self => $b->where('pageinate', true)->where('page_size', (int) $size));
@@ -528,7 +528,7 @@ 
      */
     public function setClass(string $class): self
     {
-        if (! class_exists($class)) {
+        if (!class_exists($class)) {
             throw new ModelNotFoundException(sprintf('The model [%s] not found.', $class));
         }
 
@@ -552,7 +552,7 @@ 
      *
      * @throws InvalidRelationshipException
      */
-    public function take(int|string $count): self
+    public function take(int | string $count): self
     {
         return $this->limit($count);
     }
@@ -562,12 +562,12 @@ 
      *
      * @throws InvalidRelationshipException
      */
-    public function where(iterable|string $property, $value = true): self
+    public function where(iterable | string $property, $value = true): self
     {
         is_iterable($property)
             // Given multiple properties to set, so recursively call self
             ? Collection::wrap($property)->each(
-                fn ($v, string $p): self => is_numeric($p)
+                fn ($v, string $p) : self => is_numeric($p)
                     // No value given, so use default value
                     ? $this->where($v, $value)
                     // Pass property & value
@@ -586,7 +586,7 @@ 
      *
      * @throws InvalidRelationshipException
      */
-    public function whereId(int|string|null $id): self
+    public function whereId(int | string | null $id): self
     {
         return $this->where($this->getModel()->getKeyName(), $id);
     }