Tiqr / tiqr-server-libphp

library/tiqr/Tiqr/UserSecretStorage/Pdo.php

Spacing +6 added lines, -6 removed lines

@@ -87,7 +87,7 @@ 
     public function userExists(string $userId): bool
     {
         try {
-            $sth = $this->handle->prepare('SELECT userid FROM ' . $this->tableName . ' WHERE userid = ?');
+            $sth = $this->handle->prepare('SELECT userid FROM '.$this->tableName.' WHERE userid = ?');
             $sth->execute(array($userId));
             return (false !== $sth->fetchColumn());
         }
@@ -107,9 +107,9 @@ 
     protected function getUserSecret(string $userId): string
     {
         try {
-            $sth = $this->handle->prepare('SELECT secret FROM ' . $this->tableName . ' WHERE userid = ?');
+            $sth = $this->handle->prepare('SELECT secret FROM '.$this->tableName.' WHERE userid = ?');
             $sth->execute(array($userId));
-            $res=$sth->fetchColumn();
+            $res = $sth->fetchColumn();
             if ($res === false) {
                 // No result
                 $this->logger->error(sprintf('No result getting secret for user "%s"', $userId));
@@ -145,9 +145,9 @@ 
         // - The INSERT will fail when displayname has a NOT NULL constraint
         try {
             if ($this->userExists($userId)) {
-                $sth = $this->handle->prepare('UPDATE ' . $this->tableName . ' SET secret = ? WHERE userid = ?');
+                $sth = $this->handle->prepare('UPDATE '.$this->tableName.' SET secret = ? WHERE userid = ?');
             } else {
-                $sth = $this->handle->prepare('INSERT INTO ' . $this->tableName . ' (secret,userid) VALUES (?,?)');
+                $sth = $this->handle->prepare('INSERT INTO '.$this->tableName.' (secret,userid) VALUES (?,?)');
             }
             $sth->execute(array($secret, $userId));
         }
@@ -171,7 +171,7 @@ 
             $sth->execute();
         }
         catch (Exception $e) {
-            $statusMessage = "UserSecretStorage_PDO error: " . $e->getMessage();
+            $statusMessage = "UserSecretStorage_PDO error: ".$e->getMessage();
             return false;
         }
 

Braces +4 added lines, -8 removed lines

@@ -90,8 +90,7 @@ 
             $sth = $this->handle->prepare('SELECT userid FROM ' . $this->tableName . ' WHERE userid = ?');
             $sth->execute(array($userId));
             return (false !== $sth->fetchColumn());
-        }
-        catch (Exception $e) {
+        } catch (Exception $e) {
             $this->logger->error('PDO error checking user exists', array('exception'=>$e, 'userId'=>$userId));
             throw ReadWriteException::fromOriginalException($e);
         }
@@ -115,8 +114,7 @@ 
                 $this->logger->error(sprintf('No result getting secret for user "%s"', $userId));
                 throw new RuntimeException('User not found');
             }
-        }
-        catch (Exception $e) {
+        } catch (Exception $e) {
             $this->logger->error('PDO error getting user', array('exception' => $e, 'userId' => $userId));
             throw ReadWriteException::fromOriginalException($e);
         }
@@ -150,8 +148,7 @@ 
                 $sth = $this->handle->prepare('INSERT INTO ' . $this->tableName . ' (secret,userid) VALUES (?,?)');
             }
             $sth->execute(array($secret, $userId));
-        }
-        catch (Exception $e) {
+        } catch (Exception $e) {
             $this->logger->error(
                 sprintf('Unable to persist user secret for user "%s" in user secret storage (PDO)', $userId),
                 array('exception'=>$e)
@@ -169,8 +166,7 @@ 
         try {
             $sth = $this->handle->prepare('SELECT secret FROM '.$this->tableName.' LIMIT 1');
             $sth->execute();
-        }
-        catch (Exception $e) {
+        } catch (Exception $e) {
             $statusMessage = "UserSecretStorage_PDO error: " . $e->getMessage();
             return false;
         }

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);
             }
         }