Tiqr / tiqr-server-libphp

library/tiqr/Tiqr/UserSecretStorage/File.php

Spacing +1 added lines, -1 removed lines

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

library/tiqr/Tiqr/UserSecretStorage/Pdo.php

Spacing +5 added lines, -5 removed lines

@@ -83,7 +83,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());
         }
@@ -103,9 +103,9 @@ 
     private 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));
@@ -141,9 +141,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));
         }

Braces +3 added lines, -6 removed lines

@@ -86,8 +86,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);
         }
@@ -111,8 +110,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);
         }
@@ -146,8 +144,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)

library/tiqr/Tiqr/DeviceStorage/Abstract.php

Spacing +1 added lines, -1 removed lines

@@ -59,7 +59,7 @@
      * @param array $options The options
      * @param LoggerInterface $logger
      */
-    public function __construct(array $options=array(), LoggerInterface $logger)
+    public function __construct(array $options = array(), LoggerInterface $logger)
     {
         $this->_options = $options;
         $this->logger = $logger;

library/tiqr/Tiqr/UserStorage/FileTrait.php

Spacing +1 added lines, -1 removed lines

@@ -74,7 +74,7 @@
      */
     public function getPath(): string
     {
-        if (substr($this->path, -1)!="/") return $this->path."/";
+        if (substr($this->path, -1) != "/") return $this->path."/";
         return $this->path;
     }
 }

Braces +3 added lines, -1 removed lines

@@ -74,7 +74,9 @@
      */
     public function getPath(): string
     {
-        if (substr($this->path, -1)!="/") return $this->path."/";
+        if (substr($this->path, -1)!="/") {
+            return $this->path."/";
+        }
         return $this->path;
     }
 }

library/tiqr/Tiqr/UserStorage/Encryption.php

Spacing +1 added lines, -1 removed lines

@@ -40,7 +40,7 @@
      *
      * @return Tiqr_UserSecretStorage_Encryption_Interface
      */
-    public static function getEncryption(LoggerInterface $logger, string $type="dummy", array $options=array()): Tiqr_UserSecretStorage_Encryption_Interface
+    public static function getEncryption(LoggerInterface $logger, string $type = "dummy", array $options = array()): Tiqr_UserSecretStorage_Encryption_Interface
     {
         $logger->info(sprintf('Using %s as UserStorage encryption type', $type));
         switch ($type) {

library/tiqr/Tiqr/UserStorage/GenericStore.php

Indentation +3 added lines, -3 removed lines

@@ -60,7 +60,7 @@ 
     public function createUser(string $userId, string $displayName) : void
     {
         $user = array("userId"=>$userId,
-                      "displayName"=>$displayName);
+                        "displayName"=>$displayName);
         $this->_saveUser($userId, $user);
     }
 
@@ -90,7 +90,7 @@ 
     {
         if ($data = $this->_loadUser($userId)) {
             if (isset($data["notificationType"])) {
-               return $data["notificationType"];
+                return $data["notificationType"];
             }
         }
         return '';
@@ -113,7 +113,7 @@ 
     {
         if ($data = $this->_loadUser($userId)) {
             if (isset($data["notificationAddress"])) {
-               return $data["notificationAddress"];
+                return $data["notificationAddress"];
             }
         }
         $this->logger->info('Unable to find notification address for user');

Spacing +2 added lines, -2 removed lines

@@ -170,10 +170,10 @@
             }
 
             if ($timestamp + $tempBlockDuration * 60 < time()) {
-                return false;   // Temp block expired
+                return false; // Temp block expired
             }
         }
-        return true;    // Blocked by temp block
+        return true; // Blocked by temp block
     }
     
     /**

library/tiqr/Tiqr/UserStorage/Interface.php

Spacing +1 added lines, -1 removed lines

@@ -128,7 +128,7 @@
      *
      * Note that the $tempBlockDuration is specified in MINUTES
      */
-    public function isBlocked(string $userId, int $tempBlockDuration=0): bool;
+    public function isBlocked(string $userId, int $tempBlockDuration = 0): bool;
     
     /**
      * Block or unblock the user account.

library/tiqr/Tiqr/StateStorage/StateStorageInterface.php

Spacing +1 added lines, -1 removed lines

@@ -29,7 +29,7 @@
      * @throws ReadWriteException
      * @throws Exception
      */
-    public function setValue(string $key, $value, int $expire=0): void;
+    public function setValue(string $key, $value, int $expire = 0): void;
 
     /**
      * Remove $key from the state storage

library/tiqr/Tiqr/StateStorage/File.php

Indentation +2 added lines, -2 removed lines

@@ -54,8 +54,8 @@
         }
 
         $envelope = array("expire"=>$expire,
-                          "createdAt"=>time(),
-                          "value"=>$value);
+                            "createdAt"=>time(),
+                            "value"=>$value);
         $filename = $this->getFilenameByKey($key);
         
         if (!file_put_contents($filename, serialize($envelope))) {

Spacing +3 added lines, -3 removed lines

@@ -47,7 +47,7 @@ 
     /**
      * @see Tiqr_StateStorage_StateStorageInterface::setValue()
      */
-    public function setValue(string $key, $value, int $expire=0): void
+    public function setValue(string $key, $value, int $expire = 0): void
     {
         if (empty($key)) {
             throw new InvalidArgumentException('Empty key not allowed');
@@ -109,8 +109,8 @@ 
 
     private function getPath(): string
     {
-        if (substr($this->path, -1)!=="/") {
-            return $this->path . "/";
+        if (substr($this->path, -1) !== "/") {
+            return $this->path."/";
         }
         return $this->path;
     }