Merge pull request #14 from rossaddison/analysis-oLL7yK

Apply fixes from StyleCI

Author: rossaddison

src/Asset/AuthChoiceAsset.php

@@ -15,33 +15,33 @@ class AuthChoiceAsset extends AssetBundle
 {
     /**
      * Note: Aliases convert to actual file paths
-     * $basePath (below) is normally the publically accessible target path where $sourcePath 
-     * files are copied to. 
+     * $basePath (below) is normally the publically accessible target path where $sourcePath
+     * files are copied to.
      * 1. Check that your application's config/common/params.php yiisoft/aliases['aliases']
-     *    contains '@assets' alias e.g. 
-     * 
-     *    '@root' => dirname(__DIR__, 2), 
+     *    contains '@assets' alias e.g.
+     *
+     *    '@root' => dirname(__DIR__, 2),
      *    '@assets' => '@root/public/assets',
      *    '@assetsUrl' => '@baseUrl/assets',
-     *    '@vendor' => '@root/vendor',  
-     * 
+     *    '@vendor' => '@root/vendor',
+     *
      * 2. Check that '@assetsUrl' is also listed
      * 3. Check that the '@vendor' alias is also included as above.
      * 4. The alias should point to public/assets as seen above
-     * 5. The public/assets folder's 8 digit subfolder e.g. ab615tyu will only 
+     * 5. The public/assets folder's 8 digit subfolder e.g. ab615tyu will only
      *    be included ... if the sourcePath files do not already exist in a pre-existing folder
-     *    e.g. tr674trs 
-     * 6. Register the Asset in your application's layout file e.g. 
+     *    e.g. tr674trs
+     * 6. Register the Asset in your application's layout file e.g.
      *    resources/views/layout/main.php
-     *  
+     *
      * @var string|null
-     */    
+     */
     public ?string $basePath = '@assets';
-    
+
     public ?string $baseUrl = '@assetsUrl';
-    
+
     public ?string $sourcePath = '@vendor/yiisoft/yii-auth-client/resources/assets';
-        
+
     /**
      * @psalm-suppress NonInvariantDocblockPropertyType $js
      */
@@ -52,4 +52,4 @@ class AuthChoiceAsset extends AssetBundle
     public array $depends = [
         AuthChoiceStyleAsset::class,
     ];
-}
+}

src/Asset/AuthChoiceStyleAsset.php

@@ -12,9 +12,9 @@
 class AuthChoiceStyleAsset extends AssetBundle
 {
     public ?string $basePath = '@assets';
-    
+
     public ?string $baseUrl = '@assetsUrl';
-    
+
     public ?string $sourcePath = '@vendor/yiisoft/yii-auth-client/resources/assets';
 
     /**

src/AuthAction.php

@@ -15,7 +15,6 @@
 use Yiisoft\Http\Status;
 use Yiisoft\View\Exception\ViewNotFoundException;
 use Yiisoft\View\WebView;
-use Yiisoft\Yii\AuthClient\Collection;
 use Yiisoft\Yii\AuthClient\Exception\InvalidConfigException;
 use Yiisoft\Yii\AuthClient\Exception\NotSupportedException;
 
@@ -115,7 +114,7 @@ final class AuthAction implements MiddlewareInterface
      * @var string the redirect url after unsuccessful authorization (e.g. user canceled).
      */
     private readonly string $cancelUrl;
-    
+
     public function __construct(
         /**
          * @var Collection
@@ -125,10 +124,9 @@ public function __construct(
         private readonly Aliases $aliases,
         private readonly WebView $view,
         private readonly ResponseFactoryInterface $responseFactory
-    )
-    {
+    ) {
     }
-    
+
     /**
      * @param string $url successful URL.
      *

src/AuthClientInterface.php

@@ -25,16 +25,16 @@ public function getTitle(): string;
      * @return array view options in format: optionName => optionValue
      */
     public function getViewOptions(): array;
-    
+
     public function getButtonClass(): string;
-        
+
     /**
      * The Client id is publically visible in button urls
      * The Client secret must not be made available publically => exclude from interface
-     * 
+     *
      * @return string
      */
     public function getClientId(): string;
-    
+
     public function buildAuthUrl(ServerRequestInterface $incomingRequest, array $params): string;
 }

src/Client/Facebook.php

@@ -94,7 +94,7 @@ public function getCurrentUserJsonArray(OAuthToken $token): array
         }
         return [];
     }
