Tiqr / tiqr-server-libphp

library/tiqr/Tiqr/OcraService/OathServiceClient.php

Spacing +1 added lines, -1 removed lines

@@ -81,7 +81,7 @@
                     'verifyResponse for user "%s" failed',
                     $userId
                 ),
-                array( 'exception' => $e)
+                array('exception' => $e)
             );
             return false;
         }

library/tiqr/Tiqr/Random.php

Spacing +1 added lines, -1 removed lines

@@ -42,7 +42,7 @@
     public static function randomBytes(int $length): string
     {
         // Get $length cryptographically secure pseudo-random bytes
-        $rnd=\random_bytes($length);
+        $rnd = \random_bytes($length);
 
         if (strlen($rnd) !== $length) {
             throw new Exception("random_bytes did not return the requested number of bytes");

library/tiqr/Tiqr/Exception/ReadWriteException.php

Spacing +1 added lines, -1 removed lines

@@ -22,6 +22,6 @@
     {
         // $code must be int, otherwise this throws with Error("Wrong parameters for ReadWriteException")
         // PDOException::getCode() can return a sting
-        return new self($e->getMessage(), (int)$e->getCode(), $e );
+        return new self($e->getMessage(), (int) $e->getCode(), $e);
     }
 }

library/tiqr/Tiqr/Service.php

Indentation +33 added lines, -33 removed lines

@@ -571,17 +571,17 @@ 
         }
 
         $metadata = array("service"=>
-                               array("displayName"       => $this->_name,
-                                     "identifier"        => $this->_identifier,
-                                     "logoUrl"           => $this->_logoUrl,
-                                     "infoUrl"           => $this->_infoUrl,
-                                     "authenticationUrl" => $authenticationUrl,
-                                     "ocraSuite"         => $this->_ocraSuite,
-                                     "enrollmentUrl"     => $enrollmentUrl
-                               ),
-                          "identity"=>
-                               array("identifier" =>$data["userId"],
-                                     "displayName"=>$data["displayName"]));
+                                array("displayName"       => $this->_name,
+                                        "identifier"        => $this->_identifier,
+                                        "logoUrl"           => $this->_logoUrl,
+                                        "infoUrl"           => $this->_infoUrl,
+                                        "authenticationUrl" => $authenticationUrl,
+                                        "ocraSuite"         => $this->_ocraSuite,
+                                        "enrollmentUrl"     => $enrollmentUrl
+                                ),
+                            "identity"=>
+                                array("identifier" =>$data["userId"],
+                                        "displayName"=>$data["displayName"]));
 
         $this->_unsetStateValue(self::PREFIX_ENROLLMENT, $enrollmentKey);
 
@@ -611,28 +611,28 @@ 
      */
     public function getEnrollmentSecret(string $enrollmentKey): string
     {
-         $data = $this->_getStateValue(self::PREFIX_ENROLLMENT, $enrollmentKey);
-         if (!is_array($data)) {
-             $this->logger->error('getEnrollmentSecret: enrollment key not found');
-             throw new RuntimeException('enrollment key not found');
-         }
-         $userId = $data["userId"] ?? NULL;
-         $sessionId = $data["sessionId"] ?? NULL;
-         if (!is_string($userId) || !(is_string($sessionId))) {
-             throw new RuntimeException('getEnrollmentSecret: invalid enrollment data');
-         }
-         $enrollmentData = [
-             "userId" => $userId,
-             "sessionId" => $sessionId
-         ];
-         $enrollmentSecret = $this->_uniqueSessionKey();
-         $this->_setStateValue(
-             self::PREFIX_ENROLLMENT_SECRET,
-             $enrollmentSecret,
-             $enrollmentData,
-             self::ENROLLMENT_EXPIRE
-         );
-         return $enrollmentSecret;
+            $data = $this->_getStateValue(self::PREFIX_ENROLLMENT, $enrollmentKey);
+            if (!is_array($data)) {
+                $this->logger->error('getEnrollmentSecret: enrollment key not found');
+                throw new RuntimeException('enrollment key not found');
+            }
+            $userId = $data["userId"] ?? NULL;
+            $sessionId = $data["sessionId"] ?? NULL;
+            if (!is_string($userId) || !(is_string($sessionId))) {
+                throw new RuntimeException('getEnrollmentSecret: invalid enrollment data');
+            }
+            $enrollmentData = [
+                "userId" => $userId,
+                "sessionId" => $sessionId
+            ];
+            $enrollmentSecret = $this->_uniqueSessionKey();
+            $this->_setStateValue(
+                self::PREFIX_ENROLLMENT_SECRET,
+                $enrollmentSecret,
+                $enrollmentData,
+                self::ENROLLMENT_EXPIRE
+            );
+            return $enrollmentSecret;
     }
 
     /**

Spacing +37 added lines, -37 removed lines

@@ -109,7 +109,7 @@ 
     // INVALID_USERID: The client authenticated a different user than the server expected. This error is returned when
     // the application stated an authentication session specifying the userId and later during the authentication
     // provides a different userId
-    const AUTH_RESULT_INVALID_USERID    = 5;
+    const AUTH_RESULT_INVALID_USERID = 5;
     
     /**
      * The default OCRA Suite (RFC 6287) to use for authentication in Tiqr
@@ -244,7 +244,7 @@ 
      * @param int $version The tiqr protocol version to use (defaults to the latest)
      * @throws Exception
      */
