rugk / threema-msgapi-sdk-php

source/Threema/MsgApi/ConnectionSettings.php

Spacing +4 added lines, -4 removed lines

@@ -48,16 +48,16 @@
 		$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];
 			}
 		}

source/Threema/MsgApi/Helpers/E2EHelper.php

Spacing +27 added lines, -27 removed lines

@@ -42,7 +42,7 @@ 
 		$this->cryptTool = $cryptTool;
 		$this->privateKey = $privateKey;
 
-		if(null === $this->cryptTool) {
+		if (null === $this->cryptTool) {
 			$this->cryptTool = CryptTool::getInstance();
 		}
 	}
@@ -84,11 +84,11 @@ 
 		//analyse the file
 		$fileAnalyzeResult = FileAnalysisTool::analyse($imagePath);
 
-		if(null === $fileAnalyzeResult) {
+		if (null === $fileAnalyzeResult) {
 			throw new Exception('could not analyze the file');
 		}
 
-		if(false === in_array($fileAnalyzeResult->getMimeType(), array(
+		if (false === in_array($fileAnalyzeResult->getMimeType(), array(
 				'image/jpg',
 				'image/jpeg',
 				'image/png' ))) {
@@ -102,9 +102,9 @@ 
 
 		//encrypt the image file
 		$encryptionResult = $this->cryptTool->encryptImage(file_get_contents($imagePath), $this->privateKey, $receiverPublicKey);
-		$uploadResult =  $this->connection->uploadFile($encryptionResult->getData());
+		$uploadResult = $this->connection->uploadFile($encryptionResult->getData());
 
-		if($uploadResult == null || !$uploadResult->isSuccess()) {
+		if ($uploadResult == null || !$uploadResult->isSuccess()) {
 			throw new Exception('could not upload the image ('.$uploadResult->getErrorCode().' '.$uploadResult->getErrorMessage().') '.$uploadResult->getRawResponse());
 		}
 
@@ -134,7 +134,7 @@ 
 		//analyse the file
 		$fileAnalyzeResult = FileAnalysisTool::analyse($filePath);
 
-		if(null === $fileAnalyzeResult) {
+		if (null === $fileAnalyzeResult) {
 			throw new Exception('could not analyze the file');
 		}
 
@@ -145,21 +145,21 @@ 
 
 		//encrypt the main file
 		$encryptionResult = $this->cryptTool->encryptFile(file_get_contents($filePath));
-		$uploadResult =  $this->connection->uploadFile($encryptionResult->getData());
+		$uploadResult = $this->connection->uploadFile($encryptionResult->getData());
 
-		if($uploadResult == null || !$uploadResult->isSuccess()) {
+		if ($uploadResult == null || !$uploadResult->isSuccess()) {
 			throw new Exception('could not upload the file ('.$uploadResult->getErrorCode().' '.$uploadResult->getErrorMessage().') '.$uploadResult->getRawResponse());
 		}
 
 		$thumbnailUploadResult = null;
 
 		//encrypt the thumbnail file (if exists)
-		if(strlen($thumbnailPath) > 0 && true === file_exists($thumbnailPath)) {
+		if (strlen($thumbnailPath) > 0 && true === file_exists($thumbnailPath)) {
 			//encrypt the main file
 			$thumbnailEncryptionResult = $this->cryptTool->encryptFileThumbnail(file_get_contents($thumbnailPath), $encryptionResult->getKey());
 			$thumbnailUploadResult = $this->connection->uploadFile($thumbnailEncryptionResult->getData());
 
-			if($thumbnailUploadResult == null || !$thumbnailUploadResult->isSuccess()) {
+			if ($thumbnailUploadResult == null || !$thumbnailUploadResult->isSuccess()) {
 				throw new Exception('could not upload the thumbnail file ('.$thumbnailUploadResult->getErrorCode().' '.$thumbnailUploadResult->getErrorMessage().') '.$thumbnailUploadResult->getRawResponse());
 			}
 		}
@@ -202,14 +202,14 @@ 
 										 $outputFolder = null,
 										 \Closure $downloadMessage = null) {
 
-		if($outputFolder == null || strlen($outputFolder) == 0) {
+		if ($outputFolder == null || strlen($outputFolder) == 0) {
 			$outputFolder = '.';
 		}
 
 		//fetch the public key
 		$receiverPublicKey = $this->connection->fetchPublicKey($threemaId);
 
-		if(null === $receiverPublicKey || !$receiverPublicKey->isSuccess()) {
+		if (null === $receiverPublicKey || !$receiverPublicKey->isSuccess()) {
 			throw new Exception('Invalid threema id');
 		}
 
@@ -220,15 +220,15 @@ 
 			$nonce
 		);
 
-		if(null === $message || false === is_object($message)) {
+		if (null === $message || false === is_object($message)) {
 			throw new Exception('Could not encrypt box');
 		}
 
 		$receiveResult = new ReceiveMessageResult($messageId, $message);
 
-		if($message instanceof ImageMessage) {
+		if ($message instanceof ImageMessage) {
 			$result = $this->downloadFile($message, $message->getBlobId(), $downloadMessage);
-			if(null !== $result && true === $result->isSuccess()) {
+			if (null !== $result && true === $result->isSuccess()) {
 				$image = $this->cryptTool->decryptImage(
 					$result->getData(),
 					hex2bin($receiverPublicKey->getPublicKey()),
@@ -240,7 +240,7 @@ 
 					throw new Exception('decryption of image failed');
 				}
 				//save file
-				$filePath = $outputFolder . '/' . $messageId . '.jpg';
+				$filePath = $outputFolder.'/'.$messageId.'.jpg';
 				$f = fopen($filePath, 'w+');
 				fwrite($f, $image);
 				fclose($f);
@@ -248,10 +248,10 @@ 
 				$receiveResult->addFile('image', $filePath);
 			}
 		}
-		else if($message instanceof FileMessage) {
+		else if ($message instanceof FileMessage) {
 			$result = $this->downloadFile($message, $message->getBlobId(), $downloadMessage);
 
-			if(null !== $result && true === $result->isSuccess()) {
+			if (null !== $result && true === $result->isSuccess()) {
 				$file = $this->cryptTool->decryptFile(
 					$result->getData(),
 					hex2bin($message->getEncryptionKey()));
@@ -261,20 +261,20 @@ 
 				}
 
 				//save file
-				$filePath = $outputFolder . '/' . $messageId . '-' . $message->getFilename();
+				$filePath = $outputFolder.'/'.$messageId.'-'.$message->getFilename();
 				file_put_contents($filePath, $file);
 
 				$receiveResult->addFile('file', $filePath);
 			}
 
-			if(null !== $message->getThumbnailBlobId() && strlen($message->getThumbnailBlobId()) > 0) {
+			if (null !== $message->getThumbnailBlobId() && strlen($message->getThumbnailBlobId()) > 0) {
 				$result = $this->downloadFile($message, $message->getThumbnailBlobId(), $downloadMessage);
-				if(null !== $result && true === $result->isSuccess()) {
+				if (null !== $result && true === $result->isSuccess()) {
 					$file = $this->cryptTool->decryptFileThumbnail(
 						$result->getData(),
 						hex2bin($message->getEncryptionKey()));
 
-					if(null === $file) {
+					if (null === $file) {
 						throw new Exception('thumbnail decryption failed');
 					}
 					//save file
@@ -301,14 +301,14 @@ 
 		//fetch the public key
 		$receiverPublicKey = $this->connection->fetchPublicKey($threemaId);
 
-		if(null === $receiverPublicKey || !$receiverPublicKey->isSuccess()) {
+		if (null === $receiverPublicKey || !$receiverPublicKey->isSuccess()) {
 			throw new Exception('Invalid threema id');
 		}
 
-		if(null !== $capabilityCheck) {
+		if (null !== $capabilityCheck) {
 			//check capability
 			$capability = $this->connection->keyCapability($threemaId);
-			if(null === $capability || false === $capabilityCheck->__invoke($capability)) {
+			if (null === $capability || false === $capabilityCheck->__invoke($capability)) {
 				throw new Exception('threema id does not have the capability');
 			}
 		}
@@ -324,11 +324,11 @@ 
 	 * @throws Exception
 	 */
 	private final function downloadFile(ThreemaMessage $message, $blobId, \Closure $downloadMessage = null) {
-		if(null === $downloadMessage
+		if (null === $downloadMessage
 			|| true === $downloadMessage->__invoke($message, $blobId)) {
 			//make a download
 			$result = $this->connection->downloadFile($blobId);
-			if(null === $result || false === $result->isSuccess()) {
+			if (null === $result || false === $result->isSuccess()) {
 				throw new Exception('could not download the file with blob id '.$blobId);
 			}
 

source/Threema/MsgApi/Messages/DeliveryReceipt.php

Spacing +2 added lines, -2 removed lines

@@ -57,7 +57,7 @@ 
 	 * @return string
 	 */
 	public function getReceiptTypeName() {
-		if(true === array_key_exists($this->receiptType, self::$receiptTypesToNames)) {
+		if (true === array_key_exists($this->receiptType, self::$receiptTypesToNames)) {
 			return self::$receiptTypesToNames[$this->receiptType];
 		}
 		return null;
@@ -77,7 +77,7 @@ 
 	 * @return string
 	 */
 	function __toString() {
-		$str = "Delivery receipt (" . $this->getReceiptTypeName() . "): ";
+		$str = "Delivery receipt (".$this->getReceiptTypeName()."): ";
 		$hexMessageIds = array();
 		foreach ($this->ackedMessageIds as $messageId) {
 			$hexMessageIds[] = bin2hex($messageId);

source/Threema/MsgApi/PublicKeyStore.php

Spacing +2 added lines, -2 removed lines

@@ -27,12 +27,12 @@
 	 * @return string|null
 	 */
 	public final function getPublicKey($threemaId) {
-		if(array_key_exists($threemaId, $this->cache)) {
+		if (array_key_exists($threemaId, $this->cache)) {
 			return $this->cache[$threemaId];
 		}
 
 		$publicKey = $this->findPublicKey($threemaId);
-		if(null !== $publicKey) {
+		if (null !== $publicKey) {
 			$this->cache[$threemaId] = $publicKey;
 		}
 		return $publicKey;

source/Threema/MsgApi/PublicKeyStores/File.php

Spacing +3 added lines, -3 removed lines

@@ -25,7 +25,7 @@ 
 	 * @throws Exception if the file does not exist or not writable
 	 */
 	public function __construct($file) {
-		if(false === is_writable($file)) {
+		if (false === is_writable($file)) {
 			throw new Exception('file '.$file.' does not exist or is not writable');
 		}
 		$this->file = $file;
@@ -39,7 +39,7 @@ 
 	 */
 	function findPublicKey($threemaId) {
 		$storeHandle = fopen($this->file, 'r');
-		if(false === $storeHandle) {
+		if (false === $storeHandle) {
 			throw new Exception('could not open file '.$this->file);
 		}
 		else {
@@ -47,7 +47,7 @@ 
 			$publicKey = null;
 			while (!feof($storeHandle)) {
 				$buffer = fgets($storeHandle, 4096);
-				if(substr($buffer, 0, 8) == $threemaId) {
+				if (substr($buffer, 0, 8) == $threemaId) {
 					$publicKey = str_replace("\n", '', substr($buffer, 8));
 					continue;
 				}

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/Tests/CryptToolTest.php

Spacing +4 added lines, -4 removed lines

@@ -56,7 +56,7 @@ 
 
 			$this->assertNotNull($message);
 			$this->assertTrue($message instanceof TextMessage);
-			if($message instanceof TextMessage) {
+			if ($message instanceof TextMessage) {
 				$this->assertEquals($message->getText(), 'Dies ist eine Testnachricht. äöü');
 			}
 		});
@@ -92,7 +92,7 @@ 
 
 
 	public function testDerivePublicKey() {
-		$this->doTest(function(CryptTool $cryptTool, $prefix){
+		$this->doTest(function(CryptTool $cryptTool, $prefix) {
 			$publicKey = $cryptTool->derivePublicKey(hex2bin(Common::getPrivateKey(Constants::myPrivateKey)));
 			$myPublicKey = hex2bin(Common::getPublicKey(Constants::myPublicKey));
 
@@ -120,12 +120,12 @@ 
 		});
 	}
 	private function doTest(\Closure $c) {
-		foreach(array(
+		foreach (array(
 					'Salt' => CryptTool::createInstance(CryptTool::TYPE_SALT),
 					'Sodium' => CryptTool::createInstance(CryptTool::TYPE_SODIUM)
 				) as $key => $instance) {
 
-			if($instance === null) {
+			if ($instance === null) {
 				echo $key.": could not instance crypt tool\n";
 				break;
 			}

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;