Tiqr / tiqr-server-libphp

library/tiqr/Tiqr/OATH/OCRA.php

Spacing +75 added lines, -75 removed lines

@@ -58,18 +58,18 @@ 
     private static function _hexStr2Bytes(string $hex, int $maxBytes, string $parameterName) : string
     {
         $len = strlen($hex);
-        if ( ($len !== 0) && (! ctype_xdigit($hex)) ) {
+        if (($len !== 0) && (!ctype_xdigit($hex))) {
             throw new InvalidArgumentException("Parameter '$parameterName' contains non hex digits");
         }
-        if ( $len % 2 !== 0 ) {
+        if ($len % 2 !== 0) {
             throw new InvalidArgumentException("Parameter '$parameterName' contains odd number of hex digits");
         }
-        if ( $len > $maxBytes * 2) {
+        if ($len > $maxBytes * 2) {
             throw new InvalidArgumentException("Parameter '$parameterName' too long");
         }
         // hex2bin logs PHP warnings when $hex contains invalid characters or has uneven length. Because we
         // check for these conditions above hex2bin() should always be silent
-        $res=hex2bin($hex);
+        $res = hex2bin($hex);
         if (false === $res) {
             throw new InvalidArgumentException("Parameter '$parameterName' could not be decoded");
         }
@@ -125,83 +125,83 @@ 
         $cryptoFunction = $components[1];
         $dataInput = strtolower($components[2]); // lower here so we can do case insensitive comparisons
 
-        if(stripos($cryptoFunction, "hotp-sha1")!==false)
+        if (stripos($cryptoFunction, "hotp-sha1") !== false)
             $crypto = "sha1";
-        elseif(stripos($cryptoFunction, "hotp-sha256")!==false)
+        elseif (stripos($cryptoFunction, "hotp-sha256") !== false)
             $crypto = "sha256";
-        elseif(stripos($cryptoFunction, "hotp-sha512")!==false)
+        elseif (stripos($cryptoFunction, "hotp-sha512") !== false)
             $crypto = "sha512";
         else {
             throw new InvalidArgumentException('Unsupported OCRA CryptoFunction');
         }
 
         // The Cryptofucntion must ha a truncation of 0, 4-10
-        $codeDigits_str = substr($cryptoFunction, strrpos($cryptoFunction, "-")+1);
-        if (! ctype_digit($codeDigits_str)) {
+        $codeDigits_str = substr($cryptoFunction, strrpos($cryptoFunction, "-") + 1);
+        if (!ctype_digit($codeDigits_str)) {
             throw new InvalidArgumentException('Unsupported OCRA CryptoFunction');
         }
-        $codeDigits = (integer)$codeDigits_str;
+        $codeDigits = (integer) $codeDigits_str;
         if (($codeDigits != 0) && (($codeDigits < 4) || ($codeDigits > 10))) {
             throw new InvalidArgumentException('Unsupported OCRA CryptoFunction');
         }
                 
         // The size of the byte array message to be encrypted
         // Counter
-        if($dataInput[0] == "c" ) {
+        if ($dataInput[0] == "c") {
             // Fix the length of the HEX string
-            while(strlen($counter) < 16)
-                $counter = "0" . $counter;
-            $counterLength=8;
+            while (strlen($counter) < 16)
+                $counter = "0".$counter;
+            $counterLength = 8;
         }
         // Question
-        if($dataInput[0] == "q" ||
-                stripos($dataInput, "-q")!==false) {
-            while(strlen($question) < 256)
-                $question = $question . "0";
-            $questionLength=128;
+        if ($dataInput[0] == "q" ||
+                stripos($dataInput, "-q") !== false) {
+            while (strlen($question) < 256)
+                $question = $question."0";
+            $questionLength = 128;
         }
 
         // Password
-        if(stripos($dataInput, "psha1")!==false) {
-            while(strlen($password) < 40)
-                $password = "0" . $password;
-            $passwordLength=20;
+        if (stripos($dataInput, "psha1") !== false) {
+            while (strlen($password) < 40)
+                $password = "0".$password;
+            $passwordLength = 20;
         }
     
-        if(stripos($dataInput, "psha256")!==false) {
-            while(strlen($password) < 64)
-                $password = "0" . $password;
-            $passwordLength=32;
+        if (stripos($dataInput, "psha256") !== false) {
+            while (strlen($password) < 64)
+                $password = "0".$password;
+            $passwordLength = 32;
         }
         
-        if(stripos($dataInput, "psha512")!==false) {
-            while(strlen($password) < 128)
-                $password = "0" . $password;
-            $passwordLength=64;
+        if (stripos($dataInput, "psha512") !== false) {
+            while (strlen($password) < 128)
+                $password = "0".$password;
+            $passwordLength = 64;
         }
         
         // sessionInformation
-        if(stripos($dataInput, "s064") !==false) {
-            while(strlen($sessionInformation) < 128)
-                $sessionInformation = "0" . $sessionInformation;
+        if (stripos($dataInput, "s064") !== false) {
+            while (strlen($sessionInformation) < 128)
+                $sessionInformation = "0".$sessionInformation;
 
-            $sessionInformationLength=64;
-        } else if(stripos($dataInput, "s128") !==false) {
-            while(strlen($sessionInformation) < 256)
-                $sessionInformation = "0" . $sessionInformation;
+            $sessionInformationLength = 64;
+        } else if (stripos($dataInput, "s128") !== false) {
+            while (strlen($sessionInformation) < 256)
+                $sessionInformation = "0".$sessionInformation;
         
-            $sessionInformationLength=128;
-        } else if(stripos($dataInput, "s256") !==false) {
-            while(strlen($sessionInformation) < 512)
-                $sessionInformation = "0" . $sessionInformation;
+            $sessionInformationLength = 128;
+        } else if (stripos($dataInput, "s256") !== false) {
+            while (strlen($sessionInformation) < 512)
+                $sessionInformation = "0".$sessionInformation;
         
-            $sessionInformationLength=256;
-        } else if(stripos($dataInput, "s512") !==false) {
-            while(strlen($sessionInformation) < 128)
-                $sessionInformation = "0" . $sessionInformation;
+            $sessionInformationLength = 256;
+        } else if (stripos($dataInput, "s512") !== false) {
+            while (strlen($sessionInformation) < 128)
+                $sessionInformation = "0".$sessionInformation;
         
-            $sessionInformationLength=64;
-        } else if (stripos($dataInput, "-s") !== false ) {
+            $sessionInformationLength = 64;
+        } else if (stripos($dataInput, "-s") !== false) {
             // deviation from spec. Officially 's' without a length indicator is not in the reference implementation.
             // RFC is ambigious. However we have supported this in Tiqr since day 1, so we continue to support it.
 
@@ -210,27 +210,27 @@ 
             // to prevent matching the "s" in the password input e.g. "psha1".
             // [C] | QFxx | [PH | Snnn | TG] : Challenge-Response computation
             // [C] | QFxx | [PH | TG] : Plain Signature computation
-            while(strlen($sessionInformation) < 128)
-                $sessionInformation = "0" . $sessionInformation;
+            while (strlen($sessionInformation) < 128)
+                $sessionInformation = "0".$sessionInformation;
             
-            $sessionInformationLength=64;
+            $sessionInformationLength = 64;
         }
         
         
              
         // TimeStamp
-        if($dataInput[0] == "t" ||
+        if ($dataInput[0] == "t" ||
                 stripos($dataInput, "-t") !== false) {
-            while(strlen($timeStamp) < 16)
-                $timeStamp = "0" . $timeStamp;
-            $timeStampLength=8;
+            while (strlen($timeStamp) < 16)
+                $timeStamp = "0".$timeStamp;
+            $timeStampLength = 8;
         }
 
         // Put the bytes of "ocraSuite" parameters into the message
         
-        $msg = array_fill(0,$ocraSuiteLength+$counterLength+$questionLength+$passwordLength+$sessionInformationLength+$timeStampLength+1, 0);
+        $msg = array_fill(0, $ocraSuiteLength + $counterLength + $questionLength + $passwordLength + $sessionInformationLength + $timeStampLength + 1, 0);
                 
-        for($i=0;$i<strlen($ocraSuite);$i++) {
+        for ($i = 0; $i < strlen($ocraSuite); $i++) {
             $msg[$i] = $ocraSuite[$i];
         }
         
@@ -239,9 +239,9 @@ 
 
         // Put the bytes of "Counter" to the message
         // Input is HEX encoded
-        if($counterLength > 0 ) {
+        if ($counterLength > 0) {
             $bArray = self::_hexStr2Bytes($counter, $counterLength, 'counter');
-            for ($i=0;$i<strlen($bArray);$i++) {
+            for ($i = 0; $i < strlen($bArray); $i++) {
                 $msg [$i + $ocraSuiteLength + 1] = $bArray[$i];
             }
         }
@@ -249,41 +249,41 @@ 
 
         // Put the bytes of "question" to the message
         // Input is text encoded
-        if($questionLength > 0 ) {
+        if ($questionLength > 0) {
             $bArray = self::_hexStr2Bytes($question, $questionLength, 'question');
-            for ($i=0;$i<strlen($bArray);$i++) {
+            for ($i = 0; $i < strlen($bArray); $i++) {
                 $msg [$i + $ocraSuiteLength + 1 + $counterLength] = $bArray[$i];
             }
         }
 
         // Put the bytes of "password" to the message
         // Input is HEX encoded
-        if($passwordLength > 0){
+        if ($passwordLength > 0) {
             $bArray = self::_hexStr2Bytes($password, $passwordLength, 'password');
-            for ($i=0;$i<strlen($bArray);$i++) {
+            for ($i = 0; $i < strlen($bArray); $i++) {
                 $msg [$i + $ocraSuiteLength + 1 + $counterLength + $questionLength] = $bArray[$i];
             }
         }
 
         // Put the bytes of "sessionInformation" to the message
         // Input is HEX encoded
-        if($sessionInformationLength > 0 ){
+        if ($sessionInformationLength > 0) {
             $bArray = self::_hexStr2Bytes($sessionInformation, $sessionInformationLength, 'sessionInformation');
-            for ($i=0;$i<strlen($bArray);$i++) {
+            for ($i = 0; $i < strlen($bArray); $i++) {
                 $msg [$i + $ocraSuiteLength + 1 + $counterLength + $questionLength + $passwordLength] = $bArray[$i];
             }
         }
 
         // Put the bytes of "time" to the message
         // Input is HEX encoded value of minutes
-        if($timeStampLength > 0){
+        if ($timeStampLength > 0) {
             $bArray = self::_hexStr2Bytes($timeStamp, $timeStampLength, 'timeStamp');
-            for ($i=0;$i<strlen($bArray);$i++) {
+            for ($i = 0; $i < strlen($bArray); $i++) {
                 $msg [$i + $ocraSuiteLength + 1 + $counterLength + $questionLength + $passwordLength + $sessionInformationLength] = $bArray[$i];
             }
         }
         
-        $byteKey = self::_hexStr2Bytes($key, strlen($key)/2, 'key');
+        $byteKey = self::_hexStr2Bytes($key, strlen($key) / 2, 'key');
               
         $msg = implode("", $msg);
 
@@ -308,23 +308,23 @@ 
     static function _oath_truncate(string $hash, int $length = 6) : string
     {
         // Convert to dec
-        foreach(str_split($hash,2) as $hex)
+        foreach (str_split($hash, 2) as $hex)
         {
-            $hmac_result[]=hexdec($hex);
+            $hmac_result[] = hexdec($hex);
         }
     
         // Find offset
         $offset = $hmac_result[count($hmac_result) - 1] & 0xf;
     
         $v = strval(
-            (($hmac_result[$offset+0] & 0x7f) << 24 ) |
-            (($hmac_result[$offset+1] & 0xff) << 16 ) |
-            (($hmac_result[$offset+2] & 0xff) << 8 ) |
-            ($hmac_result[$offset+3] & 0xff)
+            (($hmac_result[$offset + 0] & 0x7f) << 24) |
+            (($hmac_result[$offset + 1] & 0xff) << 16) |
+            (($hmac_result[$offset + 2] & 0xff) << 8) |
+            ($hmac_result[$offset + 3] & 0xff)
         );
 
         // Prefix truncated string with 0's to ensure it always has the required length
-        $v=str_pad($v, $length, "0", STR_PAD_LEFT);
+        $v = str_pad($v, $length, "0", STR_PAD_LEFT);
 
         $v = substr($v, strlen($v) - $length);
         return $v;

library/tiqr/Tiqr/StateStorage/File.php

Spacing +5 added lines, -5 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;
     }
@@ -141,9 +141,9 @@ 
             // Generate a random key and use it to store a value
             $key = bin2hex(random_bytes(16));
             $this->setValue($key, 'healthcheck', 10);
-            $this->unsetValue($key);    // Cleanup
+            $this->unsetValue($key); // Cleanup
         } catch (Exception $e) {
-            $statusMessage = 'Tiqr_StateStorage_File: error setting key: ' . $e->getMessage();
+            $statusMessage = 'Tiqr_StateStorage_File: error setting key: '.$e->getMessage();
             return false;
         }
 

library/tiqr/Tiqr/StateStorage/Pdo.php

Spacing +10 added lines, -10 removed lines

@@ -117,9 +117,9 @@ 
      */
     private function cleanExpired(): void {
         try {
-            $sth = $this->handle->prepare("DELETE FROM " . $this->tablename . " WHERE `expire` < ? AND NOT `expire` = 0");
+            $sth = $this->handle->prepare("DELETE FROM ".$this->tablename." WHERE `expire` < ? AND NOT `expire` = 0");
             $sth->execute(array(time()));
-            $deletedRows=$sth->rowCount();
+            $deletedRows = $sth->rowCount();
             $this->logger->notice(
                 sprintf("Deleted %d expired keys", $deletedRows)
             );
@@ -135,12 +135,12 @@ 
     /**
      * @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');
         }
-        if (((float) rand() /(float) getrandmax()) < $this->cleanupProbability) {
+        if (((float) rand() / (float) getrandmax()) < $this->cleanupProbability) {
             $this->cleanExpired();
         }
         // REPLACE INTO is mysql dialect. Supported by sqlite as well.
@@ -153,7 +153,7 @@ 
 
         // $expire == 0 means never expire
         if ($expire != 0) {
-            $expire+=time();    // Store unix timestamp after which the key expires
+            $expire += time(); // Store unix timestamp after which the key expires
         }
         try {
             $sth->execute(array(serialize($value), $expire, $key));
@@ -176,7 +176,7 @@ 
             throw new InvalidArgumentException('Empty key not allowed');
         }
         try {
-            $sth = $this->handle->prepare("DELETE FROM " . $this->tablename . " WHERE `key` = ?");
+            $sth = $this->handle->prepare("DELETE FROM ".$this->tablename." WHERE `key` = ?");
             $sth->execute(array($key));
         }
         catch (Exception $e) {
@@ -206,7 +206,7 @@ 
         }
 
         try {
-            $sth = $this->handle->prepare('SELECT `value` FROM ' . $this->tablename . ' WHERE `key` = ? AND (`expire` >= ? OR `expire` = 0)');
+            $sth = $this->handle->prepare('SELECT `value` FROM '.$this->tablename.' WHERE `key` = ? AND (`expire` >= ? OR `expire` = 0)');
             $sth->execute(array($key, time()));
         }
         catch (Exception $e) {
@@ -220,9 +220,9 @@ 
         if (false === $result) {
             // Occurs normally
             $this->logger->info(sprintf('getValue: Key "%s" not found in PDO StateStorage', $key));
-            return NULL;    // Key not found
+            return NULL; // Key not found
         }
-        $result=unserialize($result, array('allowed_classes' => false));
+        $result = unserialize($result, array('allowed_classes' => false));
         if (false === $result) {
             throw new RuntimeException(sprintf('getValue: unserialize error for key "%s" in PDO StateStorage', $key));
         }
@@ -237,7 +237,7 @@ 
     {
         try {
             // Retrieve a random row from the table, this checks that the table exists and is readable
-            $sth = $this->handle->prepare('SELECT `value`, `key`, `expire` FROM ' . $this->tablename . ' LIMIT 1');
+            $sth = $this->handle->prepare('SELECT `value`, `key`, `expire` FROM '.$this->tablename.' LIMIT 1');
             $sth->execute();
         }
         catch (Exception $e) {

library/tiqr/Tiqr/StateStorage/Memcache.php

Spacing +4 added lines, -4 removed lines

@@ -51,7 +51,7 @@ 
      * The default configuration
      */
     const DEFAULT_HOST = '127.0.0.1';
-    const DEFAULT_PORT =  11211;
+    const DEFAULT_PORT = 11211;
     
     /**
      * Get the prefix to use for all keys in memcache.
@@ -106,7 +106,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');
@@ -160,7 +160,7 @@ 
         if ($result === false) {
             // Memcache interface does not provide error information, either the key does not exist or
             // there was an error communicating with the memcache
-            $this->logger->info( sprintf('Unable to get key "%s" from memcache StateStorage', $key) );
+            $this->logger->info(sprintf('Unable to get key "%s" from memcache StateStorage', $key));
             return null;
         }
         return $result;
@@ -176,7 +176,7 @@ 
             $key = bin2hex(random_bytes(16));
             $this->setValue($key, 'healthcheck', 10);
         } catch (Exception $e) {
-            $statusMessage = 'Unable to store key in memcache: ' . $e->getMessage();
+            $statusMessage = 'Unable to store key in memcache: '.$e->getMessage();
             return false;
         }
 

library/tiqr/Tiqr/StateStorage/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/UserStorage/Pdo.php

Spacing +17 added lines, -17 removed lines

@@ -98,21 +98,21 @@ 
      */
     private function _getStringValue(string $columnName, string $userId): string
     {
-        if ( !in_array($columnName, $this->_allowedStringColumns) ) {
+        if (!in_array($columnName, $this->_allowedStringColumns)) {
             throw new InvalidArgumentException('Unsupported column name');
         }
 
         try {
-            $sth = $this->handle->prepare('SELECT ' . $columnName . ' FROM ' . $this->tablename . ' WHERE userid = ?');
+            $sth = $this->handle->prepare('SELECT '.$columnName.' 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 "%s" for user "%s"', $columnName, $userId));
                 throw new RuntimeException('User not found');
             }
             if ($res === NULL) {
-                return '';  // Value unset
+                return ''; // Value unset
             }
             if (!is_string($res)) {
                 $this->logger->error(sprintf('Expected string type while getting "%s" for user "%s"', $columnName, $userId));
@@ -136,28 +136,28 @@ 
      */
     private function _getIntValue(string $columnName, string $userId): int
     {
-        if ( !in_array($columnName, $this->_allowedIntColumns) ) {
+        if (!in_array($columnName, $this->_allowedIntColumns)) {
             throw new InvalidArgumentException('Unsupported column name');
         }
 
         try {
-            $sth = $this->handle->prepare('SELECT ' . $columnName . ' FROM ' . $this->tablename . ' WHERE userid = ?');
+            $sth = $this->handle->prepare('SELECT '.$columnName.' 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 "%s" for user "%s"', $columnName, $userId));
                 throw new RuntimeException('User not found');
             }
             if ($res === NULL) {
-                return 0;  // Value unset
+                return 0; // Value unset
             }
             // Return type for integers depends on the PDO driver, can be string
             if (!is_numeric($res)) {
                 $this->logger->error(sprintf('Expected int type while getting "%s" for user "%s"', $columnName, $userId));
                 throw new RuntimeException('Unexpected return type');
             }
-            return (int)$res;
+            return (int) $res;
         }
         catch (Exception $e) {
             $this->logger->error('PDO error getting user', array('exception' => $e, 'userId' => $userId, 'columnName'=>$columnName));
@@ -174,11 +174,11 @@ 
      */
     private function _setStringValue(string $columnName, string $userId, string $value): void
     {
-        if ( !in_array($columnName, $this->_allowedStringColumns) ) {
+        if (!in_array($columnName, $this->_allowedStringColumns)) {
             throw new InvalidArgumentException('Unsupported column name');
         }
         try {
-            $sth = $this->handle->prepare('UPDATE ' . $this->tablename . ' SET ' . $columnName . ' = ? WHERE userid = ?');
+            $sth = $this->handle->prepare('UPDATE '.$this->tablename.' SET '.$columnName.' = ? WHERE userid = ?');
             $sth->execute(array($value, $userId));
             if ($sth->rowCount() == 0) {
                 // Required for mysql which only returns the number of rows that were actually updated
@@ -202,11 +202,11 @@ 
      */
     private function _setIntValue(string $columnName, string $userId, int $value): void
     {
-        if ( !in_array($columnName, $this->_allowedIntColumns) ) {
+        if (!in_array($columnName, $this->_allowedIntColumns)) {
             throw new InvalidArgumentException('Unsupported column name');
         }
         try {
-            $sth = $this->handle->prepare('UPDATE ' . $this->tablename . ' SET ' . $columnName . ' = ? WHERE userid = ?');
+            $sth = $this->handle->prepare('UPDATE '.$this->tablename.' SET '.$columnName.' = ? WHERE userid = ?');
             $sth->execute(array($value, $userId));
             if ($sth->rowCount() == 0) {
                 // Required for mysql which only returns the number of rows that were actually updated
@@ -318,17 +318,17 @@ 
     {
         // Check for blocked
         if ($this->_getIntValue('blocked', $userId) != 0) {
-            return true;   // Blocked
+            return true; // Blocked
         }
 
         if (0 == $tempBlockDuration) {
-            return false;   // No check for temporary block
+            return false; // No check for temporary block
         }
 
         // Check for temporary block
         $timestamp = $this->getTemporaryBlockTimestamp($userId);
         // if no temporary block timestamp is set or if the temporary block is expired, return false
-        if ( 0 == $timestamp || ($timestamp + $tempBlockDuration * 60) < time()) {
+        if (0 == $timestamp || ($timestamp + $tempBlockDuration * 60) < time()) {
             return false;
         }
         return true;
@@ -384,7 +384,7 @@ 
             $sth->execute();
         }
         catch (Exception $e) {
-            $statusMessage = "Error reading from UserStorage_PDO: ". $e->getMessage();
+            $statusMessage = "Error reading from UserStorage_PDO: ".$e->getMessage();
             return false;
         }
 

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

library/tiqr/Tiqr/UserSecretStorage/File.php

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