Tiqr / tiqr-server-libphp

library/tiqr/Tiqr/StateStorage/Abstract.php

Spacing +1 added lines, -1 removed lines

@@ -60,7 +60,7 @@
      * a state storage instance of a certain type.
      * @param array $options An array of options for the state storage
      */
-    public function __construct($options=array(), LoggerInterface $logger)
+    public function __construct($options = array(), LoggerInterface $logger)
     {
         $this->logger = $logger;
         $this->_options = $options;

library/tiqr/Tiqr/AutoLoader.php

Indentation +96 added lines, -96 removed lines

@@ -1,102 +1,102 @@
 <?php
 class Tiqr_AutoLoader {
 
-	protected static $instance;
-
-	protected $tiqrPath;
-	protected $qrcodePath;
-	protected $zendPath;
-
-	protected function __construct($options) {
-		if ($options !== NULL) {
-			$this->setOptions($options);
-		}
-		spl_autoload_register(array(__CLASS__, 'autoload'));
-	}
-
-	public static function getInstance($options = NULL) {
-		if (null === self::$instance) {
-			self::$instance = new self($options);
-		}
-
-		return self::$instance;
-	}
-
-	public static function autoload($className) {
-		if($className === NULL) {
-			return;
-		}
-
-		$self = self::getInstance();
-
-		$substr5 = substr($className, 0, 5);
-
-		if ($substr5 === 'Tiqr_' || $substr5 === 'OATH_') {
-			$file = $self->tiqrPath . DIRECTORY_SEPARATOR . str_replace('_', DIRECTORY_SEPARATOR, $className) . '.php';
-		} elseif ($className === 'QRcode') {
-			$file = $self->qrcodePath . DIRECTORY_SEPARATOR . 'qrlib.php';
-		} elseif ($substr5 === 'Zend_') {
-			$file = $self->zendPath . DIRECTORY_SEPARATOR . str_replace('_', DIRECTORY_SEPARATOR, $className) . '.php';
+    protected static $instance;
+
+    protected $tiqrPath;
+    protected $qrcodePath;
+    protected $zendPath;
+
+    protected function __construct($options) {
+        if ($options !== NULL) {
+            $this->setOptions($options);
+        }
+        spl_autoload_register(array(__CLASS__, 'autoload'));
+    }
+
+    public static function getInstance($options = NULL) {
+        if (null === self::$instance) {
+            self::$instance = new self($options);
+        }
+
+        return self::$instance;
+    }
+
+    public static function autoload($className) {
+        if($className === NULL) {
+            return;
+        }
+
+        $self = self::getInstance();
+
+        $substr5 = substr($className, 0, 5);
+
+        if ($substr5 === 'Tiqr_' || $substr5 === 'OATH_') {
+            $file = $self->tiqrPath . DIRECTORY_SEPARATOR . str_replace('_', DIRECTORY_SEPARATOR, $className) . '.php';
+        } elseif ($className === 'QRcode') {
+            $file = $self->qrcodePath . DIRECTORY_SEPARATOR . 'qrlib.php';
+        } elseif ($substr5 === 'Zend_') {
+            $file = $self->zendPath . DIRECTORY_SEPARATOR . str_replace('_', DIRECTORY_SEPARATOR, $className) . '.php';
         } elseif ($className === 'ReadWriteException') {
             $file = $self->tiqrPath . DIRECTORY_SEPARATOR . 'Tiqr/Exception/ReadWriteException.php';
-		} else {
-			return;
-		}
-
-		if (file_exists($file)) {
-			require_once($file);
-		}
-	}
-
-	public function setOptions($options) {
-		if (isset($options["tiqr.path"])) {
-			$tiqr_dir = $options["tiqr.path"];
-			$tiqr_path = realpath($tiqr_dir);
-		} else {
-			$tiqr_dir = dirname(__FILE__);
-			$tiqr_path = $tiqr_dir;
-		}
-		if (is_dir($tiqr_path)) {
-			$this->tiqrPath = $tiqr_path;
-		} else {
-			throw new Exception('Directory not found: ' . var_export($tiqr_dir, TRUE));
-		}
-
-		if (isset($options["phpqrcode.path"])) {
-			$qrcode_dir = $options["phpqrcode.path"];
-			$qrcode_path = realpath($qrcode_dir);
-		} else {
-			$qrcode_dir = dirname(dirname(dirname(__FILE__))) . '/phpqrcode';
-			$qrcode_path = $qrcode_dir;
-		}
-
-		if (is_dir($qrcode_path)) {
-			$this->qrcodePath = $qrcode_path;
-		} else {
-			throw new Exception('Directory not found: ' . var_export($qrcode_dir, TRUE));
-		}
-
-		if (isset($options["zend.path"])) {
-			$zend_dir = $options["zend.path"];
-			$zend_path = realpath($zend_dir);
-		} else {
-			$zend_dir = dirname(dirname(dirname(__FILE__))) . "/zend";
-			$zend_path = $zend_dir;
-		}
-		if (is_dir($zend_path)) {
-			$this->zendPath = $zend_path;
-		} else {
-			throw new Exception('Directory not found: ' . var_export($zend_dir, TRUE));
-		}
-	}
-
-
-	public function setIncludePath() {
-		set_include_path(implode(PATH_SEPARATOR, array(
-			$this->tiqrPath,
-			$this->zendPath,
-			$this->qrcodePath,
-			get_include_path(),
-		)));
-	}
+        } else {
+            return;
+        }
+
+        if (file_exists($file)) {
+            require_once($file);
+        }
+    }
+
+    public function setOptions($options) {
+        if (isset($options["tiqr.path"])) {
+            $tiqr_dir = $options["tiqr.path"];
+            $tiqr_path = realpath($tiqr_dir);
+        } else {
+            $tiqr_dir = dirname(__FILE__);
+            $tiqr_path = $tiqr_dir;
+        }
+        if (is_dir($tiqr_path)) {
+            $this->tiqrPath = $tiqr_path;
+        } else {
+            throw new Exception('Directory not found: ' . var_export($tiqr_dir, TRUE));
+        }
+
+        if (isset($options["phpqrcode.path"])) {
+            $qrcode_dir = $options["phpqrcode.path"];
+            $qrcode_path = realpath($qrcode_dir);
+        } else {
+            $qrcode_dir = dirname(dirname(dirname(__FILE__))) . '/phpqrcode';
+            $qrcode_path = $qrcode_dir;
+        }
+
+        if (is_dir($qrcode_path)) {
+            $this->qrcodePath = $qrcode_path;
+        } else {
+            throw new Exception('Directory not found: ' . var_export($qrcode_dir, TRUE));
+        }
+
+        if (isset($options["zend.path"])) {
+            $zend_dir = $options["zend.path"];
+            $zend_path = realpath($zend_dir);
+        } else {
+            $zend_dir = dirname(dirname(dirname(__FILE__))) . "/zend";
+            $zend_path = $zend_dir;
+        }
+        if (is_dir($zend_path)) {
+            $this->zendPath = $zend_path;
+        } else {
+            throw new Exception('Directory not found: ' . var_export($zend_dir, TRUE));
+        }
+    }
+
+
+    public function setIncludePath() {
+        set_include_path(implode(PATH_SEPARATOR, array(
+            $this->tiqrPath,
+            $this->zendPath,
+            $this->qrcodePath,
+            get_include_path(),
+        )));
+    }
 }

Spacing +10 added lines, -10 removed lines

@@ -23,7 +23,7 @@ 
 	}
 
 	public static function autoload($className) {
-		if($className === NULL) {
+		if ($className === NULL) {
 			return;
 		}
 
@@ -32,13 +32,13 @@ 
 		$substr5 = substr($className, 0, 5);
 
 		if ($substr5 === 'Tiqr_' || $substr5 === 'OATH_') {
-			$file = $self->tiqrPath . DIRECTORY_SEPARATOR . str_replace('_', DIRECTORY_SEPARATOR, $className) . '.php';
+			$file = $self->tiqrPath.DIRECTORY_SEPARATOR.str_replace('_', DIRECTORY_SEPARATOR, $className).'.php';
 		} elseif ($className === 'QRcode') {
-			$file = $self->qrcodePath . DIRECTORY_SEPARATOR . 'qrlib.php';
+			$file = $self->qrcodePath.DIRECTORY_SEPARATOR.'qrlib.php';
 		} elseif ($substr5 === 'Zend_') {
-			$file = $self->zendPath . DIRECTORY_SEPARATOR . str_replace('_', DIRECTORY_SEPARATOR, $className) . '.php';
+			$file = $self->zendPath.DIRECTORY_SEPARATOR.str_replace('_', DIRECTORY_SEPARATOR, $className).'.php';
         } elseif ($className === 'ReadWriteException') {
-            $file = $self->tiqrPath . DIRECTORY_SEPARATOR . 'Tiqr/Exception/ReadWriteException.php';
+            $file = $self->tiqrPath.DIRECTORY_SEPARATOR.'Tiqr/Exception/ReadWriteException.php';
 		} else {
 			return;
 		}
@@ -59,34 +59,34 @@ 
 		if (is_dir($tiqr_path)) {
 			$this->tiqrPath = $tiqr_path;
 		} else {
-			throw new Exception('Directory not found: ' . var_export($tiqr_dir, TRUE));
+			throw new Exception('Directory not found: '.var_export($tiqr_dir, TRUE));
 		}
 
 		if (isset($options["phpqrcode.path"])) {
 			$qrcode_dir = $options["phpqrcode.path"];
 			$qrcode_path = realpath($qrcode_dir);
 		} else {
-			$qrcode_dir = dirname(dirname(dirname(__FILE__))) . '/phpqrcode';
+			$qrcode_dir = dirname(dirname(dirname(__FILE__))).'/phpqrcode';
 			$qrcode_path = $qrcode_dir;
 		}
 
 		if (is_dir($qrcode_path)) {
 			$this->qrcodePath = $qrcode_path;
 		} else {
-			throw new Exception('Directory not found: ' . var_export($qrcode_dir, TRUE));
+			throw new Exception('Directory not found: '.var_export($qrcode_dir, TRUE));
 		}
 
 		if (isset($options["zend.path"])) {
 			$zend_dir = $options["zend.path"];
 			$zend_path = realpath($zend_dir);
 		} else {
-			$zend_dir = dirname(dirname(dirname(__FILE__))) . "/zend";
+			$zend_dir = dirname(dirname(dirname(__FILE__)))."/zend";
 			$zend_path = $zend_dir;
 		}
 		if (is_dir($zend_path)) {
 			$this->zendPath = $zend_path;
 		} else {
-			throw new Exception('Directory not found: ' . var_export($zend_dir, TRUE));
+			throw new Exception('Directory not found: '.var_export($zend_dir, TRUE));
 		}
 	}
 

library/tiqr/Tiqr/OATH/OCRA.php

Indentation +11 added lines, -11 removed lines

@@ -36,11 +36,11 @@ 
      */
     private static function _hmac(string $crypto, string $keyBytes, string $text) : string
     {
-         $hash = hash_hmac($crypto, $text, $keyBytes);
-         if (false === $hash) {
-             throw new Exception("calculating hash_hmac failed");
-         }
-         return $hash;
+            $hash = hash_hmac($crypto, $text, $keyBytes);
+            if (false === $hash) {
+                throw new Exception("calculating hash_hmac failed");
+            }
+            return $hash;
     }
 
     /**
@@ -99,12 +99,12 @@ 
      * alternative to "-S064"
      */
     static function generateOCRA(string $ocraSuite,
-                                 string $key,
-                                 string $counter,
-                                 string $question,
-                                 string $password,
-                                 string $sessionInformation,
-                                 string $timeStamp) : string
+                                    string $key,
+                                    string $counter,
+                                    string $question,
+                                    string $password,
+                                    string $sessionInformation,
+                                    string $timeStamp) : string
     {
         $codeDigits = 0;
         $crypto = "";

Spacing +73 added lines, -73 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");
         }
