Add trailing comma's

src/Auth/Process/WebAuthn.php

@@ -118,20 +118,22 @@ public function process(array &$state): void
                 'urn:rsa:names:tc:SAML:2.0:ac:classes:FIDO';
         Logger::debug('webauthn: userid: ' . $state['Attributes'][$this->stateData->usernameAttrib][0]);
 
-        $localToggle = !empty($state['Attributes'][$this->toggleAttrib]) && !empty($state['Attributes'][$this->toggleAttrib][0]);
+        $localToggle = !empty($state['Attributes'][$this->toggleAttrib])
+            && !empty($state['Attributes'][$this->toggleAttrib][0]);
 
         if (
             $this->stateData->store->is2FAEnabled(
                 $state['Attributes'][$this->stateData->usernameAttrib][0],
                 $this->defaultEnabled,
                 $this->useDatabase,
                 $localToggle,
-                $this->force
+                $this->force,
             ) === false
         ) {
             // nothing to be done here, end authprocfilter processing
             return;
         }
+
         if // did we do Passwordless mode successfully before?
         (
             isset($state['Attributes']['internal:FIDO2PasswordlessAuthentication']) &&

src/Auth/Source/Passwordless.php

@@ -42,9 +42,12 @@ public function __construct(array $info, array $config)
 
         $this->authSourceConfig = Configuration::loadFromArray(
             $config,
-            'authsources[' . var_export($this->authId, true) . ']'
+            'authsources[' . var_export($this->authId, true) . ']',
+        );
+        $this->authnContextClassRef = $this->authSourceConfig->getOptionalString(
+            "authncontextclassref",
+            'urn:rsa:names:tc:SAML:2.0:ac:classes:FIDO',
         );
-        $this->authnContextClassRef = $this->authSourceConfig->getOptionalString("authncontextclassref", 'urn:rsa:names:tc:SAML:2.0:ac:classes:FIDO');
         $moduleConfig = Configuration::getOptionalConfig('module_webauthn.php')->toArray();
 
         $initialStateData = new StateData();

src/Controller/AuthProcess.php

@@ -58,7 +58,7 @@ class AuthProcess
      */
     public function __construct(
         Configuration $config,
-        Session $session
+        Session $session,
     ) {
         $this->config = $config;
         $this->session = $session;
@@ -150,7 +150,7 @@ public function main(Request $request): Response
 
         if ($publicKey === false || sizeof($oneToken) == 0) {
             throw new Exception(
-                "User attempted to authenticate with an unknown credential ID. This should already have been prevented by the browser!"
+                "User attempted to authenticate with an unknown credential ID. This should already have been prevented by the browser!",
             );
         }
 
@@ -169,7 +169,7 @@ public function main(Request $request): Response
             $oneToken[1],
             (int)$oneToken[4], // algo
             base64_decode($request->request->get('signature')),
-            $debugEnabled
+            $debugEnabled,
         );
 
         /** Custom check: if the token was initially registered with UV, but now
@@ -207,7 +207,7 @@ public function main(Request $request): Response
             $store->updateSignCount($oneToken[0], $counter);
         } else {
             throw new Exception(
-                "Signature counter less or equal to a previous authentication! Token cloning likely (old: $previousCounter, new: $counter)."
+                "Signature counter less or equal to a previous authentication! Token cloning likely (old: $previousCounter, new: $counter).",
             );
         }
 
@@ -230,12 +230,12 @@ function (WebAuthnAuthenticationEvent $authObject, array $state) {
                     echo $authObject->getValidateBuffer();
                     echo "Debug mode, not continuing to " . ($state['FIDO2WantsRegister'] ? "credential registration page." : "destination.");
                 },
-                [$authObject, $state]
+                [$authObject, $state],
             );
         } else {
             if ($state['FIDO2WantsRegister']) {
                 $response = new RedirectResponse(
-                    Module::getModuleURL('webauthn/webauthn?StateId=' . urlencode($stateId))
+                    Module::getModuleURL('webauthn/webauthn?StateId=' . urlencode($stateId)),
                 );
             } else {
                 $response = new RunnableResponse([Auth\ProcessingChain::class, 'resumeProcessing'], [$state]);

src/Controller/ManageToken.php

@@ -55,7 +55,7 @@ class ManageToken
      */
     public function __construct(
         Configuration $config,
-        Session $session
+        Session $session,
     ) {
         $this->config = $config;
         $this->session = $session;

src/Controller/PushbackUserPass.php

@@ -54,7 +54,7 @@ class PushbackUserPass
      */
     public function __construct(
         Configuration $config,
-        Session $session
+        Session $session,
     ) {
         $this->config = $config;
         $this->session = $session;
@@ -104,7 +104,7 @@ public function main(Request $request): Response
         class_alias($classname, '\SimpleSAML\Module\webauthn\Auth\Source\AuthSourceOverloader');
         $overrideSource = new class (
             ['AuthId' => $authsourceString],
-            $authsources[$authsourceString]
+            $authsources[$authsourceString],
         ) extends AuthSourceOverloader
         {
             public function loginOverload(string $username, string $password): array

src/Controller/RegProcess.php

@@ -61,7 +61,7 @@ class RegProcess
      */
     public function __construct(
         Configuration $config,
-        Session $session
+        Session $session,
     ) {
         $this->config = $config;
         $this->session = $session;
@@ -127,7 +127,7 @@ public function main(Request $request): Response
             $request->request->get('response_id'),
             $request->request->get('attestation_client_data_json'),
             ($request->request->get('passwordless') == "on" ? $state['authenticatorAcceptabilityPasswordless'] : $state['authenticatorAcceptability2FA']),
-            $debugEnabled
+            $debugEnabled,
         );
         // at this point, we need to talk to the DB
         /**
@@ -199,7 +199,7 @@ public function main(Request $request): Response
             $friendlyName,
             $username,
             $regObject->getAAGUID(),
-            $regObject->getAttestationLevel()
+            $regObject->getAttestationLevel(),
         );
 
         // make sure $state gets the news, the token is to be displayed to the user on the next page
@@ -223,7 +223,7 @@ function (WebAuthnRegistrationEvent $regObject, string $id) {
                         Module::getModuleURL('webauthn/webauthn?StateId=' . urlencode($id)) . "'>";
                     echo "<button type='submit'>Return to previous page.</button>";
                 },
-                [$regObject, $id]
+                [$regObject, $id],
             );
         } elseif (array_key_exists('Registration', $state)) {
             $response = new RedirectResponse(Module::getModuleURL('webauthn/webauthn?StateId=' . urlencode($id)));

src/Controller/Registration.php

@@ -64,7 +64,7 @@ class Registration
      */
     public function __construct(
         Configuration $config,
-        Session $session
+        Session $session,
     ) {
         $this->config = $config;
         $this->session = $session;
@@ -137,7 +137,7 @@ public function main(/** @scrutinizer ignore-unused */ Request $request): Runnab
             $stateData->store = Store::parseStoreConfig($moduleConfig->getArray('store'));
         } catch (Exception $e) {
             $this->logger::error(
-                'webauthn: Could not create storage: ' . $e->getMessage()
+                'webauthn: Could not create storage: ' . $e->getMessage(),
             );
         }
 

src/Controller/Supercharged.php

@@ -33,7 +33,7 @@ class Supercharged extends WebAuthn
      */
     public function __construct(
         Configuration $config,
-        Session $session
+        Session $session,
     ) {
         parent::__construct($config, $session);
     }
@@ -66,7 +66,7 @@ public function main(Request $request): Template
         $configUtils = new Utils\Config();
         $username = str_split(
             hash('sha512', $state['FIDO2Username'] . '|' . $configUtils->getSecretSalt()),
-            2
+            2,
         );
 
         $challengeEncoded = [];

src/Controller/WebAuthn.php

@@ -55,7 +55,7 @@ class WebAuthn
      */
     public function __construct(
         Configuration $config,
-        Session $session
+        Session $session,
     ) {
         $this->config = $config;
         $this->session = $session;
@@ -192,7 +192,7 @@ public function main(Request $request): Template
         $configUtils = new Utils\Config();
         $username = str_split(
             hash('sha512', $state['FIDO2Username'] . '|' . $configUtils->getSecretSalt()),
-            2
+            2,
         );
 
         $challengeEncoded = [];

src/Store.php

@@ -52,7 +52,7 @@ abstract public function is2FAEnabled(
         bool $defaultIfNx,
         bool $useDatabase = true,
         bool $toggle = false,
-        bool $force = true
+        bool $force = true,
     ): bool;
 
     /**
@@ -91,7 +91,7 @@ abstract public function storeTokenData(
         string $friendlyName,
         string $hashedId,
         string $aaguid,
-        string $attLevel
+        string $attLevel,
     ): bool;
 
     /**
@@ -165,7 +165,7 @@ public static function parseStoreConfig($config): Store
         $className = Module::resolveClass(
             $config[0],
             'WebAuthn\Store',
-            '\SimpleSAML\Module\webauthn\Store'
+            '\SimpleSAML\Module\webauthn\Store',
         );
 
         /**

src/WebAuthn/Store/Database.php

@@ -142,7 +142,7 @@ public function is2FAEnabled(
         bool $defaultIfNx,
         bool $useDatabase = true,
         bool $toggle = false,
-        bool $force = true
+        bool $force = true,
     ): bool {
         if (!$useDatabase) {
             if ($force) {
@@ -160,7 +160,7 @@ public function is2FAEnabled(
         } else {
             $st2 = $this->db->read(
                 "SELECT COUNT(*) FROM userstatus WHERE user_id = :userId AND fido2Status = 'FIDO2Disabled'",
-                ['userId' => $userId]
+                ['userId' => $userId],
             );
             $rowCount2 = $st2->fetchColumn();
             if ($rowCount2 === 1 /* explicitly disabled user in DB */) {
@@ -185,7 +185,7 @@ public function doesCredentialExist(string $credIdHex): bool
     {
         $st = $this->db->read(
             'SELECT COUNT(*) FROM credentials WHERE credentialId = :credentialId',
-            ['credentialId' => $credIdHex]
+            ['credentialId' => $credIdHex],
         );
 
         $rowCount = $st->fetchColumn();
@@ -224,7 +224,7 @@ public function storeTokenData(
         string $friendlyName,
         string $hashedId,
         string $aaguid,
-        string $attLevel
+        string $attLevel,
     ): bool {
         $this->db->write(
             'INSERT INTO credentials ' .
@@ -242,7 +242,7 @@ public function storeTokenData(
                 'hashedId' => $hashedId,
                 'aaguid' => $aaguid,
                 'attLevel' => $attLevel,
-            ]
+            ],
         );
 
         return true;
@@ -259,7 +259,7 @@ public function deleteTokenData(string $credentialId): bool
     {
         $this->db->write(
             'DELETE FROM credentials WHERE credentialId = :credentialId',
-            ['credentialId' => $credentialId]
+            ['credentialId' => $credentialId],
         );
 
         Logger::debug('webauthn:Database - DELETED credential.');
@@ -279,7 +279,7 @@ public function updateSignCount(string $credentialId, int $signCounter): bool
     {
         $this->db->write(
             'UPDATE credentials SET signCounter = :signCounter WHERE credentialId = :credentialId',
-            ['signCounter' => $signCounter, 'credentialId' => $credentialId]
+            ['signCounter' => $signCounter, 'credentialId' => $credentialId],
         );
 
         Logger::debug('webauthn:Database - UPDATED signature counter.');
@@ -300,7 +300,7 @@ public function getTokenData(string $userId): array
 
         $st = $this->db->read(
             'SELECT credentialId, credential, signCounter, friendlyName, algo, presenceLevel, isResidentKey FROM credentials WHERE user_id = :userId',
-            ['userId' => $userId]
+            ['userId' => $userId],
         );
 
         while ($row = $st->fetch(PDO::FETCH_NUM)) {
@@ -323,7 +323,7 @@ public function getUsernameByHashedId(string $hashedId): string
     {
         $st = $this->db->read(
             'SELECT user_id FROM credentials WHERE hashedId = :hashId',
-            ['hashId' => $hashedId]
+            ['hashId' => $hashedId],
         );
 
         // return on first match, credential IDs are unique

src/WebAuthn/WebAuthnAbstractEvent.php

@@ -138,7 +138,7 @@ public function __construct(
         string $challenge,
         string $authData,
         string $clientDataJSON,
-        bool $debugMode = false
+        bool $debugMode = false,
     ) {
         $this->scope = $scope;
         $this->challenge = $challenge;

src/WebAuthn/WebAuthnAuthenticationEvent.php

@@ -44,7 +44,7 @@ public function __construct(
         string $publicKey,
         int $algo,
         string $signature,
-        bool $debugMode = false
+        bool $debugMode = false,
     ) {
         $this->eventType = "AUTH";
         $this->credential = $publicKey;