rugk / threema-msgapi-sdk-php

source/Threema/MsgApi/PublicKeyStores/PhpFile.php

Spacing +11 added lines, -11 removed lines

@@ -43,10 +43,10 @@ 
 	public function __construct($file)
 	{
 		if (false === is_writable($file)) {
-			throw new Exception('file ' . $file . ' does not exist or is not writable');
+			throw new Exception('file '.$file.' does not exist or is not writable');
 		}
 		if (pathinfo($file, PATHINFO_EXTENSION) != 'php') {
-			throw new Exception('file ' . $file . ' is not a valid PHP file');
+			throw new Exception('file '.$file.' is not a valid PHP file');
 		}
 		$this->file = $file;
 	}
@@ -104,12 +104,12 @@ 
 
 		//add key
 		$this->keystore[$threemaId] = $publicKey;
-		$content = '$keystore[\'' . $threemaId . '\'] = \'' . $publicKey . '\';' . PHP_EOL;
+		$content = '$keystore[\''.$threemaId.'\'] = \''.$publicKey.'\';'.PHP_EOL;
 
 		//write content
 		$fileadd = file_put_contents($this->file, $content, FILE_APPEND);
 		if (!$fileadd) {
-			throw new Exception('could not write to file ' . $this->file);
+			throw new Exception('could not write to file '.$this->file);
 		}
 
 		return true;
@@ -137,28 +137,28 @@ 
 
 			//check for success
 			if (null === $fileHandle) {
-				throw new Exception('could not open file ' . $this->file);
+				throw new Exception('could not open file '.$this->file);
 			}
 		}
 
 		//create content
-		$content = $this->fileBlocker . PHP_EOL;
+		$content = $this->fileBlocker.PHP_EOL;
 		$content .= PHP_EOL;
-		$content .= '//Threema MsgApi phpfile keystore' . PHP_EOL;
-		$content .= '//DO NOT EDIT THIS FILE!' . PHP_EOL;
+		$content .= '//Threema MsgApi phpfile keystore'.PHP_EOL;
+		$content .= '//DO NOT EDIT THIS FILE!'.PHP_EOL;
 		$content .= PHP_EOL;
 
 		//write file
 		$fwrite = fwrite($fileHandle, $content);
 		if (!$fwrite) {
-			throw new Exception('could not write to file ' . $this->file);
+			throw new Exception('could not write to file '.$this->file);
 		}
 
 		//close file if necessary
 		if ($fileopened) {
 			$fclose = fclose($fileHandle);
 			if (!$fclose) {
-				throw new Exception('error while processing file ' . $this->file);
+				throw new Exception('error while processing file '.$this->file);
 			}
 		}
 		return true;