@@ -122,72 +122,72 @@ 
         $cryptoFunction = $components[1];
         $dataInput = strtolower($components[2]); // lower here so we can do case insensitive comparisons
         
-        if(stripos($cryptoFunction, "sha1")!==false)
+        if (stripos($cryptoFunction, "sha1") !== false)
             $crypto = "sha1";
-        if(stripos($cryptoFunction, "sha256")!==false)
+        if (stripos($cryptoFunction, "sha256") !== false)
             $crypto = "sha256";
-        if(stripos($cryptoFunction, "sha512")!==false)
+        if (stripos($cryptoFunction, "sha512") !== false)
             $crypto = "sha512";
         
-        $codeDigits = substr($cryptoFunction, strrpos($cryptoFunction, "-")+1);
+        $codeDigits = substr($cryptoFunction, strrpos($cryptoFunction, "-") + 1);
                 
         // 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.
 
@@ -196,27 +196,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];
         }
         
@@ -225,9 +225,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];
             }
         }
@@ -235,41 +235,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);
 
@@ -291,23 +291,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;

Braces +42 added lines, -28 removed lines

@@ -122,12 +122,15 @@ 
         $cryptoFunction = $components[1];
         $dataInput = strtolower($components[2]); // lower here so we can do case insensitive comparisons
         