-    
+
     protected function initUserAttributes(): array
     {
         $token = $this->getAccessToken();
@@ -249,13 +249,13 @@ public function getName(): string
     public function getTitle(): string
     {
         return 'Facebook';
-    }    
-    
+    }
+
     #[\Override]
     public function getButtonClass(): string
     {
         return 'btn btn-primary bi bi-facebook';
-    }    
+    }
 
     /**
      * @return int[]

src/Client/GitHub.php

@@ -70,7 +70,7 @@ public function getCurrentUserJsonArray(OAuthToken $token): array
 
         return [];
     }
-    
+
     protected function initUserAttributes(): array
     {
         $token = $this->getAccessToken();
@@ -91,13 +91,13 @@ public function getTitle(): string
     {
         return 'GitHub';
     }
-        
+
     #[\Override]
     public function getButtonClass(): string
     {
         return 'btn btn-primary bi bi-github';
-    }    
-    
+    }
+
     /**
      * @return int[]
      *

src/Client/Google.php

@@ -78,7 +78,7 @@ public function getCurrentUserJsonArray(OAuthToken $token): array
 
         return [];
     }
-    
+
     protected function initUserAttributes(): array
     {
         $token = $this->getAccessToken();
@@ -99,13 +99,13 @@ public function getTitle(): string
     {
         return 'Google';
     }
-        
+
     #[\Override]
     public function getButtonClass(): string
     {
         return 'btn btn-primary bi bi-google';
-    }    
-    
+    }
+
     /**
      * @return int[]
      *

src/Client/LinkedIn.php

@@ -65,7 +65,7 @@ public function getCurrentUserJsonArray(
 
         return [];
     }
-    
+
     protected function initUserAttributes(): array
     {
         $token = $this->getAccessToken();
@@ -75,7 +75,7 @@ protected function initUserAttributes(): array
         }
         return [];
     }
-    
+
     #[\Override]
     public function getName(): string
     {
@@ -86,14 +86,14 @@ public function getName(): string
     public function getTitle(): string
     {
         return 'LinkedIn';
-    }    
-    
+    }
+
     #[\Override]
     public function getButtonClass(): string
     {
         return 'btn btn-info bi bi-linkedin';
-    }  
-    
+    }
+
     /**
      * @return int[]
      *

src/Client/MicrosoftOnline.php

@@ -109,7 +109,7 @@ public function getCurrentUserJsonArray(
 
         return [];
     }
-    
+
     protected function initUserAttributes(): array
     {
         $token = $this->getAccessToken();
@@ -119,7 +119,7 @@ protected function initUserAttributes(): array
         }
         return [];
     }
-    
+
     #[\Override]
     public function getName(): string
     {
@@ -131,13 +131,13 @@ public function getTitle(): string
     {
         return 'MicrosoftOnline';
     }
-   
+
     #[\Override]
     public function getButtonClass(): string
     {
         return 'btn btn-warning bi bi-microsoft';
-    }    
-    
+    }
+
     /**
      * @return int[]
      *

src/Client/OpenIdConnect.php

@@ -41,23 +41,23 @@
  * @link https://github.com/web-token/jwt-framework
  *
  * @link https://openid.net/connect/
- * 
- * e.g.'s: https://{IdentityProviderDomain}/.well-known/openid-configuration 
- * 
+ *
+ * e.g.'s: https://{IdentityProviderDomain}/.well-known/openid-configuration
+ *
  * https://accounts.google.com/.well-known/openid-configuration
  * https://login.microsoftonline.com/{tenant}/v2.0/.well-known/openid-configuration
- * https://oidc.account.gov.uk/.well-known/openid-configuration  
+ * https://oidc.account.gov.uk/.well-known/openid-configuration
  * https://dev-kzv8xwxr.us.auth0.com/.well-known/openid-configuration
- * 
+ *
  * @see OAuth2
  */
 final class OpenIdConnect extends OAuth2
 {
     protected string $authUrl = '';
-    
+
     protected ?string $scope = 'openid';
     /**
-     * @var string OpenID Issuer  
+     * @var string OpenID Issuer
      */
     private string $issuerUrl = 'https://{IdentityProviderDomain}';
     /**
@@ -119,11 +119,11 @@ final class OpenIdConnect extends OAuth2
 
     /**
      * OpenIdConnect constructor.
-     *   
+     *
      * @param ClientInterface $httpClient
      * @param RequestFactoryInterface $requestFactory
      * @param StateStorageInterface $stateStorage
-     * @param Factory $factory  
+     * @param Factory $factory
      * @param SessionInterface $session
      * @param string $name
      * @param string $title
@@ -132,9 +132,9 @@ public function __construct(
         ClientInterface $httpClient,
         RequestFactoryInterface $requestFactory,
         StateStorageInterface $stateStorage,
-        Factory $factory,    
-        SessionInterface $session,        
-        CacheInterface $cache,    
+        Factory $factory,
+        SessionInterface $session,
+        CacheInterface $cache,
         string $name,
         string $title,
     ) {
@@ -290,18 +290,18 @@ public function refreshAccessToken(OAuthToken $token): OAuthToken
         }
         return parent::refreshAccessToken($token);
     }
-    
+
     #[\Override]
     public function getName(): string
     {
         /**
-         * Note 1: Change OpenIdConnect::class to OAuth, Google, 
+         * Note 1: Change OpenIdConnect::class to OAuth, Google,
          * Note 2: Keep 'oidc' unchanged
          * Related logic: app's config/web/di/yii-auth-client
          * `@var array $paramsClients['oidc']`
          * `$openidconnectClient = $paramsClients['oidc'];`
-         * 
-         * Related logic: app's config/common/params [yiisoft/yii-auth-client] => 
+         *
+         * Related logic: app's config/common/params [yiisoft/yii-auth-client] =>
          *  [
          *      'oidc' => [
          *          'class' => 'Yiisoft\Yii\AuthClient\Client\OpenIdConnect::class',
@@ -319,13 +319,13 @@ public function getTitle(): string
     {
         return 'Open Id Connect';
     }
-      
+
     #[\Override]
     public function getButtonClass(): string
     {
         return '';
-    }    
-    
+    }
+
     /**
      * @return int[]
      *