Tiqr / tiqr-server-libphp

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

library/tiqr/Tiqr/StateStorage/Memcache.php

Spacing +3 added lines, -3 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.
@@ -103,7 +103,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');
@@ -157,7 +157,7 @@ 
         if ($result === false) {
             // Memcache interface does not provide error information, either the key does not exists 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;

library/tiqr/Tiqr/StateStorage/Pdo.php

Indentation -1 removed lines

@@ -21,7 +21,6 @@
  * 
  * 
  * Create SQL table (MySQL):
-
  * CREATE TABLE IF NOT EXISTS tiqrstate (
     key varchar(255) PRIMARY KEY,
     expire BIGINT,

Spacing +10 added lines, -10 removed lines

@@ -77,7 +77,7 @@ 
             throw new InvalidArgumentException('Empty key not allowed');
         }
         try {
-            $sth = $this->handle->prepare('SELECT `key` FROM ' . $this->tablename . ' WHERE `key` = ?');
+            $sth = $this->handle->prepare('SELECT `key` FROM '.$this->tablename.' WHERE `key` = ?');
             $sth->execute(array($key));
             return $sth->fetchColumn() !== false;
         }
@@ -97,9 +97,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 %i expired keys", $deletedRows)
             );
@@ -115,12 +115,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();
         }
         if ($this->keyExists($key)) {
@@ -130,7 +130,7 @@ 
         }
         // $expire == 0 means never expire
         if ($expire != 0) {
-            $expire+=time();    // Store unix timestamp after which the expires
+            $expire += time(); // Store unix timestamp after which the expires
         }
         try {
             $sth->execute(array(serialize($value), $expire, $key));
@@ -153,7 +153,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) {
@@ -183,7 +183,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) {
@@ -197,9 +197,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));
         }

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.php

Spacing +1 added lines, -1 removed lines

@@ -39,7 +39,7 @@
      * @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)
+    public static function getOcraService(string $type = "tiqr", array $options = array(), LoggerInterface $logger)
     {
         switch ($type) {
             case "tiqr":

library/tiqr/Tiqr/UserStorage.php

Spacing +1 added lines, -1 removed lines

@@ -41,7 +41,7 @@
      *
      * @throws Exception An exception if an unknown user storage is requested.
      */
-    public static function getStorage(string $type="file", array $options=array(), LoggerInterface $logger): Tiqr_UserStorage_Interface
+    public static function getStorage(string $type = "file", array $options = array(), LoggerInterface $logger): Tiqr_UserStorage_Interface
     {
         switch ($type) {
             case "file":

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

Spacing +1 added lines, -1 removed lines

@@ -1,6 +1,6 @@
 <?php
 
-require_once __DIR__ . '/../OATH/OCRA.php';
+require_once __DIR__.'/../OATH/OCRA.php';
 
 /**
  * This file is part of the tiqr project.

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