-        if(stripos($cryptoFunction, "sha1")!==false)
-            $crypto = "sha1";
-        if(stripos($cryptoFunction, "sha256")!==false)
-            $crypto = "sha256";
-        if(stripos($cryptoFunction, "sha512")!==false)
-            $crypto = "sha512";
+        if(stripos($cryptoFunction, "sha1")!==false) {
+                    $crypto = "sha1";
+        }
+        if(stripos($cryptoFunction, "sha256")!==false) {
+                    $crypto = "sha256";
+        }
+        if(stripos($cryptoFunction, "sha512")!==false) {
+                    $crypto = "sha512";
+        }
         
         $codeDigits = substr($cryptoFunction, strrpos($cryptoFunction, "-")+1);
                 
@@ -135,56 +138,65 @@ 
         // Counter
         if($dataInput[0] == "c" ) {
             // Fix the length of the HEX string
-            while(strlen($counter) < 16)
-                $counter = "0" . $counter;
+            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";
+            while(strlen($question) < 256) {
+                            $question = $question . "0";
+            }
             $questionLength=128;
         }
 
         // Password
         if(stripos($dataInput, "psha1")!==false) {
-            while(strlen($password) < 40)
-                $password = "0" . $password;
+            while(strlen($password) < 40) {
+                            $password = "0" . $password;
+            }
             $passwordLength=20;
         }
     
         if(stripos($dataInput, "psha256")!==false) {
-            while(strlen($password) < 64)
-                $password = "0" . $password;
+            while(strlen($password) < 64) {
+                            $password = "0" . $password;
+            }
             $passwordLength=32;
         }
         
         if(stripos($dataInput, "psha512")!==false) {
-            while(strlen($password) < 128)
-                $password = "0" . $password;
+            while(strlen($password) < 128) {
+                            $password = "0" . $password;
+            }
             $passwordLength=64;
         }
         
         // sessionInformation
         if(stripos($dataInput, "s064") !==false) {
-            while(strlen($sessionInformation) < 128)
-                $sessionInformation = "0" . $sessionInformation;
+            while(strlen($sessionInformation) < 128) {
+                            $sessionInformation = "0" . $sessionInformation;
+            }
 
             $sessionInformationLength=64;
         } else if(stripos($dataInput, "s128") !==false) {
-            while(strlen($sessionInformation) < 256)
-                $sessionInformation = "0" . $sessionInformation;
+            while(strlen($sessionInformation) < 256) {
+                            $sessionInformation = "0" . $sessionInformation;
+            }
         
             $sessionInformationLength=128;
         } else if(stripos($dataInput, "s256") !==false) {
-            while(strlen($sessionInformation) < 512)
-                $sessionInformation = "0" . $sessionInformation;
+            while(strlen($sessionInformation) < 512) {
+                            $sessionInformation = "0" . $sessionInformation;
+            }
         
             $sessionInformationLength=256;
         } else if(stripos($dataInput, "s512") !==false) {
-            while(strlen($sessionInformation) < 128)
-                $sessionInformation = "0" . $sessionInformation;
+            while(strlen($sessionInformation) < 128) {
+                            $sessionInformation = "0" . $sessionInformation;
+            }
         
             $sessionInformationLength=64;
         } else if (stripos($dataInput, "-s") !== false ) {
@@ -196,8 +208,9 @@ 
             // 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;
         }
