Tiqr / tiqr-server-libphp

library/tiqr/Tiqr/StateStorage/Pdo.php

Spacing +9 added lines, -9 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));
         }

library/tiqr/Tiqr/UserSecretStorage/UserSecretStorageTrait.php

Spacing +3 added lines, -3 removed lines

@@ -54,13 +54,13 @@ 
         if ($prefix === $this->encryption->get_type()) {
             // Decrypt the secret if it is prefixed with the current encryption type
             // Remove the encryption type prefix before decrypting
-           return $this->encryption->decrypt( substr($encryptedSecret, $pos+1) );
+           return $this->encryption->decrypt(substr($encryptedSecret, $pos + 1));
         }
 
         // Check the decryption array for the encryption type to see if there is an encryption
         // instance defined for it. If so, use that to decrypt the secret.
         if (isset($this->decryption[$prefix])) {
-            return $this->decryption[$prefix]->decrypt( substr($encryptedSecret, $pos+1) );
+            return $this->decryption[$prefix]->decrypt(substr($encryptedSecret, $pos + 1));
         }
 
         $this->logger->error("Secret for user '$userId' is encrypted with unsupported encryption type '$prefix'");
@@ -77,6 +77,6 @@ 
     {
         $encryptedSecret = $this->encryption->encrypt($secret);
         // Prefix the user secret with the encryption type
-        $this->setUserSecret($userId, $this->encryption->get_type() . ':' . $encryptedSecret);
+        $this->setUserSecret($userId, $this->encryption->get_type().':'.$encryptedSecret);
     }
 }

library/tiqr/Tiqr/UserSecretStorage/Encryption.php

Spacing +1 added lines, -1 removed lines