@@ -170,7 +170,7 @@ 
 	 * @return PhpFile
 	 */
 	public static function create($path) {
-		if(false === file_exists($path)) {
+		if (false === file_exists($path)) {
 			//touch
 			touch($path);
 		}

source/Threema/MsgApi/Receiver.php

Spacing +1 added lines, -1 removed lines

@@ -73,7 +73,7 @@
 	 * @throws \InvalidArgumentException
 	 */
 	public function getParams() {
-		switch($this->type) {
+		switch ($this->type) {
 			case self::TYPE_ID:
 				$to = $this->type;
 				$this->value = strtoupper(trim($this->value));

source/Threema/MsgApi/Tools/CryptToolSalt.php

Spacing +5 added lines, -5 removed lines

@@ -48,7 +48,7 @@ 
 	 * @return null|string
 	 */
 	protected function openBox($box, $recipientPrivateKey, $senderPublicKey, $nonce) {
-		$boxPad = str_repeat("\x00", 16) . $box;
+		$boxPad = str_repeat("\x00", 16).$box;
 		try {
 			$data = Salt::box_open($boxPad, $recipientPrivateKey, $senderPublicKey, $nonce);
 		} catch (\SaltException $e) {
@@ -71,7 +71,7 @@ 
 	 * @return string as binary
 	 */
 	protected function openSecretBox($box, $nonce, $key) {
-		$boxPad = str_repeat("\x00", 16) . $box;
+		$boxPad = str_repeat("\x00", 16).$box;
 		$data = Salt::secretbox_open($boxPad, $nonce, $key);
 
 		if ($data) {
@@ -130,7 +130,7 @@ 
 			Salt::decodeInput($nonce),
 			$key);
 
-		if($data === false) {
+		if ($data === false) {
 			throw new Exception('encryption failed');
 		}
 
@@ -152,11 +152,11 @@ 
 	 * @throws Exception
 	 */
 	public function validate() {
-		if(false === $this->isSupported()) {
+		if (false === $this->isSupported()) {
 			throw new Exception('SALT implementation not supported');
 		}
 
-		if(PHP_INT_SIZE < 8) {
+		if (PHP_INT_SIZE < 8) {
 			throw new Exception('Pure PHP Crypto implementation requires 64Bit PHP. Please install the libsodium PHP extension.');
 		}
 		return true;

source/Threema/MsgApi/Tools/CryptToolSodium.php

Spacing +1 added lines, -1 removed lines

@@ -121,7 +121,7 @@
 	 * @throws Exception
 	 */
 	public function validate() {
-		if(false === $this->isSupported()) {
+		if (false === $this->isSupported()) {
 			throw new Exception('Sodium implementation not supported');
 		}
 		return true;

source/Threema/MsgApi/Tools/FileAnalysisTool.php

Spacing +5 added lines, -5 removed lines

@@ -14,12 +14,12 @@ 
 	 */
 	public static function analyse($file) {
 		//check if file exists
-		if(false === file_exists($file)) {
+		if (false === file_exists($file)) {
 			return null;
 		}
 
 		//is not a file
-		if(false === is_file($file)) {
+		if (false === is_file($file)) {
 			return null;
 		}
 
@@ -28,16 +28,16 @@ 
 
 		$mimeType = null;
 		//mime type getter
-		if(function_exists('finfo_open')) {
+		if (function_exists('finfo_open')) {
 			$finfo = finfo_open(FILEINFO_MIME_TYPE);
 			$mimeType = finfo_file($finfo, $file);
 		}
-		else if(function_exists('mime_content_type')) {
+		else if (function_exists('mime_content_type')) {
 			$mimeType = mime_content_type($file);
 		}
 
 		//default mime type
-		if(strlen($mimeType) == 0) {
+		if (strlen($mimeType) == 0) {
 			//default mime type
 			$mimeType = 'application/octet-stream';
 		}

Braces +1 added lines, -2 removed lines

@@ -31,8 +31,7 @@
 		if(function_exists('finfo_open')) {
 			$finfo = finfo_open(FILEINFO_MIME_TYPE);
 			$mimeType = finfo_file($finfo, $file);
-		}
-		else if(function_exists('mime_content_type')) {
+		} else if(function_exists('mime_content_type')) {
 			$mimeType = mime_content_type($file);
 		}
 

threema-msgapi-tool.php

Spacing +2 added lines, -2 removed lines

@@ -8,7 +8,7 @@ 
 //disallow using the cli tool in a web project
 if ('cli' !== php_sapi_name() || null === $argv) {
 	//file not called from the cli
-	die('please run ' . basename(__FILE__) . ' only in a cli. '.
+	die('please run '.basename(__FILE__).' only in a cli. '.
 		'To use the threema msgapi sdk in your web project, include the source/bootstrap.php or the threema_msgapi.phar file.');
 }
 try {
@@ -20,6 +20,6 @@ 
 		Threema\MsgApi\PublicKeyStores\PhpFile::create('keystore.php'));
 	$tool->run();
 } catch (\Threema\Core\Exception $exception) {
-	echo "ERROR: " . $exception->getMessage() . "\n";
+	echo "ERROR: ".$exception->getMessage()."\n";
 	die();
 }

source/Threema/MsgApi/Tools/CryptTool.php

Doc Comments +15 added lines, -3 removed lines

@@ -142,6 +142,11 @@ 
 		return $this->makeBox($message, $nonce, $senderPrivateKey, $recipientPublicKey);
 	}
 
+	/**
+	 * @param string $senderPrivateKey
+	 * @param string $recipientPublicKey
+	 * @param string $nonce
+	 */
 	final public function encryptFileMessage(UploadFileResult $uploadFileResult,
 											 EncryptResult $encryptResult,
 											 UploadFileResult $thumbnailUploadFileResult = null,
@@ -190,9 +195,9 @@ 
 	 * make a secret box
 	 *
 	 * @param $data
-	 * @param $nonce
+	 * @param string $nonce
 	 * @param $key
-	 * @return mixed
+	 * @return string
 	 */
 	abstract protected function makeSecretBox($data, $nonce, $key);
 
@@ -334,6 +339,9 @@ 
 		return hash_hmac('sha256', $phoneNoClean, self::PHONENO_HMAC_KEY);
 	}
 
+	/**
+	 * @return string
+	 */
 	abstract protected function createRandom($size);
 
 	/**
@@ -376,7 +384,7 @@ 
 	abstract public function validate();
 
 	/**
-	 * @param $data
+	 * @param string $data
 	 * @return EncryptResult
 	 */
 	public final function encryptFile($data) {
@@ -405,6 +413,10 @@ 
 		return new EncryptResult($box, $key,  self::FILE_THUMBNAIL_NONCE, strlen($box));
 	}
 
+	/**
+	 * @param string $data
+	 * @param string $key
+	 */
 	public final function decryptFileThumbnail($data, $key) {
 		$result = $this->openSecretBox($data, self::FILE_THUMBNAIL_NONCE, $key);
 		return false === $result ? null : $result;

Spacing +19 added lines, -19 removed lines

@@ -42,8 +42,8 @@ 
 	 * @return CryptTool
 	 */
 	public static function getInstance() {
-		if(null === self::$instance) {
-			foreach(array(
+		if (null === self::$instance) {
+			foreach (array(
 				function() {
 					return self::createInstance(self::TYPE_SODIUM);
 				},
@@ -51,7 +51,7 @@ 
 					return self::createInstance(self::TYPE_SALT);
 				}) as $instanceGenerator) {
 				$i = $instanceGenerator->__invoke();
-				if(null !== $i) {
+				if (null !== $i) {
 					self::$instance = $i;
 					break;
 				}
@@ -66,18 +66,18 @@ 
 	 * @return null|CryptTool null on unknown type
 	 */
 	public static function createInstance($type) {
-		switch($type) {
+		switch ($type) {
 			case self::TYPE_SODIUM:
 				$instance = new CryptToolSodium();
-				if(false === $instance->isSupported()) {
+				if (false === $instance->isSupported()) {
 					//try to instance old version of sodium wrapper
 					/** @noinspection PhpDeprecationInspection */
 					$instance = new CryptToolSodiumDep();
 				}
-				return $instance->isSupported() ? $instance :null;
+				return $instance->isSupported() ? $instance : null;
 			case self::TYPE_SALT:
 				$instance = new CryptToolSalt();
-				return $instance->isSupported() ? $instance :null;
+				return $instance->isSupported() ? $instance : null;
 			default:
 				return null;
 		}
@@ -105,7 +105,7 @@ 
 	 */
 	final public function encryptMessageText($text, $senderPrivateKey, $recipientPublicKey, $nonce) {
 		/* prepend type byte (0x01) to message data */
-		$textBytes = "\x01" . $text;
+		$textBytes = "\x01".$text;
 
 		/* determine random amount of PKCS7 padding */
 		$padbytes = $this->generatePadBytes();
@@ -130,7 +130,7 @@ 
 			$senderPrivateKey,
 			$recipientPublicKey,
 			$nonce) {
-		$message = "\x02" . $this->hex2bin($uploadFileResult->getBlobId());
+		$message = "\x02".$this->hex2bin($uploadFileResult->getBlobId());
 		$message .= pack('V', $encryptResult->getSize());
 		$message .= $encryptResult->getNonce();
 
@@ -161,11 +161,11 @@ 
 			'i' => 0
 		);
 
-		if($thumbnailUploadFileResult !== null && strlen($thumbnailUploadFileResult->getBlobId()) > 0) {
+		if ($thumbnailUploadFileResult !== null && strlen($thumbnailUploadFileResult->getBlobId()) > 0) {
 			$messageContent['t'] = $thumbnailUploadFileResult->getBlobId();
 		}
 
-		$message = "\x17" . json_encode($messageContent);
+		$message = "\x17".json_encode($messageContent);
 
 		/* determine random amount of PKCS7 padding */
 		$padbytes = $this->generatePadBytes();
@@ -238,7 +238,7 @@ 
 
 		/* remove padding */
 		$padbytes = ord($data[strlen($data)-1]);
-		$realDataLength = strlen($data) - $padbytes;
+		$realDataLength = strlen($data)-$padbytes;
 		if ($realDataLength < 1) {
 			throw new BadMessageException();
 		}
@@ -264,7 +264,7 @@ 
 				return new TextMessage(substr($data, 1));
 			case DeliveryReceipt::TYPE_CODE:
 				/* Delivery receipt */
-				if ($realDataLength < (self::MESSAGE_ID_LEN-2) || (($realDataLength - 2) % self::MESSAGE_ID_LEN) != 0)  {
+				if ($realDataLength < (self::MESSAGE_ID_LEN-2) || (($realDataLength-2)%self::MESSAGE_ID_LEN) != 0) {
 					throw new BadMessageException();
 				}
 
@@ -274,7 +274,7 @@ 
 				return new DeliveryReceipt($receiptType, $messageIds);
 			case ImageMessage::TYPE_CODE:
 				/* Image Message */
-				if ($realDataLength != 1 + self::BLOB_ID_LEN + self::IMAGE_FILE_SIZE_LEN + self::IMAGE_NONCE_LEN)  {
+				if ($realDataLength != 1+self::BLOB_ID_LEN+self::IMAGE_FILE_SIZE_LEN+self::IMAGE_NONCE_LEN) {
 					throw new BadMessageException();
 				}
 
@@ -285,12 +285,12 @@ 
 			case FileMessage::TYPE_CODE:
 				/* Image Message */
 				$decodeResult = json_decode(substr($data, 1), true);
-				if(null === $decodeResult || false === $decodeResult) {
+				if (null === $decodeResult || false === $decodeResult) {
 					throw new BadMessageException();
 				}
 
 				$values = AssocArray::byJsonString(substr($data, 1), array('b', 't', 'k', 'm', 'n', 's'));
-				if(null === $values) {
+				if (null === $values) {
 					throw new BadMessageException();
 				}
 
@@ -392,7 +392,7 @@ 
 	 * @return null|string
 	 */
 	public final function decryptFile($data, $key) {
-		$result =  $this->openSecretBox($data, self::FILE_NONCE, $key);
+		$result = $this->openSecretBox($data, self::FILE_NONCE, $key);
 		return false === $result ? null : $result;
 	}
 
@@ -403,7 +403,7 @@ 
 	 */
 	public final function encryptFileThumbnail($data, $key) {
 		$box = $this->makeSecretBox($data, self::FILE_THUMBNAIL_NONCE, $key);
-		return new EncryptResult($box, $key,  self::FILE_THUMBNAIL_NONCE, strlen($box));
+		return new EncryptResult($box, $key, self::FILE_THUMBNAIL_NONCE, strlen($box));
 	}
 
 	public final function decryptFileThumbnail($data, $key) {
@@ -450,7 +450,7 @@ 
 	 */
 	private function generatePadBytes() {
 		$padbytes = 0;
-		while($padbytes < 1 || $padbytes > 255) {
+		while ($padbytes < 1 || $padbytes > 255) {
 			$padbytes = ord($this->createRandom(1));
 		}
 		return $padbytes;

Indentation +2 added lines, -2 removed lines

@@ -529,8 +529,8 @@
 			$ret = 0;
 			$length = strlen($str1);
 			for ($i = 0; $i < $length; ++$i) {
-	            $ret |= ord($str1[$i]) ^ ord($str2[$i]);
-	        }
+				$ret |= ord($str1[$i]) ^ ord($str2[$i]);
+			}
 			return 0 === $ret;
 		}
 	}

source/Threema/MsgApi/Connection.php

Spacing +6 added lines, -6 removed lines

@@ -202,12 +202,12 @@ 
 			}
 		}
 		if ($tlsCipher = $this->setting->getTlsOption(ConnectionSettings::tlsOptionCipher, null)) {
-			if(true === is_string($tlsCipher)) {
+			if (true === is_string($tlsCipher)) {
 				$options[CURLOPT_SSL_CIPHER_LIST] = $tlsCipher;
 			}
 		}
 		if ($pinnedKey = $this->setting->getTlsOption(ConnectionSettings::tlsOptionPinnedKey, Constants::DEFAULT_PINNED_KEY)) {
-			if(true === is_string($pinnedKey)) {
+			if (true === is_string($pinnedKey)) {
 				$options[CURLOPT_PINNEDPUBLICKEY] = $pinnedKey;
 			}
 		}
@@ -239,7 +239,7 @@ 
 		return $this->call($command->getPath(),
 			$this->createDefaultOptions($progress),
 			$params,
-			function ($httpCode, $response) use ($command) {
+			function($httpCode, $response) use ($command) {
 				return $command->parseResult($httpCode, $response);
 			});
 	}
@@ -257,7 +257,7 @@ 
 		$options[CURLOPT_HTTPHEADER] = array(
 			'Content-Type: application/x-www-form-urlencoded');
 
-		return $this->call($command->getPath(), $options, null, function ($httpCode, $response) use ($command) {
+		return $this->call($command->getPath(), $options, null, function($httpCode, $response) use ($command) {
 			return $command->parseResult($httpCode, $response);
 		});
 	}
@@ -277,7 +277,7 @@ 
 			'blob' => $command->getData()
 		);
 
-		return $this->call($command->getPath(), $options, $params, function ($httpCode, $response) use ($command) {
+		return $this->call($command->getPath(), $options, $params, function($httpCode, $response) use ($command) {
 			return $command->parseResult($httpCode, $response);
 		});
 	}
@@ -304,7 +304,7 @@ 
 
 		$response = curl_exec($session);
 		if (false === $response) {
-			throw new Exception($path . ' ' . curl_error($session));
+			throw new Exception($path.' '.curl_error($session));
 		}
 
 		$httpCode = curl_getinfo($session, CURLINFO_HTTP_CODE);

source/Threema/MsgApi/ConnectionSettings.php

Spacing +5 added lines, -5 removed lines

@@ -49,20 +49,20 @@
 		$this->host = $host;
 
 		// TLS options
-		if(null !== $tlsOptions && is_array($tlsOptions)) {
-			if(true === array_key_exists(self::tlsOptionForceHttps, $tlsOptions)) {
+		if (null !== $tlsOptions && is_array($tlsOptions)) {
+			if (true === array_key_exists(self::tlsOptionForceHttps, $tlsOptions)) {
 				$this->tlsOptions[self::tlsOptionForceHttps] = $tlsOptions[self::tlsOptionForceHttps] === true;
 			}
 
-			if(true === array_key_exists(self::tlsOptionVersion, $tlsOptions)) {
+			if (true === array_key_exists(self::tlsOptionVersion, $tlsOptions)) {
 				$this->tlsOptions[self::tlsOptionVersion] = $tlsOptions[self::tlsOptionVersion];
 			}
 
-			if(true === array_key_exists(self::tlsOptionCipher, $tlsOptions)) {
+			if (true === array_key_exists(self::tlsOptionCipher, $tlsOptions)) {
 				$this->tlsOptions[self::tlsOptionCipher] = $tlsOptions[self::tlsOptionCipher];
 			}
 
-			if(true === array_key_exists(self::tlsOptionPinnedKey, $tlsOptions)) {
+			if (true === array_key_exists(self::tlsOptionPinnedKey, $tlsOptions)) {
 				$this->tlsOptions[self::tlsOptionPinnedKey] = $tlsOptions[self::tlsOptionPinnedKey];
 			}
 		}