codemasher / php-threema

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)));
 $cryptoInterface = new CryptoSodium;
@@ -38,7 +38,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');

src/Endpoint/EndpointAbstract.php

Indentation +9 added lines, -9 removed lines

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

src/Endpoint/TinyCurlEndpoint.php

Spacing +8 added lines, -8 removed lines

@@ -48,7 +48,7 @@ 
 	 * @throws \chillerlan\Threema\Endpoint\EndpointException
 	 */
 	private function getResponse(string $endpoint, array $params = [], array $body = []):ResponseInterface{
-		$endpoint = self::API_BASE.$endpoint;
+		$endpoint = self::API_BASE . $endpoint;
 		$params   = array_merge($params, [
 			'from'   => getenv('THREEMA_GATEWAY_ID'),
 			'secret' => getenv('THREEMA_GATEWAY_SECRET')
@@ -65,7 +65,7 @@ 
 		}
 		// @codeCoverageIgnoreStart
 		elseif(array_key_exists($response->info->http_code, self::API_ERRORS)){
-			throw new EndpointException('gateway error: '.self::API_ERRORS[$response->info->http_code]);
+			throw new EndpointException('gateway error: ' . self::API_ERRORS[$response->info->http_code]);
 		}
 
 		throw new EndpointException('unknown error: "compiles on my machine."');
@@ -83,7 +83,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);
@@ -95,35 +95,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/CLIRunner.php

Spacing +17 added lines, -17 removed lines

@@ -104,7 +104,7 @@ 
 				return $this->log2cli($method->invokeArgs($this, $arguments));
 			}
 			catch(EndpointException $gatewayException){
-				return $this->log2cli('ERROR: '.$gatewayException->getMessage());
+				return $this->log2cli('ERROR: ' . $gatewayException->getMessage());
 			}
 		}
 
@@ -119,7 +119,7 @@ 
 	 * @return string
 	 */
 	private 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;
 	}
 
 	/** @noinspection PhpUnusedPrivateMethodInspection
@@ -175,13 +175,13 @@ 
 	 * @param array      $tag
 	 * @param \stdClass &$out
 	 */
-	private function parseDocTag(array $tag, stdClass &$out){
+	private function parseDocTag(array $tag, stdClass & $out){
 		switch($tag[0]){
 			case 'param':
 				$tag               = (explode(' ', trim($tag[1]), 3));
-				$name              = '<'.trim($tag[1], ' $').'>';
+				$name              = '<' . trim($tag[1], ' $') . '>';
 				$out->paramNames[] = $name;
-				$out->paramDoc[]   = isset($tag[2]) ? $name.' '.trim($tag[2]) : $name;
+				$out->paramDoc[]   = isset($tag[2]) ? $name . ' ' . trim($tag[2]) : $name;
 				break;
 			case 'return':
 				$tag = explode(' ', trim($tag[1]), 2);
@@ -195,8 +195,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();
@@ -206,11 +206,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;
@@ -226,10 +226,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
 	}
 
 	/**
@@ -238,9 +238,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;
 	}
 
 	/**
@@ -297,7 +297,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);
 	}
 
 	/**