@@ -207,8 +220,9 @@ 
         // TimeStamp
         if($dataInput[0] == "t" ||
                 stripos($dataInput, "-t") !== false) {
-            while(strlen($timeStamp) < 16)
-                $timeStamp = "0" . $timeStamp;
+            while(strlen($timeStamp) < 16) {
+                            $timeStamp = "0" . $timeStamp;
+            }
             $timeStampLength=8;
         }
 

library/tiqr/Tiqr/UserSecretStorage/File.php

Spacing +1 added lines, -1 removed lines

@@ -79,7 +79,7 @@
      */
     private 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 +5 added lines, -5 removed lines

@@ -83,7 +83,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());
         }
@@ -103,9 +103,9 @@ 
     private 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));
@@ -141,9 +141,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));
         }

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/OATH/OCRAParser.php

Indentation +201 added lines, -201 removed lines

@@ -4,32 +4,32 @@ 
 
 class OATH_OCRAParser {
 
-	private $OCRASuite = NULL;
+    private $OCRASuite = NULL;
 
-	private $OCRAVersion = NULL;
+    private $OCRAVersion = NULL;
 
-	private $CryptoFunctionType = NULL;
-	private $CryptoFunctionHash = NULL;
-	private $CryptoFunctionHashLength = NULL;
-	private $CryptoFunctionTruncation = NULL;
+    private $CryptoFunctionType = NULL;
+    private $CryptoFunctionHash = NULL;
+    private $CryptoFunctionHashLength = NULL;
+    private $CryptoFunctionTruncation = NULL;
 
-	private $C = FALSE;
-	private $Q = FALSE;
-	private $QType = 'N';
-	private $QLength = 8;
+    private $C = FALSE;
+    private $Q = FALSE;
+    private $QType = 'N';
+    private $QLength = 8;
 
-	private $P = FALSE;
-	private $PType = 'SHA1';
-	private $PLength = 20;
+    private $P = FALSE;
+    private $PType = 'SHA1';
+    private $PLength = 20;
 
-	private $S = FALSE;
-	private $SLength = 64;
+    private $S = FALSE;
+    private $SLength = 64;
 
-	private $T = FALSE;
-	private $TLength = 60; // 1M
-	private $TPeriods = array('H' => 3600, 'M' => 60, 'S' => 1);
+    private $T = FALSE;
+    private $TLength = 60; // 1M
+    private $TPeriods = array('H' => 3600, 'M' => 60, 'S' => 1);
 
-	private $supportedHashFunctions = array('SHA1' => 20, 'SHA256' => 32, 'SHA512' => 64);
+    private $supportedHashFunctions = array('SHA1' => 20, 'SHA256' => 32, 'SHA512' => 64);
 
 
     /**
@@ -37,149 +37,149 @@ 
      * @throws Exception
      */
     public function __construct(String $ocraSuite) {
-		$this->parseOCRASuite($ocraSuite);
-	}
+        $this->parseOCRASuite($ocraSuite);
+    }
 