-    public function __construct(LoggerInterface $logger, array $options=array(), int $version = 2)
+    public function __construct(LoggerInterface $logger, array $options = array(), int $version = 2)
     {
         $this->_options = $options; // Used to later get settings for Tiqr_Message_*
         $this->logger = $logger;
@@ -347,7 +347,7 @@ 
                 case 'APNS':
                 case 'APNS_DIRECT':
                     $apns_version = $this->_options['apns.version'] ?? 2;
-                    if ($apns_version !=2)
+                    if ($apns_version != 2)
                         throw new InvalidArgumentException("Unsupported APNS version '$apns_version'");
                     $message = new Tiqr_Message_APNS2($this->_options, $this->logger);
                     break;
@@ -364,7 +364,7 @@ 
 
             $this->logger->info(sprintf('Creating and sending a %s push notification', $notificationType));
             $message->setId(time());
-            $message->setText("Please authenticate for " . $this->_name);
+            $message->setText("Please authenticate for ".$this->_name);
             $message->setAddress($notificationAddress);
             $message->setCustomProperty('challenge', $this->_getChallengeUrl($sessionKey));
             $message->send();
@@ -410,13 +410,13 @@ 
      * @return string The authentication sessionKey
      * @throws Exception when starting the authentication session failed
      */
-    public function startAuthenticationSession(string $userId="", string $sessionId="", string $spIdentifier=""): string
+    public function startAuthenticationSession(string $userId = "", string $sessionId = "", string $spIdentifier = ""): string
     {
-        if ($sessionId=="") {
+        if ($sessionId == "") {
             $sessionId = session_id();
         }
 
-        if ($spIdentifier=="") {
+        if ($spIdentifier == "") {
             $spIdentifier = $this->_identifier;
         }
 
@@ -425,7 +425,7 @@ 
         
         $data = array("sessionId"=>$sessionId, "challenge"=>$challenge, "spIdentifier" => $spIdentifier);
         
-        if ($userId!="") {
+        if ($userId != "") {
             $data["userId"] = $userId;
         }
         
@@ -449,9 +449,9 @@ 
      * @return String The enrollment key
      * @throws Exception when start the enrollement session failed
      */
-    public function startEnrollmentSession(string $userId, string $displayName, string $sessionId=""): string
+    public function startEnrollmentSession(string $userId, string $displayName, string $sessionId = ""): string
     {
-        if ($sessionId=="") {
+        if ($sessionId == "") {
             $sessionId = session_id();
         }
         $enrollmentKey = $this->_uniqueSessionKey();
@@ -471,9 +471,9 @@ 
      * @param string $sessionId The application's session identifier (defaults to php session)
      * @throws Exception when resetting the session failed
      */
-    public function resetEnrollmentSession(string $sessionId=""): void
+    public function resetEnrollmentSession(string $sessionId = ""): void
     {
-        if ($sessionId=="") {
+        if ($sessionId == "") {
             $sessionId = session_id();
         }
 
@@ -508,9 +508,9 @@ 
      *
      * @throws Exception when an error communicating with the state storage backend was detected
      */
-    public function getEnrollmentStatus(string $sessionId=""): int
+    public function getEnrollmentStatus(string $sessionId = ""): int
     { 
-        if ($sessionId=="") {
+        if ($sessionId == "") {
             $sessionId = session_id(); 
         }
         $status = $this->_getStateValue(self::PREFIX_ENROLLMENT_STATUS, $sessionId);
@@ -663,7 +663,7 @@ 
             if (NULL === $data) {
                 throw new RuntimeException('Enrollment secret not found');
             }
-            if ( !is_array($data) || !is_string($data["userId"] ?? NULL)) {
+            if (!is_array($data) || !is_string($data["userId"] ?? NULL)) {
                 throw new RuntimeException('Invalid enrollment data');
             }
 
@@ -703,7 +703,7 @@ 
                 $this->_setEnrollmentStatus($data["sessionId"], self::ENROLLMENT_STATUS_FINALIZED);
             } else {
                 $this->logger->error(
-                    'Enrollment status is not finalized, enrollmentsecret was not found in state storage. ' .
+                    'Enrollment status is not finalized, enrollmentsecret was not found in state storage. '.
                     'Warning! the method will still return "true" as a result.'
                 );
             }
@@ -761,9 +761,9 @@ 
             throw $e;
         }
 
-        $sessionId = $state["sessionId"] ?? NULL;   // Application's sessionId
-        $challenge = $state["challenge"] ?? NULL;   // The challenge we sent to the Tiqr client
-        if (!is_string($sessionId) || (!is_string($challenge)) ) {
+        $sessionId = $state["sessionId"] ?? NULL; // Application's sessionId
+        $challenge = $state["challenge"] ?? NULL; // The challenge we sent to the Tiqr client
+        if (!is_string($sessionId) || (!is_string($challenge))) {
             throw new RuntimeException('Invalid state for state storage');
         }
 
@@ -772,7 +772,7 @@ 
         $challengeUserId = $state["userId"] ?? NULL;
 
         // If the application requested a specific userId, verify that that is that userId that we're now authenticating
-        if ($challengeUserId!==NULL && ($userId !== $challengeUserId)) {
+        if ($challengeUserId !== NULL && ($userId !== $challengeUserId)) {
             $this->logger->error(
                 sprintf('Authentication failed: the requested userId "%s" does not match userId "%s" that is being authenticated',
                 $challengeUserId, $userId)
@@ -820,9 +820,9 @@ 
      *
      * @throws Exception when there was an error communicating with the storage backed
      */
-    public function logout(string $sessionId=""): void
+    public function logout(string $sessionId = ""): void
     {
-        if ($sessionId=="") {
+        if ($sessionId == "") {
             $sessionId = session_id(); 
         }
         
@@ -862,9 +862,9 @@ 
      *
      * Does not throw
      */
-    public function getAuthenticatedUser(string $sessionId=""): ?string
+    public function getAuthenticatedUser(string $sessionId = ""): ?string
     {
-        if ($sessionId=="") {
+        if ($sessionId == "") {
             $this->logger->debug('Using the PHP session id, as no session id was provided');
             $sessionId = session_id(); 
         }
@@ -908,22 +908,22 @@ 
         $challenge = $state["challenge"] ?? '';
         $spIdentifier = $state["spIdentifier"] ?? '';
 
-        if ( (strpos($this->_protocolAuth, 'https://') === 0) || (strpos($this->_protocolAuth, 'http://') === 0) ) {
+        if ((strpos($this->_protocolAuth, 'https://') === 0) || (strpos($this->_protocolAuth, 'http://') === 0)) {
             // Create universal Link
-            $parameters=array();
+            $parameters = array();
             if (!is_null($userId)) {
-                $parameters[]='u='.urlencode($userId);
+                $parameters[] = 'u='.urlencode($userId);
             }
-            $parameters[]='s='.urlencode($sessionKey);
-            $parameters[]='q='.urlencode($challenge);
-            $parameters[]='i='.urlencode($this->getIdentifier());
-            $parameters[]='v='.urlencode($this->_protocolVersion);
+            $parameters[] = 's='.urlencode($sessionKey);
+            $parameters[] = 'q='.urlencode($challenge);
+            $parameters[] = 'i='.urlencode($this->getIdentifier());
+            $parameters[] = 'v='.urlencode($this->_protocolVersion);
             return $this->_protocolAuth.'?'.implode('&', $parameters);
         }
 
         // Create custom URL scheme
         // Last bit is the spIdentifier
-        return $this->_protocolAuth."://".(!is_null($userId)?urlencode($userId).'@':'').$this->getIdentifier()."/".$sessionKey."/".$challenge."/".urlencode($spIdentifier)."/".$this->_protocolVersion;
+        return $this->_protocolAuth."://".(!is_null($userId) ?urlencode($userId).'@' : '').$this->getIdentifier()."/".$sessionKey."/".$challenge."/".urlencode($spIdentifier)."/".$this->_protocolVersion;
     }
 
     /**
@@ -934,7 +934,7 @@ 
     {
         // The are two formats see: https://tiqr.org/technical/protocol/
 
-        if ( (strpos($this->_protocolEnroll, 'https://') === 0) || (strpos($this->_protocolEnroll, 'http://') === 0) ) {
+        if ((strpos($this->_protocolEnroll, 'https://') === 0) || (strpos($this->_protocolEnroll, 'http://') === 0)) {
             // Create universal Link
             return $this->_protocolEnroll.'?metadata='.urlencode($metadataUrl);
         }
@@ -953,7 +953,7 @@ 
     protected function _uniqueSessionKey(): string
     {
 
-        return bin2hex( Tiqr_Random::randomBytes(self::SESSION_KEY_LENGTH_BYTES) );
+        return bin2hex(Tiqr_Random::randomBytes(self::SESSION_KEY_LENGTH_BYTES));
     }
     
     /**
@@ -984,7 +984,7 @@ 
      */
     protected function _setStateValue(string $key_prefix, string $key, $value, int $expire): void {
         $this->_stateStorage->setValue(
-            $key_prefix . $this->_hashKey($key),
+            $key_prefix.$this->_hashKey($key),
             $value,
             $expire
         );
@@ -1001,7 +1001,7 @@ 
 
     protected function _getStateValue(string $key_prefix, string $key) {
         return $this->_stateStorage->getValue(
-            $key_prefix . $this->_hashKey($key)
+            $key_prefix.$this->_hashKey($key)
         );
     }
 
@@ -1015,7 +1015,7 @@ 
      */
     protected function _unsetStateValue(string $key_prefix, string $key): void {
         $this->_stateStorage->unsetValue(
-            $key_prefix . $this->_hashKey($key)
+            $key_prefix.$this->_hashKey($key)
         );
     }
 

Braces +8 added lines, -7 removed lines

@@ -287,8 +287,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);
         }
     }
@@ -347,8 +346,9 @@ 
                 case 'APNS':
                 case 'APNS_DIRECT':
                     $apns_version = $this->_options['apns.version'] ?? 2;
-                    if ($apns_version !=2)
-                        throw new InvalidArgumentException("Unsupported APNS version '$apns_version'");
+                    if ($apns_version !=2) {
+                                            throw new InvalidArgumentException("Unsupported APNS version '$apns_version'");
+                    }
                     $message = new Tiqr_Message_APNS2($this->_options, $this->logger);
                     break;
 
@@ -514,7 +514,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;
     }
         
@@ -871,8 +873,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');

Spacing +20 added lines, -20 removed lines

@@ -20,11 +20,11 @@ 
         $options = $this->getOptions();
         if (isset($options['apns.proxy_host_url'])) {
             // Override CURL options to connect to a HTTP/1.1 to HTTP/2 proxy
-            $curl_options[CURLOPT_URL] = $options['apns.proxy_host_url'] . '/3/device/' . $this->getAddress();
+            $curl_options[CURLOPT_URL] = $options['apns.proxy_host_url'].'/3/device/'.$this->getAddress();
             $curl_options[CURLOPT_PORT] = $options['apns.proxy_host_port'] ?? 443;
             // 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]));
+            $this->logger->notice(sprintf('Using HTTP/1.1 CURL Proxy URL: "%s" and port "%s"', $curl_options[CURLOPT_URL], $curl_options[CURLOPT_URL]));
         }
         else {
             $version_info = curl_version();
@@ -35,7 +35,7 @@ 
 
         // Get the UID from the client certificate we use for authentication, this
         // is set to the bundle ID.
-        $options=$this->getOptions();
+        $options = $this->getOptions();
         $cert_filename = $options['apns.certificate'];
         if (strlen($cert_filename) == 0) {
             throw new RuntimeException('apns.certificate option not set');
@@ -47,11 +47,11 @@ 
             );
         }
 
-        $cert=openssl_x509_parse( $cert_file_contents );
+        $cert = openssl_x509_parse($cert_file_contents);
         if (false === $cert) {
             // Log openssl error information
             while ($msg = openssl_error_string()) {
-                $this->logger->error('openssl_x509_parse(): ' . $msg);
+                $this->logger->error('openssl_x509_parse(): '.$msg);
             }
             throw new RuntimeException('Error parsing APNS client certificate');
         }
@@ -76,42 +76,42 @@ 
         $authProvider = AuthProvider\Certificate::create($authProviderOptions);
 
         // Create the push message
-        $alert=Alert::create();
+        $alert = Alert::create();
         $alert->setBody($this->getText());
         // Note: It is possible to specify a title and a subtitle: $alert->setTitle() && $alert->setSubtitle()
         //       The tiqr service currently does not implement this.
-        $payload=Payload::create()->setAlert($alert);
+        $payload = Payload::create()->setAlert($alert);
         $payload->setSound('default');
         foreach ($this->getCustomProperties() as $name => $value) {
             $payload->setCustomValue($name, $value);
         }
         $this->logger->debug(sprintf('JSON Payload: %s', $payload->toJson()));
-        $notification=new Notification($payload, $this->getAddress());
+        $notification = new Notification($payload, $this->getAddress());
         // Set expiration to 30 seconds from now, same as Message_APNS
         $now = new DateTime();
-        $expirationInstant=$now->add(new DateInterval('PT30S'));
+        $expirationInstant = $now->add(new DateInterval('PT30S'));
         $notification->setExpirationAt($expirationInstant);
 
         // Send the push message
         $client = new Client($authProvider, $options['apns.environment'] == 'production', $curl_options);
         $client->addNotification($notification);
-        $responses=$client->push();
-        if ( sizeof($responses) != 1) {
-            $this->logger->warning(sprintf('Unexpected number responses. Expected 1, got %d', sizeof($responses)) );
+        $responses = $client->push();
+        if (sizeof($responses) != 1) {
+            $this->logger->warning(sprintf('Unexpected number responses. Expected 1, got %d', sizeof($responses)));
             if (sizeof($responses) == 0) {
                 $this->logger->warning('Could not determine whether the notification was sent');
                 return;
             }
         }
         /** @var \Pushok\Response $response */
-        $response = reset($responses);  // Get first response from the array
-        $deviceToken=$response->getDeviceToken() ?? '';
+        $response = reset($responses); // Get first response from the array
+        $deviceToken = $response->getDeviceToken() ?? '';
         // A canonical UUID that is the unique ID for the notification. E.g. 123e4567-e89b-12d3-a456-4266554400a0
-        $apnsId=$response->getApnsId() ?? '';
+        $apnsId = $response->getApnsId() ?? '';
         // Status code. E.g. 200 (Success), 410 (The device token is no longer active for the topic.)
-        $statusCode=$response->getStatusCode();
+        $statusCode = $response->getStatusCode();
         $this->logger->info(sprintf('Got response with ApnsId "%s", status %s for deviceToken "%s"', $apnsId, $statusCode, $deviceToken));
-        if ( strcasecmp($deviceToken, $this->getAddress()) ) {
+        if (strcasecmp($deviceToken, $this->getAddress())) {
         $this->logger->warning(sprintf('Unexpected deviceToken in response. Expected: "%s"; got: "%s"', $this->getAddress(), $deviceToken));
         }
         if ($statusCode == 200) {
@@ -119,9 +119,9 @@ 
             return;
         }
 
-        $reasonPhrase=$response->getReasonPhrase(); // E.g. The device token is no longer active for the topic.
-        $errorReason=$response->getErrorReason(); // E.g. Unregistered
-        $errorDescription=$response->getErrorDescription(); // E.g. The device token is inactive for the specified topic.
+        $reasonPhrase = $response->getReasonPhrase(); // E.g. The device token is no longer active for the topic.
+        $errorReason = $response->getErrorReason(); // E.g. Unregistered
+        $errorDescription = $response->getErrorDescription(); // E.g. The device token is inactive for the specified topic.
 
         $this->logger->error(sprintf('Error sending APNS2 push notification. APNS ID: "%s"; deviceToken: "%s"; Error: "%s" "%s" "%s"', $apnsId, $deviceToken, $reasonPhrase, $errorReason, $errorDescription));
         throw new RuntimeException(

library/tiqr/Tiqr/UserSecretStorage/Pdo.php

Indentation -1 removed lines

@@ -42,7 +42,6 @@
     userid varchar(30) NOT NULL UNIQUE,
     secret varchar(128),
 );
-
  * @see Tiqr_UserSecretStorage::getSecretStorage()
  * @see Tiqr_UserSecretStorage_Interface
  *

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

Indentation -1 removed lines

@@ -59,7 +59,6 @@
 );
 
 CREATE INDEX IF NOT EXISTS index_tiqrstate_expire ON tiqrstate (expire);
-
  * @see Tiqr_StateStorage::getStorage()
  * @see Tiqr_StateStorage_StateStorageInterface
  *

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) {

Braces +5 added lines, -10 removed lines

@@ -123,8 +123,7 @@ 
             $this->logger->notice(
                 sprintf("Deleted %d expired keys", $deletedRows)
             );
-        }
-        catch (Exception $e) {
+        } catch (Exception $e) {
             $this->logger->error(
                 sprintf("Deleting expired keys failed: %s", $e->getMessage()),
                 array('exception', $e)
@@ -157,8 +156,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)
@@ -178,8 +176,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)
@@ -208,8 +205,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)
@@ -239,8 +235,7 @@ 
             // 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->execute();
-        }
-        catch (Exception $e) {
+        } catch (Exception $e) {
             $statusMessage = sprintf('Error performing health check on PDO StateStorage: %s', $e->getMessage());
             return false;
         }

library/tiqr/Tiqr/UserSecretStorage.php

Spacing +1 added lines, -1 removed lines

@@ -74,7 +74,7 @@
                 $password = $options['password'];
 
                 try {
-                    $handle = new PDO($dsn, $userName, $password, array(PDO::ATTR_ERRMODE => PDO::ERRMODE_EXCEPTION) );
+                    $handle = new PDO($dsn, $userName, $password, array(PDO::ATTR_ERRMODE => PDO::ERRMODE_EXCEPTION));
                 } catch (PDOException $e) {
                     $logger->error(
                         sprintf('Unable to establish a PDO connection. Error message from PDO: %s', $e->getMessage())

Indentation +1 added lines, -1 removed lines

@@ -97,7 +97,7 @@
      *         ),
      *     )
      * );
- *
+     *
      *
      * @return Tiqr_UserSecretStorage_Interface
      * @throws RuntimeException If an unknown type is requested.

library/tiqr/Tiqr/OcraService.php

Spacing +2 added lines, -2 removed lines

@@ -39,10 +39,10 @@
      * @return Tiqr_OcraService_Interface
      * @throws Exception An exception if an unknown orca service type is requested.
      */
-    public static function getOcraService(string $type="tiqr", array $options=array(), LoggerInterface $logger=null)
+    public static function getOcraService(string $type = "tiqr", array $options = array(), LoggerInterface $logger = null)
     {
         if (!$logger)
-            $logger=new \Psr\Log\NullLogger();
+            $logger = new \Psr\Log\NullLogger();
 
         switch ($type) {
             case "tiqr":

Braces +3 added lines, -2 removed lines

@@ -41,8 +41,9 @@
      */
     public static function getOcraService(string $type="tiqr", array $options=array(), LoggerInterface $logger=null)
     {
-        if (!$logger)
-            $logger=new \Psr\Log\NullLogger();
+        if (!$logger) {
+                    $logger=new \Psr\Log\NullLogger();
+        }
 
         switch ($type) {
             case "tiqr":