codemasher / php-threema

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

src/Crypto/CryptoAbstract.php

Indentation +9 added lines, -9 removed lines

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

src/CLIRunner.php

Indentation +9 added lines, -9 removed lines

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

Spacing +16 added lines, -16 removed lines

@@ -97,7 +97,7 @@ 
 				return $this->log2cli($method->invokeArgs($this, $arguments));
 			}
 			catch(GatewayException $gatewayException){
-				return $this->log2cli('ERROR: '.$gatewayException->getMessage());
+				return $this->log2cli('ERROR: ' . $gatewayException->getMessage());
 			}
 		}
 
@@ -112,7 +112,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;
 	}
 
 	/**
@@ -155,9 +155,9 @@ 
 			if(isset($p[1])){
 				if($p[0] === 'param'){
 					$p                    = (explode(' ', trim($p[1]), 3));
-					$name                 = '<'.trim($p[1], ' $').'>';
+					$name                 = '<' . trim($p[1], ' $') . '>';
 					$parsed->paramNames[] = $name;
-					$doc                  = isset($p[2]) ? $name.' '.trim($p[2]) : $name;
+					$doc                  = isset($p[2]) ? $name . ' ' . trim($p[2]) : $name;
 					$parsed->paramDoc[]   = $doc;
 				}
 				else if($p[0] === 'return'){
@@ -178,8 +178,8 @@ 
 	 */
 	public function help():string{
 		// return info in case no command was found
-		$help = 'Threema Gateway CLI tool.'.PHP_EOL;
-		$help .= 'Crypto: '.$this->cryptoInterface->version().PHP_EOL.PHP_EOL;
+		$help = 'Threema Gateway CLI tool.' . PHP_EOL;
+		$help .= 'Crypto: ' . $this->cryptoInterface->version() . PHP_EOL . PHP_EOL;
 
 		foreach(self::COMMANDS as $command => $method){
 			$comment = $this->reflection->getMethod($method)->getDocComment();
@@ -189,11 +189,11 @@ 
 			$comment = trim(array_shift($params));
 			$parsed  = $this->parseDocBlock($params);
 
-			$help .= PHP_EOL.'threema.php '.$command.' '.$parsed->paramNames.PHP_EOL;
-			$help .= str_repeat('-', strlen($command) + 12).PHP_EOL;
-			$help .= PHP_EOL.$comment.PHP_EOL;
-			$help .= PHP_EOL.$parsed->paramDoc.PHP_EOL;
-			$help .= PHP_EOL.'Returns: '.$parsed->returnDoc.PHP_EOL.PHP_EOL;
+			$help .= PHP_EOL . 'threema.php ' . $command . ' ' . $parsed->paramNames . PHP_EOL;
+			$help .= str_repeat('-', strlen($command) + 12) . PHP_EOL;
+			$help .= PHP_EOL . $comment . PHP_EOL;
+			$help .= PHP_EOL . $parsed->paramDoc . PHP_EOL;
+			$help .= PHP_EOL . 'Returns: ' . $parsed->returnDoc . PHP_EOL . PHP_EOL;
 		}
 
 		return $help;
@@ -209,10 +209,10 @@ 
 		// @todo: check writable
 		if(is_dir(dirname($path))){
 			$bytes = file_put_contents($path, $data);
-			return $bytes.' bytes written to: '.$path.PHP_EOL;
+			return $bytes . ' bytes written to: ' . $path . PHP_EOL;
 		}
 		// or is not writable
-		return $path.' does not exist'; // @codeCoverageIgnore
+		return $path . ' does not exist'; // @codeCoverageIgnore
 	}
 
 	/**
@@ -221,9 +221,9 @@ 
 	public function getKeypair(string $privateKeyFile = null, string $publicKeyFile = null):string{
 		$keypair  = $this->cryptoInterface->getKeypair();
 		$message  = !empty($privateKeyFile) ? $this->writeFile($privateKeyFile, $keypair->privateKey) : '';
-		$message .= !empty($publicKeyFile)  ? $this->writeFile($publicKeyFile, $keypair->publicKey)   : '';
+		$message .= !empty($publicKeyFile) ? $this->writeFile($publicKeyFile, $keypair->publicKey) : '';
 
-		return $message.PHP_EOL.'private:'.$keypair->privateKey.PHP_EOL.'public:'.$keypair->publicKey;
+		return $message . PHP_EOL . 'private:' . $keypair->privateKey . PHP_EOL . 'public:' . $keypair->publicKey;
 	}
 
 	/**
@@ -280,7 +280,7 @@ 
 	 */
 	public function encryptFile(string $privateKey, string $publicKey, string $plaintextFile, string $encryptedFile):string{
 		$encrypted = $this->cryptoInterface->encrypt(file_get_contents($plaintextFile), $privateKey, $publicKey);
-		return $this->writeFile($encryptedFile, $encrypted->nonce."\n".$encrypted->box);
+		return $this->writeFile($encryptedFile, $encrypted->nonce . "\n" . $encrypted->box);
 	}
 
 	/**

src/Endpoint/TinyCurlEndpoint.php

Doc Comments +1 added lines, -1 removed lines

@@ -198,7 +198,7 @@
 	}
 
 	/**
-	 * @param $email
+	 * @param string $email
 	 *
 	 * @return string
 	 * @throws \chillerlan\Threema\GatewayException

Indentation +9 added lines, -9 removed lines

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

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

cli/threema.php

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, Crypto\CryptoSodium, Endpoint\TinyCurlEndpoint, GatewayOptions
@@ -24,11 +24,11 @@ 
 
 $gatewayOptions                 = new GatewayOptions;
 $gatewayOptions->configFilename = '.threema'; // @todo TRAVIS REMINDER!
-$gatewayOptions->configPath     = __DIR__.'/../config';
-$gatewayOptions->storagePath    = __DIR__.'/../storage';
+$gatewayOptions->configPath     = __DIR__ . '/../config';
+$gatewayOptions->storagePath    = __DIR__ . '/../storage';
 
 $requestOptions          = new RequestOptions;
-$requestOptions->ca_info = __DIR__.'/../storage/cacert.pem'; // https://curl.haxx.se/ca/cacert.pem
+$requestOptions->ca_info = __DIR__ . '/../storage/cacert.pem'; // https://curl.haxx.se/ca/cacert.pem
 
 $CLIRunner = new CLIRunner(new TinyCurlEndpoint($gatewayOptions, new Request($requestOptions)), new CryptoSodium);
 

src/Gateway.php

Spacing +1 added lines, -1 removed lines

@@ -84,7 +84,7 @@
 			return $reflectionMethod->invokeArgs($this->endpointInterface, $params);
 		}
 
-		throw new GatewayException('method "'.$method.'" does not exist');
+		throw new GatewayException('method "' . $method . '" does not exist');
 	}
 
 	#######################

src/GatewayOptions.php

Spacing +2 added lines, -2 removed lines

@@ -20,7 +20,7 @@ 
 	/**
 	 * @var string
 	 */