-	/**
-	 * Inspired by https://github.com/bdauvergne/python-oath
+    /**
+     * Inspired by https://github.com/bdauvergne/python-oath
      *
      * @throws Exception
-	 */
-	private function parseOCRASuite($ocraSuite) {
-		if (!is_string($ocraSuite)) {
-			throw new Exception('OCRASuite not in string format: ' . var_export($ocraSuite, TRUE));
-		}
-
-		$ocraSuite = strtoupper($ocraSuite);
-		$this->OCRASuite = $ocraSuite;
-
-		$s = explode(':', $ocraSuite);
-		if (count($s) != 3) {
-			throw new Exception('Invalid OCRASuite format: ' . var_export($ocraSuite, TRUE));
-		}
-
-		$algo = explode('-', $s[0]);
-		if (count($algo) != 2) {
-			throw new Exception('Invalid OCRA version: ' . var_export($s[0], TRUE));
-		}
-
-		if ($algo[0] !== 'OCRA') {
-			throw new Exception('Unsupported OCRA algorithm: ' . var_export($algo[0], TRUE));
-		}
-
-		if ($algo[1] !== '1') {
-			throw new Exception('Unsupported OCRA version: ' . var_export($algo[1], TRUE));
-		}
-		$this->OCRAVersion = $algo[1];
-
-		$cf = explode('-', $s[1]);
-		if (count($cf) != 3) {
-			throw new Exception('Invalid OCRA suite crypto function: ' . var_export($s[1], TRUE));
-		}
-
-		if ($cf[0] !== 'HOTP') {
-			throw new Exception('Unsupported OCRA suite crypto function: ' . var_export($cf[0], TRUE));
-		}
-		$this->CryptoFunctionType = $cf[0];
-
-		if (!array_key_exists($cf[1], $this->supportedHashFunctions)) {
-			throw new Exception('Unsupported hash function in OCRA suite crypto function: ' . var_export($cf[1], TRUE));
-		}
-		$this->CryptoFunctionHash = $cf[1];
-		$this->CryptoFunctionHashLength = $this->supportedHashFunctions[$cf[1]];
-
-		if (!preg_match('/^\d+$/', $cf[2]) || (($cf[2] < 4 || $cf[2] > 10) && $cf[2] != 0)) {
-			throw new Exception('Invalid OCRA suite crypto function truncation length: ' . var_export($cf[2], TRUE));
-		}
-		$this->CryptoFunctionTruncation = intval($cf[2]);
-
-		$di = explode('-', $s[2]);
-		if (count($cf) == 0) {
-			throw new Exception('Invalid OCRA suite data input: ' . var_export($s[2], TRUE));
-		}
-
-		$data_input = array();
-		foreach($di as $elem) {
-			$letter = $elem[0];
-			if (array_key_exists($letter, $data_input)) {
-				throw new Exception('Duplicate field in OCRA suite data input: ' . var_export($elem, TRUE));
-			}
-			$data_input[$letter] = 1;
-
-			if ($letter === 'C' && strlen($elem) == 1) {
-				$this->C = TRUE;
-			} elseif ($letter === 'Q') {
-				if (strlen($elem) == 1) {
-					$this->Q = TRUE;
-				} elseif (preg_match('/^Q([AHN])(\d+)$/', $elem, $match)) {
-					$q_len = intval($match[2]);
-					if ($q_len < 4 || $q_len > 64) {
-						throw new Exception('Invalid OCRA suite data input question length: ' . var_export($q_len, TRUE));
-					}
-					$this->Q = TRUE;
-					$this->QType = $match[1];
-					$this->QLength = $q_len;
-				} else {
-					throw new Exception('Invalid OCRA suite data input question: ' . var_export($elem, TRUE));
-				}
-			} elseif ($letter === 'P') {
-				if (strlen($elem) == 1) {
-					$this->P = TRUE;
-				} else {
-					$p_algo = substr($elem, 1);
-					if (!array_key_exists($p_algo, $this->supportedHashFunctions)) {
-						throw new Exception('Unsupported OCRA suite PIN hash function: ' . var_export($elem, TRUE));
-					}
-					$this->P = TRUE;
-					$this->PType = $p_algo;
-					$this->PLength = $this->supportedHashFunctions[$p_algo];
-				}
-			} elseif ($letter === 'S') {
-				if (strlen($elem) == 1) {
-					$this->S = TRUE;
-				} elseif (preg_match('/^S(\d+)$/', $elem, $match)) {
-					$s_len = intval($match[1]);
-					if ($s_len <= 0 || $s_len > 512) {
-						throw new Exception('Invalid OCRA suite data input session information length: ' . var_export($s_len, TRUE));
-					}
-
-					$this->S = TRUE;
-					$this->SLength = $s_len;
-				} else {
-					throw new Exception('Invalid OCRA suite data input session information length: ' . var_export($elem, TRUE));
-				}
-			} elseif ($letter === 'T') {
-				if (strlen($elem) == 1) {
-					$this->T = TRUE;
-				} elseif (preg_match('/^T(\d+[HMS])+$/', $elem)) {
-					preg_match_all('/(\d+)([HMS])/', $elem, $match);
-
-					if (count($match[1]) !== count(array_unique($match[2]))) {
-						throw new Exception('Duplicate definitions in OCRA suite data input timestamp: ' . var_export($elem, TRUE));
-					}
-
-					$length = 0;
-					for ($i = 0; $i < count($match[1]); $i++) {
-						$length += intval($match[1][$i]) * $this->TPeriods[$match[2][$i]];
-					}
-					if ($length <= 0) {
-						throw new Exception('Invalid OCRA suite data input timestamp: ' . var_export($elem, TRUE));
-					}
-
-					$this->T = TRUE;
-					$this->TLength = $length;
-				} else {
-					throw new Exception('Invalid OCRA suite data input timestamp: ' . var_export($elem, TRUE));
-				}
-			} else {
-				throw new Exception('Unsupported OCRA suite data input field: ' . var_export($elem, TRUE));
-			}
-		}
-
-		if (!$this->Q) {
-			throw new Exception('OCRA suite data input question not defined: ' . var_export($s[2], TRUE));
-		}
-	}
+     */
+    private function parseOCRASuite($ocraSuite) {
+        if (!is_string($ocraSuite)) {
+            throw new Exception('OCRASuite not in string format: ' . var_export($ocraSuite, TRUE));
+        }
+
+        $ocraSuite = strtoupper($ocraSuite);
+        $this->OCRASuite = $ocraSuite;
+
+        $s = explode(':', $ocraSuite);
+        if (count($s) != 3) {
+            throw new Exception('Invalid OCRASuite format: ' . var_export($ocraSuite, TRUE));
+        }
+
+        $algo = explode('-', $s[0]);
+        if (count($algo) != 2) {
+            throw new Exception('Invalid OCRA version: ' . var_export($s[0], TRUE));
+        }
+
+        if ($algo[0] !== 'OCRA') {
+            throw new Exception('Unsupported OCRA algorithm: ' . var_export($algo[0], TRUE));
+        }
+
+        if ($algo[1] !== '1') {
+            throw new Exception('Unsupported OCRA version: ' . var_export($algo[1], TRUE));
+        }
+        $this->OCRAVersion = $algo[1];
+
+        $cf = explode('-', $s[1]);
+        if (count($cf) != 3) {
+            throw new Exception('Invalid OCRA suite crypto function: ' . var_export($s[1], TRUE));
+        }
+
+        if ($cf[0] !== 'HOTP') {
+            throw new Exception('Unsupported OCRA suite crypto function: ' . var_export($cf[0], TRUE));
+        }
+        $this->CryptoFunctionType = $cf[0];
+
+        if (!array_key_exists($cf[1], $this->supportedHashFunctions)) {
+            throw new Exception('Unsupported hash function in OCRA suite crypto function: ' . var_export($cf[1], TRUE));
+        }
+        $this->CryptoFunctionHash = $cf[1];
+        $this->CryptoFunctionHashLength = $this->supportedHashFunctions[$cf[1]];
+
+        if (!preg_match('/^\d+$/', $cf[2]) || (($cf[2] < 4 || $cf[2] > 10) && $cf[2] != 0)) {
+            throw new Exception('Invalid OCRA suite crypto function truncation length: ' . var_export($cf[2], TRUE));
+        }
+        $this->CryptoFunctionTruncation = intval($cf[2]);
+
+        $di = explode('-', $s[2]);
+        if (count($cf) == 0) {
+            throw new Exception('Invalid OCRA suite data input: ' . var_export($s[2], TRUE));
+        }
+
+        $data_input = array();
+        foreach($di as $elem) {
+            $letter = $elem[0];
+            if (array_key_exists($letter, $data_input)) {
+                throw new Exception('Duplicate field in OCRA suite data input: ' . var_export($elem, TRUE));
+            }
+            $data_input[$letter] = 1;
+
+            if ($letter === 'C' && strlen($elem) == 1) {
+                $this->C = TRUE;
+            } elseif ($letter === 'Q') {
+                if (strlen($elem) == 1) {
+                    $this->Q = TRUE;
+                } elseif (preg_match('/^Q([AHN])(\d+)$/', $elem, $match)) {
+                    $q_len = intval($match[2]);
+                    if ($q_len < 4 || $q_len > 64) {
+                        throw new Exception('Invalid OCRA suite data input question length: ' . var_export($q_len, TRUE));
+                    }
+                    $this->Q = TRUE;
+                    $this->QType = $match[1];
+                    $this->QLength = $q_len;
+                } else {
+                    throw new Exception('Invalid OCRA suite data input question: ' . var_export($elem, TRUE));
+                }
+            } elseif ($letter === 'P') {
+                if (strlen($elem) == 1) {
+                    $this->P = TRUE;
+                } else {
+                    $p_algo = substr($elem, 1);
+                    if (!array_key_exists($p_algo, $this->supportedHashFunctions)) {
+                        throw new Exception('Unsupported OCRA suite PIN hash function: ' . var_export($elem, TRUE));
+                    }
+                    $this->P = TRUE;
+                    $this->PType = $p_algo;
+                    $this->PLength = $this->supportedHashFunctions[$p_algo];
+                }
+            } elseif ($letter === 'S') {
+                if (strlen($elem) == 1) {
+                    $this->S = TRUE;
+                } elseif (preg_match('/^S(\d+)$/', $elem, $match)) {
+                    $s_len = intval($match[1]);
+                    if ($s_len <= 0 || $s_len > 512) {
+                        throw new Exception('Invalid OCRA suite data input session information length: ' . var_export($s_len, TRUE));
+                    }
+
+                    $this->S = TRUE;
+                    $this->SLength = $s_len;
+                } else {
+                    throw new Exception('Invalid OCRA suite data input session information length: ' . var_export($elem, TRUE));
+                }
+            } elseif ($letter === 'T') {
+                if (strlen($elem) == 1) {
+                    $this->T = TRUE;
+                } elseif (preg_match('/^T(\d+[HMS])+$/', $elem)) {
+                    preg_match_all('/(\d+)([HMS])/', $elem, $match);
+
+                    if (count($match[1]) !== count(array_unique($match[2]))) {
+                        throw new Exception('Duplicate definitions in OCRA suite data input timestamp: ' . var_export($elem, TRUE));
+                    }
+
+                    $length = 0;
+                    for ($i = 0; $i < count($match[1]); $i++) {
+                        $length += intval($match[1][$i]) * $this->TPeriods[$match[2][$i]];
+                    }
+                    if ($length <= 0) {
+                        throw new Exception('Invalid OCRA suite data input timestamp: ' . var_export($elem, TRUE));
+                    }
+
+                    $this->T = TRUE;
+                    $this->TLength = $length;
+                } else {
+                    throw new Exception('Invalid OCRA suite data input timestamp: ' . var_export($elem, TRUE));
+                }
+            } else {
+                throw new Exception('Unsupported OCRA suite data input field: ' . var_export($elem, TRUE));
+            }
+        }
+
+        if (!$this->Q) {
+            throw new Exception('OCRA suite data input question not defined: ' . var_export($s[2], TRUE));
+        }
+    }
 
     /** Generate an OCRA challenge question according to the ocra suite specified in the constructor
      * @return The randomly generated OCRA question
@@ -192,50 +192,50 @@ 
      * Note that the question string is the exact question string a specified in the OCRA strandard (RFC 6287)
      * The challenge is not yet hex encoded as expected by OCRA::generateOCRA()
      */
