rugk / threema-msgapi-sdk-php

source/Threema/MsgApi/Commands/Results/CapabilityResult.php

Spacing +1 added lines, -1 removed lines

@@ -78,7 +78,7 @@
 	 * @return string
 	 */
 	protected function getErrorMessageByErrorCode($httpCode) {
-		switch($httpCode) {
+		switch ($httpCode) {
 			case 401:
 				return 'API identity or secret incorrect';
 			case 404:

source/Threema/MsgApi/Commands/Results/CreditsResult.php

Spacing +1 added lines, -1 removed lines

@@ -32,7 +32,7 @@
 	 * @return string
 	 */
 	protected function getErrorMessageByErrorCode($httpCode) {
-		switch($httpCode) {
+		switch ($httpCode) {
 			case 401:
 				return 'API identity or secret incorrect';
 			case 500:

source/Threema/MsgApi/Commands/Results/LookupIdResult.php

Spacing +1 added lines, -1 removed lines

@@ -32,7 +32,7 @@
 	 * @return string
 	 */
 	protected function getErrorMessageByErrorCode($httpCode) {
-		switch($httpCode) {
+		switch ($httpCode) {
 			case 400:
 				return 'Hash length is wrong';
 			case 401:

source/Threema/MsgApi/Commands/Results/Result.php

Spacing +1 added lines, -1 removed lines

@@ -36,7 +36,7 @@
 	 * @return null|int
 	 */
 	final public function getErrorCode() {
-		if(false === $this->isSuccess()) {
+		if (false === $this->isSuccess()) {
 			return $this->httpCode;
 		}
 		return null;

source/Threema/MsgApi/Commands/Results/SendE2EResult.php

Spacing +1 added lines, -1 removed lines

@@ -29,7 +29,7 @@
 	 * @return string
 	 */
 	protected function getErrorMessageByErrorCode($httpCode) {
-		switch($httpCode) {
+		switch ($httpCode) {
 			case 400:
 				return 'The recipient identity is invalid or the account is not set up for E2E mode';
 			case 401:

source/Threema/MsgApi/Commands/Results/SendSimpleResult.php

Spacing +1 added lines, -1 removed lines

@@ -32,7 +32,7 @@
 	 * @return string
 	 */
 	protected function getErrorMessageByErrorCode($httpCode) {
-		switch($httpCode) {
+		switch ($httpCode) {
 			case 400:
 				return 'The recipient identity is invalid or the account is not set up for simple mode';
 			case 401:

source/Threema/MsgApi/Commands/Results/UploadFileResult.php

Spacing +1 added lines, -1 removed lines

@@ -34,7 +34,7 @@
 	 * @return string
 	 */
 	protected function getErrorMessageByErrorCode($httpCode) {
-		switch($httpCode) {
+		switch ($httpCode) {
 			case 401:
 				return 'API identity or secret incorrect or file is empty';
 			case 402:

source/Threema/MsgApi/Helpers/E2EHelper.php

Braces +1 added lines, -2 removed lines

@@ -247,8 +247,7 @@
 
 				$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()) {

Spacing +28 added lines, -28 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());
 			}
 		}
@@ -209,7 +209,7 @@ 
 		//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,22 +220,22 @@ 
 			$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($outputFolder === false) {
+		if ($outputFolder === false) {
 			return $receiveResult;
 		}
-		if($outputFolder === null || strlen($outputFolder) == 0) {
+		if ($outputFolder === null || strlen($outputFolder) == 0) {
 			$outputFolder = '.';
 		}
 
-		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(),
 					$this->cryptTool->hex2bin($receiverPublicKey->getPublicKey()),
@@ -247,7 +247,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);
@@ -255,10 +255,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(),
 					$this->cryptTool->hex2bin($message->getEncryptionKey()));
@@ -268,20 +268,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(),
 						$this->cryptTool->hex2bin($message->getEncryptionKey()));
 
-					if(null === $file) {
+					if (null === $file) {
 						throw new Exception('thumbnail decryption failed');
 					}
 					//save file
@@ -327,14 +327,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');
 			}
 		}
@@ -350,11 +350,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/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;