Tiqr / tiqr-server-libphp

library/tiqr/Tiqr/UserSecretStorage/File.php

Indentation -1 removed lines

@@ -32,7 +32,6 @@
  * Supported options:
  * path : Path to the directory where the user data is stored
  *
-
  */
 class Tiqr_UserSecretStorage_File  extends Tiqr_UserSecretStorage_Abstract
 {

Spacing +1 added lines, -1 removed lines

@@ -80,7 +80,7 @@
      */
     protected function setUserSecret(string $userId, string $secret): void
     {
-        $data=array();
+        $data = array();
         if ($this->_userExists($userId)) {
             $data = $this->_loadUser($userId);
         }

library/tiqr/Tiqr/UserSecretStorage/Abstract.php

Spacing +4 added lines, -4 removed lines

@@ -57,13 +57,13 @@ 
         if ($prefix === $this->encryption->get_type()) {
             // Decrypt the secret if it is prefixed with the current encryption type
             // Remove the encryption type prefix before decrypting
-            return $this->encryption->decrypt( substr($encryptedSecret, $pos+1) );
+            return $this->encryption->decrypt(substr($encryptedSecret, $pos + 1));
         }
 
         // Check the decryption array for the encryption type to see if there is an encryption
         // instance defined for it. If so, use that to decrypt the secret.
         if (isset($this->decryption[$prefix])) {
-            return $this->decryption[$prefix]->decrypt( substr($encryptedSecret, $pos+1) );
+            return $this->decryption[$prefix]->decrypt(substr($encryptedSecret, $pos + 1));
         }
 
         $this->logger->error("Secret for user '$userId' is encrypted with unsupported encryption type '$prefix'");
@@ -80,7 +80,7 @@ 
     {
         $encryptedSecret = $this->encryption->encrypt($secret);
         // Prefix the user secret with the encryption type
-        $this->setUserSecret($userId, $this->encryption->get_type() . ':' . $encryptedSecret);
+        $this->setUserSecret($userId, $this->encryption->get_type().':'.$encryptedSecret);
     }
 
     /**
@@ -88,6 +88,6 @@ 
      */
     public function healthCheck(string &$statusMessage = ''): bool
     {
-        return true;    // Health check is always successful when not implemented
+        return true; // Health check is always successful when not implemented
     }
 }

library/tiqr/Tiqr/UserStorage/Abstract.php

Spacing +1 added lines, -1 removed lines

@@ -71,6 +71,6 @@
      */
     public function healthCheck(string &$statusMessage = ''): bool
     {
-        return true;    // Health check is always successful when not implemented
+        return true; // Health check is always successful when not implemented
     }
 }

library/tiqr/Tiqr/Message/FCM.php

Spacing +10 added lines, -10 removed lines

@@ -51,7 +51,7 @@ 
     /**
      * @throws Tiqr_Message_Exception_SendFailure
      */
-    private function getGoogleAccessToken($credentialsFile, $cacheTokens, $tokenCacheDir )
+    private function getGoogleAccessToken($credentialsFile, $cacheTokens, $tokenCacheDir)
     {
         $client = new Google_Client();
         $client->setLogger($this->logger);
@@ -63,8 +63,8 @@ 
             $pool = new FilesystemCachePool($filesystem);
 
             //set up a callback to log token refresh
-            $logger=$this->logger;
-            $tokenCallback = function ($cacheKey, $accessToken) use ($logger) {
+            $logger = $this->logger;
+            $tokenCallback = function($cacheKey, $accessToken) use ($logger) {
                 $logger->notice(sprintf('New access token received at cache key %s', $cacheKey));
             };
             $client->setTokenCallback($tokenCallback);
@@ -97,9 +97,9 @@ 
      * @param  $retry            boolean is this a 2nd attempt
      * @throws Tiqr_Message_Exception_SendFailure
      */
-    private function _sendFirebase(string $deviceToken, string $alert, array $properties, string $projectId, string $credentialsFile, bool $cacheTokens, string $tokenCacheDir, bool $retry=false)
+    private function _sendFirebase(string $deviceToken, string $alert, array $properties, string $projectId, string $credentialsFile, bool $cacheTokens, string $tokenCacheDir, bool $retry = false)
     {
-        $apiurl = sprintf('https://fcm.googleapis.com/v1/projects/%s/messages:send',$projectId);
+        $apiurl = sprintf('https://fcm.googleapis.com/v1/projects/%s/messages:send', $projectId);
 
         $fields = [
             'message' => [
@@ -113,14 +113,14 @@ 
 
         // Add custom properties
         foreach ($properties as $k => $v) {
-            $fields['message']['data'][(string)$k] = (string)$v;
+            $fields['message']['data'][(string) $k] = (string) $v;
         }
         // Add message
         $fields['message']['data']['text'] = $alert;
 
         try {
             $headers = array(
-                'Authorization: Bearer ' . $this->getGoogleAccessToken($credentialsFile, $cacheTokens, $tokenCacheDir),
+                'Authorization: Bearer '.$this->getGoogleAccessToken($credentialsFile, $cacheTokens, $tokenCacheDir),
                 'Content-Type: application/json',
             );
         } catch (\Google\Exception $e) {
@@ -147,14 +147,14 @@ 
         }
 
         if (!empty($errors)) {
-            throw new Tiqr_Message_Exception_SendFailure("Http error occurred: ". $errors, true);
+            throw new Tiqr_Message_Exception_SendFailure("Http error occurred: ".$errors, true);
         }
 
         // Wait and retry once in case of a 502 Bad Gateway error
         if ($statusCode === 502 && !($retry)) {
             $this->logger->warning("Received HTTP 502 Bad Gateway error, retrying once");
             sleep(2);
-            $this->_sendFirebase($deviceToken, $alert, $properties, $projectId, $credentialsFile,  $cacheTokens,  $tokenCacheDir, true);
+            $this->_sendFirebase($deviceToken, $alert, $properties, $projectId, $credentialsFile, $cacheTokens, $tokenCacheDir, true);
             return;
         }
 
@@ -165,7 +165,7 @@ 
         // handle errors, ignoring registration_id's
         $response = json_decode($result, true);
         foreach ($response as $k => $v) {
-            if ($k=="error") {
+            if ($k == "error") {
                 throw new Tiqr_Message_Exception_SendFailure(sprintf("Error in FCM response: %s", $result), true);
             }
         }