-	public function generateChallenge() : String {
-		$q_length = $this->QLength;
-		$q_type = $this->QType;
+    public function generateChallenge() : String {
+        $q_length = $this->QLength;
+        $q_type = $this->QType;
 
         $bytes = Tiqr_Random::randomBytes($q_length);
 
-		switch($q_type) {
-			case 'A':
-				$challenge = base64_encode($bytes);
-				$tr = implode("", unpack('H*', $bytes));
-				$challenge = rtrim(strtr($challenge, '+/', $tr), '=');
-				break;
-			case 'H':
-				$challenge = implode("", unpack('H*', $bytes));
-				break;
-			case 'N':
-				$challenge = implode("", unpack('N*', $bytes));
-				break;
-			default:
-				throw new Exception('Unsupported OCRASuite challenge type: ' . var_export($q_type, TRUE));
-				break;
-		}
-
-		$challenge = substr($challenge, 0, $q_length);
-
-		return $challenge;
-	}
-
-
-	/**
-	 * Constant time string comparison, see http://codahale.com/a-lesson-in-timing-attacks/
-	 */
-	public static function constEqual(string $s1, string $s2): bool {
-		if (strlen($s1) != strlen($s2)) {
-			return FALSE;
-		}
-
-		$result = TRUE;
-		$length = strlen($s1);
-		for ($i = 0; $i < $length; $i++) {
-			$result &= ($s1[$i] == $s2[$i]);
-		}
-
-		return (boolean)$result;
-	}
+        switch($q_type) {
+            case 'A':
+                $challenge = base64_encode($bytes);
+                $tr = implode("", unpack('H*', $bytes));
+                $challenge = rtrim(strtr($challenge, '+/', $tr), '=');
+                break;
+            case 'H':
+                $challenge = implode("", unpack('H*', $bytes));
+                break;
+            case 'N':
+                $challenge = implode("", unpack('N*', $bytes));
+                break;
+            default:
+                throw new Exception('Unsupported OCRASuite challenge type: ' . var_export($q_type, TRUE));
+                break;
+        }
+
+        $challenge = substr($challenge, 0, $q_length);
+
+        return $challenge;
+    }
+
+
+    /**
+     * Constant time string comparison, see http://codahale.com/a-lesson-in-timing-attacks/
+     */
+    public static function constEqual(string $s1, string $s2): bool {
+        if (strlen($s1) != strlen($s2)) {
+            return FALSE;
+        }
+
+        $result = TRUE;
+        $length = strlen($s1);
+        for ($i = 0; $i < $length; $i++) {
+            $result &= ($s1[$i] == $s2[$i]);
+        }
+
+        return (boolean)$result;
+    }
 
 }

