codemasher / php-threema

src/CLIRunner.php

Unused Use Statements +1 added lines, -1 removed lines

@@ -12,9 +12,9 @@
 
 namespace chillerlan\Threema;
 
-use chillerlan\Threema\Crypto\CryptoInterface;
 use ReflectionClass;
 use ReflectionMethod;
+use chillerlan\Threema\Crypto\CryptoInterface;
 
 /**
  * 

Spacing +13 added lines, -13 removed lines

@@ -102,7 +102,7 @@ 
 				return $this->log2cli($method->invokeArgs($this, $arguments));
 			}
 			catch(GatewayException $gatewayException){
-				return $this->log2cli('ERROR: '.$gatewayException->getMessage());
+				return $this->log2cli('ERROR: ' . $gatewayException->getMessage());
 			}
 		}
 
@@ -117,7 +117,7 @@ 
 	 * @return string
 	 */
 	protected function log2cli(string $string):string{
-		return PHP_EOL.wordwrap($string, 78, PHP_EOL).PHP_EOL;
+		return PHP_EOL . wordwrap($string, 78, PHP_EOL) . PHP_EOL;
 	}
 
 	/**
@@ -145,8 +145,8 @@ 
 	 */
 	public function help():string{
 		// return info in case no command was found
-		$help  = 'Threema Gateway CLI tool.'.PHP_EOL;
-		$help .= 'Crypto: '.$this->threemaGateway->cryptoVersion().PHP_EOL.PHP_EOL;
+		$help  = 'Threema Gateway CLI tool.' . PHP_EOL;
+		$help .= 'Crypto: ' . $this->threemaGateway->cryptoVersion() . PHP_EOL . PHP_EOL;
 
 		foreach(self::COMMANDS as $command => $method){
 			$comment = $this->reflection->getMethod($method)->getDocComment();
@@ -164,10 +164,10 @@ 
 					if(isset($p[1])){
 						if($p[0] === 'param'){
 							$p = (explode(' ', trim($p[1]), 3));
-							$paramNames[] = '<'.trim($p[1], ' $').'>';
-							$d =  trim($p[1]);
+							$paramNames[] = '<' . trim($p[1], ' $') . '>';
+							$d = trim($p[1]);
 #							$d .= ' ('.trim($p[0]).'): ';
-							$d .= isset($p[2]) ? ': '.trim($p[2]) : '';
+							$d .= isset($p[2]) ? ': ' . trim($p[2]) : '';
 							$paramDoc[] = $d;
 						}
 						else if($p[0] === 'return'){
@@ -180,11 +180,11 @@ 
 				}
 			}
 
-			$help .= PHP_EOL.'threema.php '.$command.' '.implode(' ', $paramNames).PHP_EOL;
-			$help .= str_repeat('-', strlen($command)+12).PHP_EOL;
-			$help .= PHP_EOL.$comment.PHP_EOL;
-			$help .= PHP_EOL.implode(PHP_EOL, $paramDoc).PHP_EOL;
-			$help .= PHP_EOL.'Returns: '.$returnDoc.PHP_EOL;
+			$help .= PHP_EOL . 'threema.php ' . $command . ' ' . implode(' ', $paramNames) . PHP_EOL;
+			$help .= str_repeat('-', strlen($command) + 12) . PHP_EOL;
+			$help .= PHP_EOL . $comment . PHP_EOL;
+			$help .= PHP_EOL . implode(PHP_EOL, $paramDoc) . PHP_EOL;
+			$help .= PHP_EOL . 'Returns: ' . $returnDoc . PHP_EOL;
 		}
 
 		return $help;
@@ -197,7 +197,7 @@ 
 	public function getKeypair(string $privateKeyFile = null, string $publicKeyFile = null):string{
 		$keypair = $this->cryptoInterface->getKeypair();
 
-		return 'private:'.$keypair->privateKey.PHP_EOL.'public:'.$keypair->publicKey;
+		return 'private:' . $keypair->privateKey . PHP_EOL . 'public:' . $keypair->publicKey;
 	}
 
 	/**

src/Crypto/CryptoSodium.php

Spacing +2 added lines, -2 removed lines

@@ -21,7 +21,7 @@ 
 
 	public function version():string{
 		/** @noinspection PhpUndefinedNamespaceInspection @noinspection PhpUndefinedFunctionInspection */
-		return 'libsodium '.\Sodium\version_string();
+		return 'libsodium ' . \Sodium\version_string();
 	}
 
 	/**
@@ -77,7 +77,7 @@ 
 			throw new CryptoException('invalid data');
 		}
 
-		if(!preg_match('/^[a-f\d]{128}$/i', $privateKey.$publicKey)){
+		if(!preg_match('/^[a-f\d]{128}$/i', $privateKey . $publicKey)){
 			throw new CryptoException('invalid keypair');
 		}
 

src/Gateway.php

Spacing +2 added lines, -2 removed lines

@@ -72,7 +72,7 @@ 
 		$reflectionClass = new ReflectionClass($gatewayOptions->gatewayInterface);
 
 		if(!$reflectionClass->implementsInterface(GatewayInterface::class)){
-			throw new GatewayException('"'.$gatewayOptions->gatewayInterface.'" does not implement GatewayInterface');
+			throw new GatewayException('"' . $gatewayOptions->gatewayInterface . '" does not implement GatewayInterface');
 		}
 
 		$this->gatewayInterface = $reflectionClass->newInstanceArgs([$cryptoInterface, $gatewayOptions]);
@@ -93,7 +93,7 @@ 
 			return $reflectionMethod->invokeArgs($this->gatewayInterface, $params);
 		}
 
-		throw new GatewayException('method "'.$method.'" does not exist');
+		throw new GatewayException('method "' . $method . '" does not exist');
 	}
 
 	#######################

src/GatewayEndpoint.php

Spacing +8 added lines, -8 removed lines

@@ -65,7 +65,7 @@ 
 	 * @throws \chillerlan\TinyCurl\RequestException
 	 */
 	protected function getResponse(string $endpoint, array $params = [], array $body = []):Response{
-		$endpoint = self::API_BASE.$endpoint;
+		$endpoint = self::API_BASE . $endpoint;
 		$params   = array_merge($params, [
 			'from'   => getenv('THREEMA_GATEWAY_ID'),
 			'secret' => getenv('THREEMA_GATEWAY_SECRET')
@@ -81,7 +81,7 @@ 
 			return $response;
 		}
 		elseif(array_key_exists($response->info->http_code, self::API_ERRORS)){
-			throw new GatewayException('gateway error: '.self::API_ERRORS[$response->info->http_code]);
+			throw new GatewayException('gateway error: ' . self::API_ERRORS[$response->info->http_code]);
 		}
 
 		throw new GatewayException('unknown error: "compiles on my machine."'); // @codeCoverageIgnore
@@ -98,7 +98,7 @@ 
 	 * @inheritdoc
 	 */
 	public function checkCapabilities(string $threemaID):array{
-		$response = $this->getResponse('/capabilities/'.$this->checkThreemaID($threemaID))->body->content;
+		$response = $this->getResponse('/capabilities/' . $this->checkThreemaID($threemaID))->body->content;
 		$response = !empty($response) ? explode(',', $response) : [];
 
 		sort($response);
@@ -110,35 +110,35 @@ 
 	 * @inheritdoc
 	 */
 	public function getIdByPhone(string $phoneno):string{
-		return $this->getResponse('/lookup/phone/'.$this->checkPhoneNo($phoneno))->body->content;
+		return $this->getResponse('/lookup/phone/' . $this->checkPhoneNo($phoneno))->body->content;
 	}
 
 	/**
 	 * @inheritdoc
 	 */
 	public function getIdByPhoneHash(string $phonenoHash):string{
-		return $this->getResponse('/lookup/phone_hash/'.$this->checkHash($phonenoHash))->body->content;
+		return $this->getResponse('/lookup/phone_hash/' . $this->checkHash($phonenoHash))->body->content;
 	}
 
 	/**
 	 * @inheritdoc
 	 */
 	public function getIdByEmail(string $email):string{
-		return $this->getResponse('/lookup/email/'.$this->checkEmail($email))->body->content;
+		return $this->getResponse('/lookup/email/' . $this->checkEmail($email))->body->content;
 	}
 
 	/**
 	 * @inheritdoc
 	 */
 	public function getIdByEmailHash(string $emailHash):string{
-		return $this->getResponse('/lookup/email_hash/'.$this->checkHash($emailHash))->body->content;
+		return $this->getResponse('/lookup/email_hash/' . $this->checkHash($emailHash))->body->content;
 	}
 
 	/**
 	 * @inheritdoc
 	 */
 	public function getPublicKey(string $threemaID):string{
-		return $this->checkHash($this->getResponse('/pubkeys/'.$this->checkThreemaID($threemaID))->body->content);
+		return $this->checkHash($this->getResponse('/pubkeys/' . $this->checkThreemaID($threemaID))->body->content);
 	}
 
 	/**

src/GatewayOptions.php

Spacing +3 added lines, -3 removed lines

@@ -25,7 +25,7 @@ 
 	/**
 	 * @var string
 	 */
-	public $configPath = __DIR__.'/../config';
+	public $configPath = __DIR__ . '/../config';
 
 	/**
 	 * @var string
@@ -35,7 +35,7 @@ 
 	/**
 	 * @var string
 	 */
-	public $storagePath = __DIR__.'/../storage';
+	public $storagePath = __DIR__ . '/../storage';
 
 	/**
 	 * full path to the CA Root Certificates for use with CURL/SSL
@@ -43,6 +43,6 @@ 
 	 *
 	 * @var string
 	 */
-	public $cacert = __DIR__.'/../storage/cacert.pem';
+	public $cacert = __DIR__ . '/../storage/cacert.pem';
 
 }

src/GatewayInterface.php

Indentation +9 added lines, -9 removed lines

@@ -1,14 +1,14 @@
 <?php
 /**
- * Interface GatewayInterface
- *
- * @filesource   GatewayInterface.php
- * @created      01.04.2016
- * @package      chillerlan\Threema
- * @author       Smiley <smiley@chillerlan.net>
- * @copyright    2016 Smiley
- * @license      MIT
- */
+	 * Interface GatewayInterface
+	 *
+	 * @filesource   GatewayInterface.php
+	 * @created      01.04.2016
+	 * @package      chillerlan\Threema
+	 * @author       Smiley <smiley@chillerlan.net>
+	 * @copyright    2016 Smiley
+	 * @license      MIT
+	 */
 
 namespace chillerlan\Threema;
 

src/GatewayException.php

Indentation +9 added lines, -9 removed lines

@@ -1,14 +1,14 @@
 <?php
 /**
- * Class GatewayException
- *
- * @filesource   GatewayException.php
- * @created      02.04.2016
- * @package      chillerlan\Threema
- * @author       Smiley <smiley@chillerlan.net>
- * @copyright    2016 Smiley
- * @license      MIT
- */
+	 * Class GatewayException
+	 *
+	 * @filesource   GatewayException.php
+	 * @created      02.04.2016
+	 * @package      chillerlan\Threema
+	 * @author       Smiley <smiley@chillerlan.net>
+	 * @copyright    2016 Smiley
+	 * @license      MIT
+	 */
 
 namespace chillerlan\Threema;
 

cli/threema.php

Indentation +6 added lines, -6 removed lines

@@ -1,11 +1,11 @@
 <?php
 /**
- * @filesource   threema.php
- * @created      02.04.2016
- * @author       Smiley <smiley@chillerlan.net>
- * @copyright    2016 Smiley
- * @license      MIT
- */
+	 * @filesource   threema.php
+	 * @created      02.04.2016
+	 * @author       Smiley <smiley@chillerlan.net>
+	 * @copyright    2016 Smiley
+	 * @license      MIT
+	 */
 
 namespace chillerlan\ThreemaCLI;
 

Spacing +4 added lines, -4 removed lines

@@ -9,7 +9,7 @@ 
 
 namespace chillerlan\ThreemaCLI;
 
-require_once __DIR__.'/../vendor/autoload.php';
+require_once __DIR__ . '/../vendor/autoload.php';
 
 use chillerlan\Threema\CLIRunner;
 use chillerlan\Threema\Crypto\CryptoSodium;
@@ -21,9 +21,9 @@ 
 
 $gatewayOptions                 = new GatewayOptions;
 $gatewayOptions->configFilename = '.threema'; // @todo TRAVIS REMINDER!
-$gatewayOptions->configPath     = __DIR__.'/../config';
-$gatewayOptions->storagePath    = __DIR__.'/../storage';
-$gatewayOptions->cacert         = __DIR__.'/../storage/cacert.pem';
+$gatewayOptions->configPath     = __DIR__ . '/../config';
+$gatewayOptions->storagePath    = __DIR__ . '/../storage';
+$gatewayOptions->cacert         = __DIR__ . '/../storage/cacert.pem';
 
 echo (new CLIRunner(new CryptoSodium, $gatewayOptions))->run($_SERVER['argv']);
 

public/callback.php

Indentation +53 added lines, -53 removed lines

@@ -1,58 +1,58 @@
 <?php
 /**
- *
- * @filesource   callback.php
- * @created      02.04.2016
- * @author       Smiley <smiley@chillerlan.net>
- * @copyright    2016 Smiley
- * @license      MIT
- *
- * @todo
- * 
- * Incoming messages and delivery receipts
- *
- * If your account is operating in end-to-end encrypted mode and incoming messages have been enabled on it, you can
- * specify an HTTPS URL callback that will be called whenever an incoming message or delivery receipt arrives for your
- * API identity. You can set or change the callback URL in the Threema Gateway administration panel.
- *
- * Callback parameters
- *
- * Your callback URL will be called with the following POST parameters (application/x-www-form-urlencoded):
- *
- * from sender identity (8 characters)
- * to your API identity (8 characters, usually starts with '*')
- * messageId message ID assigned by the sender (8 bytes, hex encoded)
- * date message date set by the sender (UNIX timestamp)
- * nonce nonce used for encryption (24 bytes, hex encoded)
- * box encrypted message data (max. 4000 bytes, hex encoded)
- * mac Message Authentication Code (32 bytes, hex encoded, see below)
- * Note that the message first needs to be decrypted before it can be determined whether it is an incoming text message
- * or a delivery receipt.
- *
- * MAC calculation
- *
- * For each callback, the server includes a mac parameter than can be used to verify the authenticity of the call and
- * the included information. This parameter is calculated as follows:
- *
- * mac = HMAC-SHA256(from || to || messageId || date || nonce || box, secret)
- *
- * || denotes concatenation. The parameters are concatenated in the same form as they were included in the POST (i.e.
- * including any hex encoding, but not including any URL encoding). The secret that is used for the HMAC operation is
- * the API authentication secret.
- *
- * It is recommended that receivers verify the mac parameter before attempting to parse the other parameters and
- * decrypt the message.
- *
- * Callback results and retry
- *
- * If the connection to your callback URL fails or your callback does not return an HTTP 200 status, the API will retry
- * 3 more times in intervals of 5 minutes. If all attempts fail, the message is discarded.
- *
- * Certificates and cipher suites
- *
- * The server that hosts the callback URL must use a valid and trusted SSL/TLS certificate (not self-signed). If in
- * doubt, please contact customer service and specify the issuing CA of your certificate.
- */
+	 *
+	 * @filesource   callback.php
+	 * @created      02.04.2016
+	 * @author       Smiley <smiley@chillerlan.net>
+	 * @copyright    2016 Smiley
+	 * @license      MIT
+	 *
+	 * @todo
+	 * 
+	 * Incoming messages and delivery receipts
+	 *
+	 * If your account is operating in end-to-end encrypted mode and incoming messages have been enabled on it, you can
+	 * specify an HTTPS URL callback that will be called whenever an incoming message or delivery receipt arrives for your
+	 * API identity. You can set or change the callback URL in the Threema Gateway administration panel.
+	 *
+	 * Callback parameters
+	 *
+	 * Your callback URL will be called with the following POST parameters (application/x-www-form-urlencoded):
+	 *
+	 * from sender identity (8 characters)
+	 * to your API identity (8 characters, usually starts with '*')
+	 * messageId message ID assigned by the sender (8 bytes, hex encoded)
+	 * date message date set by the sender (UNIX timestamp)
+	 * nonce nonce used for encryption (24 bytes, hex encoded)
+	 * box encrypted message data (max. 4000 bytes, hex encoded)
+	 * mac Message Authentication Code (32 bytes, hex encoded, see below)
+	 * Note that the message first needs to be decrypted before it can be determined whether it is an incoming text message
+	 * or a delivery receipt.
+	 *
+	 * MAC calculation
+	 *
+	 * For each callback, the server includes a mac parameter than can be used to verify the authenticity of the call and
+	 * the included information. This parameter is calculated as follows:
+	 *
+	 * mac = HMAC-SHA256(from || to || messageId || date || nonce || box, secret)
+	 *
+	 * || denotes concatenation. The parameters are concatenated in the same form as they were included in the POST (i.e.
+	 * including any hex encoding, but not including any URL encoding). The secret that is used for the HMAC operation is
+	 * the API authentication secret.
+	 *
+	 * It is recommended that receivers verify the mac parameter before attempting to parse the other parameters and
+	 * decrypt the message.
+	 *
+	 * Callback results and retry
+	 *
+	 * If the connection to your callback URL fails or your callback does not return an HTTP 200 status, the API will retry
+	 * 3 more times in intervals of 5 minutes. If all attempts fail, the message is discarded.
+	 *
+	 * Certificates and cipher suites
+	 *
+	 * The server that hosts the callback URL must use a valid and trusted SSL/TLS certificate (not self-signed). If in
+	 * doubt, please contact customer service and specify the issuing CA of your certificate.
+	 */