rugk / threema-msgapi-sdk-php

source/Threema/MsgApi/Commands/LookupEmail.php

Spacing +1 added lines, -1 removed lines

@@ -76,7 +76,7 @@
 	 * @param object $res
 	 * @return SendE2EResult
 	 */
-	public function parseResult($httpCode, $res){
+	public function parseResult($httpCode, $res) {
 		return new SendE2EResult($httpCode, $res);
 	}
 }

source/Threema/MsgApi/Commands/Capability.php

Spacing +1 added lines, -1 removed lines

@@ -76,7 +76,7 @@
 	 * @param object $res
 	 * @return SendE2EResult
 	 */
-	public function parseResult($httpCode, $res){
+	public function parseResult($httpCode, $res) {
 		return new SendE2EResult($httpCode, $res);
 	}
 }

source/Threema/MsgApi/Helpers/E2EHelper.php

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');
 		}
 
-		if($outputFolder === false) {
+		if ($outputFolder === false) {
 			return $receiveResult;
 		}
-		if($outputFolder === null || strlen($outputFolder) == 0) {
+		if ($outputFolder === null || strlen($outputFolder) == 0) {
 			$outputFolder = '.';
 		}
 
 		$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(),
 					$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(),
 					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
@@ -308,14 +308,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');
 			}
 		}
@@ -331,11 +331,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/Tests/CryptToolTest.php

Spacing +12 added lines, -12 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($cryptTool->hex2bin(Common::getPrivateKey(Constants::myPrivateKey)));
 			$myPublicKey = $cryptTool->hex2bin(Common::getPublicKey(Constants::myPublicKey));
 
@@ -167,14 +167,14 @@ 
 				$timeElapsed = [];
 				$comparisonResult = [];
 				$timeElapsedAvg = [];
-				foreach(array(
-					'length' => [$string1, $string1 . 'a'],
+				foreach (array(
+					'length' => [$string1, $string1.'a'],
 					'diff' => [$string1, $string2],
 					'same' => [$string1, $string1]
 				) as $testName => $strings) {
 					$timeMin = [null, 0];
 					$timeMax = [null, 0];
-					for ($i=0; $i < 3; $i++) {
+					for ($i = 0; $i < 3; $i++) {
 						// test run with delay
 						$timeElapsed[$testName][$i] = -microtime(true);
 						$comparisonResult[$testName][$i] = $cryptTool->stringCompare($strings[0], $strings[1]);
@@ -207,13 +207,13 @@ 
 					array_splice($timeElapsed[$testName], $timeMax[1] >= $timeMin[1] ? ($timeMax[1]-1) : $timeMax[1], 1);
 
 					// calculate average (currently useless as there is only one value left, but it may be useful later)
-					$timeElapsedAvg[$testName] = array_sum($timeElapsed[$testName]) / count($timeElapsed[$testName]);
+					$timeElapsedAvg[$testName] = array_sum($timeElapsed[$testName])/count($timeElapsed[$testName]);
 				}
 
 				// check timings
 				echo 'Timing test results with '.$prefix.':'.PHP_EOL;
-				$timingRatio = $timeElapsedAvg['diff'] / $timeElapsedAvg['same'];
-				$absoluteDifference = abs($timeElapsedAvg['diff'] - $timeElapsedAvg['same']);
+				$timingRatio = $timeElapsedAvg['diff']/$timeElapsedAvg['same'];
+				$absoluteDifference = abs($timeElapsedAvg['diff']-$timeElapsedAvg['same']);
 				echo 'timing ratio: '.$timingRatio.PHP_EOL;
 				echo 'absolute difference: '.$absoluteDifference.PHP_EOL;
 
@@ -221,7 +221,7 @@ 
 				$allowedDifferenceLow = 0.25;
 				$allowedDifferenceTop = 0.5;
 				// double value if running in a CI envoriment
-				if (getenv('CI') == 'true')	{
+				if (getenv('CI') == 'true') {
 					$allowedDifferenceLow = $allowedDifferenceLow*2;
 					$allowedDifferenceTop = $allowedDifferenceTop*2;
 				}
@@ -239,7 +239,7 @@ 
 	 */
 	public function testRemoveVar() {
 		$this->doTest(function(CryptTool $cryptTool, $prefix) {
-			foreach(array(
+			foreach (array(
 						'hex' => Constants::myPrivateKeyExtract,
 						'bin' => $cryptTool->hex2bin(Constants::myPrivateKeyExtract)
 					) as $key => $testVar) {
@@ -253,12 +253,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;
 			}