Spacing +26 added lines, -26 removed lines

@@ -1,6 +1,6 @@ 
 <?php
 
-require_once(__DIR__ . "/../Random.php");
+require_once(__DIR__."/../Random.php");
 
 class OATH_OCRAParser {
 
@@ -47,7 +47,7 @@ 
 	 */
 	private function parseOCRASuite($ocraSuite) {
 		if (!is_string($ocraSuite)) {
-			throw new Exception('OCRASuite not in string format: ' . var_export($ocraSuite, TRUE));
+			throw new Exception('OCRASuite not in string format: '.var_export($ocraSuite, TRUE));
 		}
 
 		$ocraSuite = strtoupper($ocraSuite);
@@ -55,54 +55,54 @@ 
 
 		$s = explode(':', $ocraSuite);
 		if (count($s) != 3) {
-			throw new Exception('Invalid OCRASuite format: ' . var_export($ocraSuite, TRUE));
+			throw new Exception('Invalid OCRASuite format: '.var_export($ocraSuite, TRUE));
 		}
 
 		$algo = explode('-', $s[0]);
 		if (count($algo) != 2) {
-			throw new Exception('Invalid OCRA version: ' . var_export($s[0], TRUE));
+			throw new Exception('Invalid OCRA version: '.var_export($s[0], TRUE));
 		}
 
 		if ($algo[0] !== 'OCRA') {
-			throw new Exception('Unsupported OCRA algorithm: ' . var_export($algo[0], TRUE));
+			throw new Exception('Unsupported OCRA algorithm: '.var_export($algo[0], TRUE));
 		}
 
 		if ($algo[1] !== '1') {
-			throw new Exception('Unsupported OCRA version: ' . var_export($algo[1], TRUE));
+			throw new Exception('Unsupported OCRA version: '.var_export($algo[1], TRUE));
 		}
 		$this->OCRAVersion = $algo[1];
 
 		$cf = explode('-', $s[1]);
 		if (count($cf) != 3) {
-			throw new Exception('Invalid OCRA suite crypto function: ' . var_export($s[1], TRUE));
+			throw new Exception('Invalid OCRA suite crypto function: '.var_export($s[1], TRUE));
 		}
 
 		if ($cf[0] !== 'HOTP') {
-			throw new Exception('Unsupported OCRA suite crypto function: ' . var_export($cf[0], TRUE));
+			throw new Exception('Unsupported OCRA suite crypto function: '.var_export($cf[0], TRUE));
 		}
 		$this->CryptoFunctionType = $cf[0];
 
 		if (!array_key_exists($cf[1], $this->supportedHashFunctions)) {
-			throw new Exception('Unsupported hash function in OCRA suite crypto function: ' . var_export($cf[1], TRUE));
+			throw new Exception('Unsupported hash function in OCRA suite crypto function: '.var_export($cf[1], TRUE));
 		}
 		$this->CryptoFunctionHash = $cf[1];
 		$this->CryptoFunctionHashLength = $this->supportedHashFunctions[$cf[1]];
 
 		if (!preg_match('/^\d+$/', $cf[2]) || (($cf[2] < 4 || $cf[2] > 10) && $cf[2] != 0)) {
-			throw new Exception('Invalid OCRA suite crypto function truncation length: ' . var_export($cf[2], TRUE));
+			throw new Exception('Invalid OCRA suite crypto function truncation length: '.var_export($cf[2], TRUE));
 		}
 		$this->CryptoFunctionTruncation = intval($cf[2]);
 
 		$di = explode('-', $s[2]);
 		if (count($cf) == 0) {
-			throw new Exception('Invalid OCRA suite data input: ' . var_export($s[2], TRUE));
+			throw new Exception('Invalid OCRA suite data input: '.var_export($s[2], TRUE));
 		}
 
 		$data_input = array();
-		foreach($di as $elem) {
+		foreach ($di as $elem) {
 			$letter = $elem[0];
 			if (array_key_exists($letter, $data_input)) {
-				throw new Exception('Duplicate field in OCRA suite data input: ' . var_export($elem, TRUE));
+				throw new Exception('Duplicate field in OCRA suite data input: '.var_export($elem, TRUE));
 			}
 			$data_input[$letter] = 1;
 
@@ -114,13 +114,13 @@ 
 				} elseif (preg_match('/^Q([AHN])(\d+)$/', $elem, $match)) {
 					$q_len = intval($match[2]);
 					if ($q_len < 4 || $q_len > 64) {
-						throw new Exception('Invalid OCRA suite data input question length: ' . var_export($q_len, TRUE));
+						throw new Exception('Invalid OCRA suite data input question length: '.var_export($q_len, TRUE));
 					}
 					$this->Q = TRUE;
 					$this->QType = $match[1];
 					$this->QLength = $q_len;
 				} else {
-					throw new Exception('Invalid OCRA suite data input question: ' . var_export($elem, TRUE));
+					throw new Exception('Invalid OCRA suite data input question: '.var_export($elem, TRUE));
 				}
 			} elseif ($letter === 'P') {
 				if (strlen($elem) == 1) {
@@ -128,7 +128,7 @@ 
 				} else {
 					$p_algo = substr($elem, 1);
 					if (!array_key_exists($p_algo, $this->supportedHashFunctions)) {
-						throw new Exception('Unsupported OCRA suite PIN hash function: ' . var_export($elem, TRUE));
+						throw new Exception('Unsupported OCRA suite PIN hash function: '.var_export($elem, TRUE));
 					}
 					$this->P = TRUE;
 					$this->PType = $p_algo;
@@ -140,13 +140,13 @@ 
 				} elseif (preg_match('/^S(\d+)$/', $elem, $match)) {
 					$s_len = intval($match[1]);
 					if ($s_len <= 0 || $s_len > 512) {
-						throw new Exception('Invalid OCRA suite data input session information length: ' . var_export($s_len, TRUE));
+						throw new Exception('Invalid OCRA suite data input session information length: '.var_export($s_len, TRUE));
 					}
 
 					$this->S = TRUE;
 					$this->SLength = $s_len;
 				} else {
-					throw new Exception('Invalid OCRA suite data input session information length: ' . var_export($elem, TRUE));
+					throw new Exception('Invalid OCRA suite data input session information length: '.var_export($elem, TRUE));
 				}
 			} elseif ($letter === 'T') {
 				if (strlen($elem) == 1) {
@@ -155,7 +155,7 @@ 
 					preg_match_all('/(\d+)([HMS])/', $elem, $match);
 
 					if (count($match[1]) !== count(array_unique($match[2]))) {
-						throw new Exception('Duplicate definitions in OCRA suite data input timestamp: ' . var_export($elem, TRUE));
+						throw new Exception('Duplicate definitions in OCRA suite data input timestamp: '.var_export($elem, TRUE));
 					}
 
 					$length = 0;
@@ -163,21 +163,21 @@ 
 						$length += intval($match[1][$i]) * $this->TPeriods[$match[2][$i]];
 					}
 					if ($length <= 0) {
-						throw new Exception('Invalid OCRA suite data input timestamp: ' . var_export($elem, TRUE));
+						throw new Exception('Invalid OCRA suite data input timestamp: '.var_export($elem, TRUE));
 					}
 
 					$this->T = TRUE;
 					$this->TLength = $length;
 				} else {
-					throw new Exception('Invalid OCRA suite data input timestamp: ' . var_export($elem, TRUE));
+					throw new Exception('Invalid OCRA suite data input timestamp: '.var_export($elem, TRUE));
 				}
 			} else {
-				throw new Exception('Unsupported OCRA suite data input field: ' . var_export($elem, TRUE));
+				throw new Exception('Unsupported OCRA suite data input field: '.var_export($elem, TRUE));
 			}
 		}
 
 		if (!$this->Q) {
-			throw new Exception('OCRA suite data input question not defined: ' . var_export($s[2], TRUE));
+			throw new Exception('OCRA suite data input question not defined: '.var_export($s[2], TRUE));
 		}
 	}
 
