Tiqr / tiqr-server-libphp

library/tiqr/Tiqr/UserSecretStorage/Pdo.php

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/UserStorage/FileTrait.php

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/StateStorage/Pdo.php

Braces +5 added lines, -10 removed lines

@@ -80,8 +80,7 @@ 
             $sth = $this->handle->prepare('SELECT `key` FROM ' . $this->tablename . ' WHERE `key` = ?');
             $sth->execute(array($key));
             return $sth->fetchColumn() !== false;
-        }
-        catch (Exception $e) {
+        } catch (Exception $e) {
             $this->logger->error(
                 sprintf('Error checking for key "%s" in PDO StateStorage', $key),
                 array('exception' => $e)
@@ -103,8 +102,7 @@ 
             $this->logger->notice(
                 sprintf("Deleted %i expired keys", $deletedRows)
             );
-        }
-        catch (Exception $e) {
+        } catch (Exception $e) {
             $this->logger->error(
                 sprintf("Deleting expired keys failed: %s", $e->getMessage()),
                 array('exception', $e)
@@ -134,8 +132,7 @@ 
         }
         try {
             $sth->execute(array(serialize($value), $expire, $key));
-        }
-        catch (Exception $e) {
+        } catch (Exception $e) {
             $this->logger->error(
                 sprintf('Unable to store key "%s" in PDO StateStorage', $key),
                 array('exception' => $e)
@@ -155,8 +152,7 @@ 
         try {
             $sth = $this->handle->prepare("DELETE FROM " . $this->tablename . " WHERE `key` = ?");
             $sth->execute(array($key));
-        }
-        catch (Exception $e) {
+        } catch (Exception $e) {
             $this->logger->error(
                 sprintf('Error deleting key "%s" from PDO StateStorage', $key),
                 array('exception' => $e)
@@ -185,8 +181,7 @@ 
         try {
             $sth = $this->handle->prepare('SELECT `value` FROM ' . $this->tablename . ' WHERE `key` = ? AND (`expire` >= ? OR `expire` = 0)');
             $sth->execute(array($key, time()));
-        }
-        catch (Exception $e) {
+        } catch (Exception $e) {
             $this->logger->error(
                 sprintf('Error getting value for key "%s" from PDO StateStorage', $key),
                 array('exception' => $e)

library/tiqr/Tiqr/OcraService/Tiqr.php

Braces +1 added lines, -2 removed lines

@@ -36,8 +36,7 @@
         // response as the client calculated.
         try {
             $expected = OCRA::generateOCRA($this->_ocraSuite, $userSecret, "", $challenge, "", $sessionInformation, "");
-        }
-        catch (Exception $e) {
+        } catch (Exception $e) {
             $this->logger->warning(sprintf('Error calculating OCRA response for user "%s"', $userId), array('exception'=>$e));
             return false;
         }

library/tiqr/Tiqr/UserStorage/Pdo.php

Braces +6 added lines, -12 removed lines

@@ -110,8 +110,7 @@ 
                 throw new RuntimeException('Unexpected return type');
             }
             return $res;
-        }
-        catch (Exception $e) {
+        } catch (Exception $e) {
             $this->logger->error('PDO error getting user', array('exception' => $e, 'userId' => $userId, 'columnName'=>$columnName));
             throw ReadWriteException::fromOriginalException($e);
         }
@@ -149,8 +148,7 @@ 
                 throw new RuntimeException('Unexpected return type');
             }
             return (int)$res;
-        }
-        catch (Exception $e) {
+        } catch (Exception $e) {
             $this->logger->error('PDO error getting user', array('exception' => $e, 'userId' => $userId, 'columnName'=>$columnName));
             throw ReadWriteException::fromOriginalException($e);
         }
@@ -177,8 +175,7 @@ 
                     throw new RuntimeException('User not found');
                 }
             }
-        }
-        catch (Exception $e) {
+        } catch (Exception $e) {
             $this->logger->error('PDO error updating user', array('exception' => $e, 'userId' => $userId, 'columnName'=>$columnName));
             throw ReadWriteException::fromOriginalException($e);
         }
@@ -205,8 +202,7 @@ 
                     throw new RuntimeException('User not found');
                 }
             }