-	public $configPath = __DIR__.'/../config';
+	public $configPath = __DIR__ . '/../config';
 
 	/**
 	 * @var string
@@ -30,6 +30,6 @@ 
 	/**
 	 * @var string
 	 */
-	public $storagePath = __DIR__.'/../storage';
+	public $storagePath = __DIR__ . '/../storage';
 
 }

public/gateway.php

Spacing +5 added lines, -5 removed lines

@@ -7,7 +7,7 @@ 
  * @license      MIT
  */
 
-require_once __DIR__.'/../vendor/autoload.php';
+require_once __DIR__ . '/../vendor/autoload.php';
 
 use chillerlan\Threema\{
 	Crypto\CryptoSodium, Endpoint\TinyCurlEndpoint, Gateway, GatewayOptions
@@ -18,11 +18,11 @@ 
 
 $gatewayOptions                 = new GatewayOptions;
 $gatewayOptions->configFilename = '.threema'; // @todo TRAVIS REMINDER!
-$gatewayOptions->configPath     = __DIR__.'/../config';
-$gatewayOptions->storagePath    = __DIR__.'/../storage';
+$gatewayOptions->configPath     = __DIR__ . '/../config';
+$gatewayOptions->storagePath    = __DIR__ . '/../storage';
 
 $requestOptions          = new RequestOptions;
-$requestOptions->ca_info = __DIR__.'/../storage/cacert.pem'; // https://curl.haxx.se/ca/cacert.pem
+$requestOptions->ca_info = __DIR__ . '/../storage/cacert.pem'; // https://curl.haxx.se/ca/cacert.pem
 
 $gateway = new Gateway(new TinyCurlEndpoint($gatewayOptions, new Request($requestOptions)), new CryptoSodium);
 
@@ -39,7 +39,7 @@ 
 }
 
 header('Content-type: application/json;charset=utf-8;');
-header('Last-Modified: '.date('r'));
+header('Last-Modified: ' . date('r'));
 header('Expires: Tue, 23 May 1989 13:37:23 GMT');
 header('Cache-Control: max-age=0, private, no-store, no-cache, must-revalidate, post-check=0, pre-check=0');
 header('Pragma: no-cache');