@@ -198,7 +198,7 @@ 
 
         $bytes = Tiqr_Random::randomBytes($q_length);
 
-		switch($q_type) {
+		switch ($q_type) {
 			case 'A':
 				$challenge = base64_encode($bytes);
 				$tr = implode("", unpack('H*', $bytes));
@@ -211,7 +211,7 @@ 
 				$challenge = implode("", unpack('N*', $bytes));
 				break;
 			default:
-				throw new Exception('Unsupported OCRASuite challenge type: ' . var_export($q_type, TRUE));
+				throw new Exception('Unsupported OCRASuite challenge type: '.var_export($q_type, TRUE));
 				break;
 		}
 
@@ -235,7 +235,7 @@ 
 			$result &= ($s1[$i] == $s2[$i]);
 		}
 
-		return (boolean)$result;
+		return (boolean) $result;
 	}
 
 }

library/tiqr/Tiqr/DeviceStorage/Abstract.php

Spacing +1 added lines, -1 removed lines

@@ -59,7 +59,7 @@
      * @param array $options The options
      * @param LoggerInterface $logger
      */
-    public function __construct(array $options=array(), LoggerInterface $logger)
+    public function __construct(array $options = array(), LoggerInterface $logger)
     {
         $this->_options = $options;
         $this->logger = $logger;

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

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

Spacing +1 added lines, -1 removed lines

@@ -40,7 +40,7 @@
      *
      * @return Tiqr_UserSecretStorage_Encryption_Interface
      */
-    public static function getEncryption(LoggerInterface $logger, string $type="dummy", array $options=array()): Tiqr_UserSecretStorage_Encryption_Interface
+    public static function getEncryption(LoggerInterface $logger, string $type = "dummy", array $options = array()): Tiqr_UserSecretStorage_Encryption_Interface
     {
         $logger->info(sprintf('Using %s as UserStorage encryption type', $type));
         switch ($type) {