-        }
-        catch (Exception $e) {
+        } catch (Exception $e) {
             $this->logger->error('PDO error updating user', array('exception' => $e, 'userId' => $userId, 'columnName'=>$columnName));
             throw ReadWriteException::fromOriginalException($e);
         }
@@ -223,8 +219,7 @@ 
         try {
             $sth = $this->handle->prepare("INSERT INTO ".$this->tablename." (displayname,userid) VALUES (?,?)");
             $sth->execute(array($displayName, $userId));
-        }
-        catch (Exception $e) {
+        } catch (Exception $e) {
             $this->logger->error(sprintf('Error creating user "%s"', $userId), array('exception'=>$e));
             throw new ReadWriteException('The user could not be saved in the user storage (PDO)');
         }
@@ -239,8 +234,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);
         }

library/tiqr/Tiqr/Service.php

Braces +10 added lines, -9 removed lines

@@ -290,8 +290,7 @@ 
         if (isset($options['ocraservice']) && $options['ocraservice']['type'] != 'tiqr') {
             $options['ocraservice']['ocra.suite'] = $this->_ocraSuite;
             $this->_ocraService = Tiqr_OcraService::getOcraService($options['ocraservice']['type'], $options['ocraservice'], $logger);
-        }
-        else { // Create default ocraservice
+        } else { // Create default ocraservice
             $this->_ocraService = Tiqr_OcraService::getOcraService('tiqr', array('ocra.suite' => $this->_ocraSuite), $logger);
         }
     }
@@ -350,10 +349,11 @@ 
                 case 'APNS':
                 case 'APNS_DIRECT':
                     $apns_version = $this->_options['apns.version'] ?? 1;
-                    if ($apns_version ==2 )
-                        $message = new Tiqr_Message_APNS2($this->_options, $this->logger);
-                    else
-                        $message = new Tiqr_Message_APNS($this->_options, $this->logger);
+                    if ($apns_version ==2 ) {
+                                            $message = new Tiqr_Message_APNS2($this->_options, $this->logger);
+                    } else {
+                                            $message = new Tiqr_Message_APNS($this->_options, $this->logger);
+                    }
                     break;
 
                 case 'GCM':
@@ -518,7 +518,9 @@ 
             $sessionId = session_id(); 
         }
         $status = $this->_getStateValue(self::PREFIX_ENROLLMENT_STATUS, $sessionId);
-        if (is_null($status)) return self::ENROLLMENT_STATUS_IDLE;
+        if (is_null($status)) {
+            return self::ENROLLMENT_STATUS_IDLE;
+        }
         return $status;
     }
         
@@ -875,8 +877,7 @@ 
         
         try {
             return $this->_getStateValue("authenticated_", $sessionId);
-        }
-        catch (Exception $e) {
+        } catch (Exception $e) {
             $this->logger->error('getAuthenticatedUser failed', array('exception'=>$e));
             return NULL;
         }

library/tiqr/Tiqr/Message/APNS2.php

Braces +1 added lines, -2 removed lines

@@ -28,8 +28,7 @@
             // Use HTTP/1.1 instead of HTTP/2
             $curl_options[CURLOPT_HTTP_VERSION] = CURL_HTTP_VERSION_1_1;
             $this->logger->notice(sprintf('Using HTTP/1.1 CURL Proxy URL: "%s" and port "%s"',  $curl_options[CURLOPT_URL], $curl_options[CURLOPT_URL]));
-        }
-        else {
+        } else {
             $version_info = curl_version();
             if ($version_info['features'] & CURL_VERSION_HTTP2 == 0) {
                 throw new RuntimeException('APNS2 requires HTTP/2 support in curl');