Tiqr / tiqr-server-libphp

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

Braces +5 added lines, -5 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);
         }
     }
@@ -511,7 +510,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;
     }
         
@@ -868,8 +869,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/UserStorage/Pdo.php

Indentation -2 removed lines

@@ -30,13 +30,11 @@
     notificationtype varchar(10),
     notificationaddress varchar(64)
 );
-
  *
  * In version 3.0 the format of the tmpblocktimestamp was changed from a datetime format to an integer.
  * Because it holds a unix timestamp a 64-bit (8-byte) integer. To upgrade the user table to the new format use:
 
 ALTER TABLE user MODIFY tmpblocktimestamp BIGINT;
-
  */
 
 use Psr\Log\LoggerInterface;

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