@@ -38,7 +38,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
     {
         $instance = null;
         $logger->info(sprintf('Using "%s" as UserSecretStorage encryption type', $type));

library/tiqr/Tiqr/UserSecretStorage/Encryption/OpenSSL.php

Spacing +22 added lines, -22 removed lines

@@ -48,22 +48,22 @@ 
     */
 
     private $_supportedCiphers = [
-        'aes-128-cbc' => [ 'tag' => false, 'key' => 16 ],
-        'aes-128-gcm' => [ 'tag' => true, 'key' => 16 ],
-        'aes-192-cbc' => [ 'tag' => false, 'key' => 24 ],
-        'aes-192-gcm' => [ 'tag' => true, 'key' => 24 ],
-        'aes-256-cbc' => [ 'tag' => false, 'key' => 32 ],
-        'aes-256-gcm' => [ 'tag' => true, 'key' => 32 ],
-        'chacha20' => [ 'tag' => false, 'key' => 32 ],
-        'camellia-128-cbc' => [ 'tag' => false, 'key' => 16 ],
-        'camellia-192-cbc' => [ 'tag' => false, 'key' => 24 ],
-        'camellia-256-cbc' => [ 'tag' => false, 'key' => 32 ],
-        'aria-128-cbc' => [ 'tag' => false, 'key' => 16 ],
-        'aria-128-gcm' => [ 'tag' => true, 'key' => 16 ],
-        'aria-192-cbc' => [ 'tag' => false, 'key' => 24 ],
-        'aria-192-gcm' => [ 'tag' => true, 'key' => 24 ],
-        'aria-256-cbc' => [ 'tag' => false, 'key' => 32 ],
-        'aria-256-gcm' => [ 'tag' => true, 'key' => 32 ],
+        'aes-128-cbc' => ['tag' => false, 'key' => 16],
+        'aes-128-gcm' => ['tag' => true, 'key' => 16],
+        'aes-192-cbc' => ['tag' => false, 'key' => 24],
+        'aes-192-gcm' => ['tag' => true, 'key' => 24],
+        'aes-256-cbc' => ['tag' => false, 'key' => 32],
+        'aes-256-gcm' => ['tag' => true, 'key' => 32],
+        'chacha20' => ['tag' => false, 'key' => 32],
+        'camellia-128-cbc' => ['tag' => false, 'key' => 16],
+        'camellia-192-cbc' => ['tag' => false, 'key' => 24],
+        'camellia-256-cbc' => ['tag' => false, 'key' => 32],
+        'aria-128-cbc' => ['tag' => false, 'key' => 16],
+        'aria-128-gcm' => ['tag' => true, 'key' => 16],
+        'aria-192-cbc' => ['tag' => false, 'key' => 24],
+        'aria-192-gcm' => ['tag' => true, 'key' => 24],
+        'aria-256-cbc' => ['tag' => false, 'key' => 32],
+        'aria-256-gcm' => ['tag' => true, 'key' => 32],
     ];
 
     /**
@@ -136,12 +136,12 @@ 
         // A longer key is not a problem, but could indicate a configuration error
         $key_length = $this->_supportedCiphers[$this->_cipher]['key'];
         if (strlen($key) != $key_length) {
-            throw new RuntimeException("Invalid length of key with key_id '{$this->_key_id}' used with cipher '{$this->_cipher}', expected {$key_length} bytes, got " . strlen($key) . " bytes");
+            throw new RuntimeException("Invalid length of key with key_id '{$this->_key_id}' used with cipher '{$this->_cipher}', expected {$key_length} bytes, got ".strlen($key)." bytes");
         }
 
         // openssl_encrypt returns the ciphertext as a base64 encoded string, so we don't need to encode it again
         // The tag is returned as a binary string, but only if the cipher requires a tag
-        $tag='';
+        $tag = '';
         if ($this->_supportedCiphers[$this->_cipher]['tag']) {
             $encrypted = openssl_encrypt($data, $this->_cipher, $key, 0, $iv, $tag, '', 16);
         } else {
@@ -153,7 +153,7 @@ 
         $tag = $this->_supportedCiphers[$this->_cipher]['tag'] ? $tag : '';
         // Return the encoded ciphertext, including the IV, tag and cipher
         // <cipher>:<key_id>:iv<>:<tag>:<ciphertext>
-        $encoded = $this->_cipher . ":" . $this->_key_id . ":" . base64_encode($iv) . ":" . base64_encode($tag) . ":" . $encrypted;
+        $encoded = $this->_cipher.":".$this->_key_id.":".base64_encode($iv).":".base64_encode($tag).":".$encrypted;
 
         return $encoded;
     }
@@ -192,19 +192,19 @@ 
         }
 
         // IV
-        $iv = base64_decode($split_data[2],true);
+        $iv = base64_decode($split_data[2], true);
         if ($iv === false) {
             throw new RuntimeException("Error decoding IV");
         }
 
         // Tag
-        $tag = base64_decode($split_data[3],true);
+        $tag = base64_decode($split_data[3], true);
         if ($tag === false) {
             throw new RuntimeException("Error decoding tag");
         }
         $ciphertext = $split_data[4];
 
-        $plaintext=openssl_decrypt($ciphertext, $cipher, $key, 0, $iv, $tag);
+        $plaintext = openssl_decrypt($ciphertext, $cipher, $key, 0, $iv, $tag);
         if ($plaintext === false) {
             throw new RuntimeException("Error decrypting data");
         }

library/tiqr/Tiqr/DeviceStorage/TokenExchange.php

Spacing +3 added lines, -3 removed lines

@@ -40,7 +40,7 @@ 
     {
         $url = $this->_options["url"]."?appId=".$this->_options["appid"];
         
-        $url.= "&notificationToken=".$notificationToken;
+        $url .= "&notificationToken=".$notificationToken;
 
         $ch = curl_init();
 
@@ -53,12 +53,12 @@ 
         $output = curl_exec($ch);
         curl_close($ch);
 
-        if (stripos($output, "not found")!==false) {
+        if (stripos($output, "not found") !== false) {
             $this->logger->error('Token Exchange failed and responded with: not found', ['full output' => $output]);
             return false;
         }
 
-        if (stripos($output, "error")!==false) {
+        if (stripos($output, "error") !== false) {
             $this->logger->error('Token Exchange failed and responded with: error', ['full output' => $output]);
             return false;
         }

library/tiqr/Tiqr/Message/FCM.php

Spacing +9 added lines, -9 removed lines

@@ -49,7 +49,7 @@ 
     /**
      * @throws Tiqr_Message_Exception_SendFailure
      */
-    private function getGoogleAccessToken($credentialsFile, $cacheTokens, $tokenCacheDir )
+    private function getGoogleAccessToken($credentialsFile, $cacheTokens, $tokenCacheDir)
     {
         $client = new Google_Client();
         $client->setLogger($this->logger);
@@ -61,8 +61,8 @@ 
             $pool = new FilesystemCachePool($filesystem);
 
             //set up a callback to log token refresh
-            $logger=$this->logger;
-            $tokenCallback = function ($cacheKey, $accessToken) use ($logger) {
+            $logger = $this->logger;
+            $tokenCallback = function($cacheKey, $accessToken) use ($logger) {
                 $logger->info(sprintf('New access token received at cache key %s', $cacheKey));
             };
             $client->setTokenCallback($tokenCallback);
@@ -94,9 +94,9 @@ 
      * @param  $retry           boolean is this a 2nd attempt
      * @throws Tiqr_Message_Exception_SendFailure
      */
-    private function _sendFirebase(string $deviceToken, string $alert, string $challenge, string $projectId, string $credentialsFile, bool $cacheTokens, string $tokenCacheDir, bool $retry=false)
+    private function _sendFirebase(string $deviceToken, string $alert, string $challenge, string $projectId, string $credentialsFile, bool $cacheTokens, string $tokenCacheDir, bool $retry = false)
     {
-        $apiurl = sprintf('https://fcm.googleapis.com/v1/projects/%s/messages:send',$projectId);
+        $apiurl = sprintf('https://fcm.googleapis.com/v1/projects/%s/messages:send', $projectId);
 
         $fields = [
             'message' => [
@@ -113,7 +113,7 @@ 
 
         try {
             $headers = array(
-                'Authorization: Bearer ' . $this->getGoogleAccessToken($credentialsFile, $cacheTokens, $tokenCacheDir),
+                'Authorization: Bearer '.$this->getGoogleAccessToken($credentialsFile, $cacheTokens, $tokenCacheDir),
                 'Content-Type: application/json',
             );
         } catch (\Google\Exception $e) {
@@ -137,13 +137,13 @@ 
         }
 
         if (!empty($errors)) {
-            throw new Tiqr_Message_Exception_SendFailure("Http error occurred: ". $errors, true);
+            throw new Tiqr_Message_Exception_SendFailure("Http error occurred: ".$errors, true);
         }
 
         // Wait and retry once in case of a 502 Bad Gateway error
         if ($statusCode === 502 && !($retry)) {
             sleep(2);
-            $this->_sendFirebase($deviceToken, $alert, $challenge, $projectId, $credentialsFile,  $cacheTokens,  $tokenCacheDir, true);
+            $this->_sendFirebase($deviceToken, $alert, $challenge, $projectId, $credentialsFile, $cacheTokens, $tokenCacheDir, true);
             return;
         }
 
@@ -154,7 +154,7 @@ 
         // handle errors, ignoring registration_id's
         $response = json_decode($result, true);
         foreach ($response as $k => $v) {
-            if ($k=="error") {
+            if ($k == "error") {
                 throw new Tiqr_Message_Exception_SendFailure(sprintf("Error in FCM response: %s", $result), true);
             }
         }

library/tiqr/Tiqr/OATH/OCRA.php

Spacing +75 added lines, -75 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");
         }
@@ -125,83 +125,83 @@ 
         $cryptoFunction = $components[1];
         $dataInput = strtolower($components[2]); // lower here so we can do case insensitive comparisons
 
-        if(stripos($cryptoFunction, "hotp-sha1")!==false)
+        if (stripos($cryptoFunction, "hotp-sha1") !== false)
             $crypto = "sha1";
-        elseif(stripos($cryptoFunction, "hotp-sha256")!==false)
+        elseif (stripos($cryptoFunction, "hotp-sha256") !== false)
             $crypto = "sha256";
-        elseif(stripos($cryptoFunction, "hotp-sha512")!==false)
+        elseif (stripos($cryptoFunction, "hotp-sha512") !== false)
             $crypto = "sha512";
         else {
             throw new InvalidArgumentException('Unsupported OCRA CryptoFunction');
         }
 
         // The Cryptofucntion must ha a truncation of 0, 4-10
-        $codeDigits_str = substr($cryptoFunction, strrpos($cryptoFunction, "-")+1);
-        if (! ctype_digit($codeDigits_str)) {
+        $codeDigits_str = substr($cryptoFunction, strrpos($cryptoFunction, "-") + 1);
+        if (!ctype_digit($codeDigits_str)) {
             throw new InvalidArgumentException('Unsupported OCRA CryptoFunction');
         }
-        $codeDigits = (integer)$codeDigits_str;
+        $codeDigits = (integer) $codeDigits_str;
         if (($codeDigits != 0) && (($codeDigits < 4) || ($codeDigits > 10))) {
             throw new InvalidArgumentException('Unsupported OCRA CryptoFunction');
         }
                 
         // 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.
 
@@ -210,27 +210,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];
         }
         
@@ -239,9 +239,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];
             }
         }
@@ -249,41 +249,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);
 
@@ -308,23 +308,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;

library/tiqr/Tiqr/Message/APNS2.php

Spacing +19 added lines, -19 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,7 +47,7 @@ 
             );
         }
 
-        $cert=openssl_x509_parse( $cert_file_contents );
+        $cert = openssl_x509_parse($cert_file_contents);
         if (false === $cert) {
             throw new RuntimeException('Error parsing APNS client certificate');
         }
@@ -72,42 +72,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) {
@@ -115,9 +115,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(