rugk / threema-msgapi-sdk-php

source/Threema/Console/Command/SendE2EImage.php

Spacing +1 added lines, -1 removed lines

@@ -51,7 +51,7 @@
 		$helper = new E2EHelper($privateKey, $connector);
 		$result = $helper->sendImageMessage($threemaId, $path);
 
-		if($result->isSuccess()) {
+		if ($result->isSuccess()) {
 			Common::l('Message ID: '.$result->getMessageId());
 		}
 		else {

Braces +1 added lines, -2 removed lines

@@ -41,8 +41,7 @@
 		$storeHandle = fopen($this->file, 'r');
 		if(false === $storeHandle) {
 			throw new Exception('could not open file '.$this->file);
-		}
-		else {
+		} else {
 			$threemaId = strtoupper($threemaId);
 			$publicKey = null;
 			while (!feof($storeHandle)) {

source/Threema/Console/Command/SendSimple.php

Spacing +2 added lines, -2 removed lines

@@ -36,7 +36,7 @@ 
 		Common::required($to, $from, $secret);
 
 		$message = $this->readStdIn();
-		if(strlen($message) === 0) {
+		if (strlen($message) === 0) {
 			throw new \InvalidArgumentException('please define a message');
 		}
 
@@ -49,7 +49,7 @@ 
 		$receiver = new Receiver($to, Receiver::TYPE_ID);
 
 		$result = $connector->sendSimple($receiver, $message);
-		if($result->isSuccess()) {
+		if ($result->isSuccess()) {
 			Common::l('Message ID: '.$result->getMessageId());
 		}
 		else {

Braces +1 added lines, -2 removed lines

@@ -41,8 +41,7 @@
 		$storeHandle = fopen($this->file, 'r');
 		if(false === $storeHandle) {
 			throw new Exception('could not open file '.$this->file);
-		}
-		else {
+		} else {
 			$threemaId = strtoupper($threemaId);
 			$publicKey = null;
 			while (!feof($storeHandle)) {

source/Threema/Console/Common.php

Spacing +8 added lines, -8 removed lines

@@ -19,7 +19,7 @@ 
 	 */
 	public static function l($string = '', $indent = 0) {
 		$pad = str_repeat('  ', $indent);
-		echo $pad . wordwrap($string, 100, "\n" . $pad) . "\n";
+		echo $pad.wordwrap($string, 100, "\n".$pad)."\n";
 	}
 
 	/**
@@ -28,7 +28,7 @@ 
 	 * @param string $string string to output
 	 */
 	public static function ln($string = '') {
-		echo $string . "\n";
+		echo $string."\n";
 	}
 
 	/**
@@ -50,9 +50,9 @@ 
 	 */
 	public static function required() {
 		$argCount = func_num_args();
-		for($n = 0; $n < $argCount; $n++) {
+		for ($n = 0; $n < $argCount; $n++) {
 			$o = func_get_arg($n);
-			if(null === $o || (is_scalar($o) && strlen($o) == 0)) {
+			if (null === $o || (is_scalar($o) && strlen($o) == 0)) {
 				throw new Exception('invalid data');
 			}
 		}
@@ -65,7 +65,7 @@ 
 	 * @return null|string
 	 */
 	public static function convertPublicKey($key) {
-		if(null !== $key) {
+		if (null !== $key) {
 			return Constants::PUBLIC_KEY_PREFIX.$key;
 		}
 		return null;
@@ -78,7 +78,7 @@ 
 	 * @return null|string
 	 */
 	public static function getPublicKey($stringWithPrefix = null) {
-		if(null !== $stringWithPrefix && substr($stringWithPrefix, 0, strlen(Constants::PUBLIC_KEY_PREFIX)) == Constants::PUBLIC_KEY_PREFIX) {
+		if (null !== $stringWithPrefix && substr($stringWithPrefix, 0, strlen(Constants::PUBLIC_KEY_PREFIX)) == Constants::PUBLIC_KEY_PREFIX) {
 			return substr($stringWithPrefix, strlen(Constants::PUBLIC_KEY_PREFIX));
 		}
 		return null;
@@ -91,7 +91,7 @@ 
 	 * @return null|string
 	 */
 	public static function convertPrivateKey($key) {
-		if(null !== $key) {
+		if (null !== $key) {
 			return Constants::PRIVATE_KEY_PREFIX.$key;
 		}
 		return null;
@@ -104,7 +104,7 @@ 
 	 * @return null|string
 	 */
 	public static function getPrivateKey($stringWithPrefix = null) {
-		if(null !== $stringWithPrefix && substr($stringWithPrefix, 0, strlen(Constants::PRIVATE_KEY_PREFIX)) == Constants::PRIVATE_KEY_PREFIX) {
+		if (null !== $stringWithPrefix && substr($stringWithPrefix, 0, strlen(Constants::PRIVATE_KEY_PREFIX)) == Constants::PRIVATE_KEY_PREFIX) {
 			return substr($stringWithPrefix, strlen(Constants::PRIVATE_KEY_PREFIX));
 		}
 		return null;

source/Threema/Console/Run.php

Spacing +16 added lines, -16 removed lines

@@ -86,15 +86,15 @@ 
 	}
 
 	private function register($argumentKey, Base $command) {
-		if(is_scalar($argumentKey)) {
+		if (is_scalar($argumentKey)) {
 			$argumentKey = array($argumentKey);
 		}
 
 		//check for existing commands with the same arguments
-		foreach($this->commands as $commandValues) {
+		foreach ($this->commands as $commandValues) {
 			$ex = $commandValues[0];
-			if(null !== $ex && is_array($ex)) {
-				if(count($ex) == count($argumentKey)
+			if (null !== $ex && is_array($ex)) {
+				if (count($ex) == count($argumentKey)
 					&& count(array_diff($ex, $argumentKey)) == 0) {
 					throw new Exception('arguments '.implode($argumentKey).' already used');
 				}
@@ -113,17 +113,17 @@ 
 		$argumentLength = 0;
 
 		//find the correct command by arguments and arguments count
-		foreach($this->commands as $data) {
-			if(is_scalar($data)) {
+		foreach ($this->commands as $data) {
+			if (is_scalar($data)) {
 				continue;
 			}
 
 			list($keys, $command) = $data;
-			if(array_slice($this->arguments, 0, count($keys)) == $keys) {
+			if (array_slice($this->arguments, 0, count($keys)) == $keys) {
 				$argCount = count($this->arguments)-count($keys);
 
 				/** @noinspection PhpUndefinedMethodInspection */
-				if($argCount >= $command->getRequiredArgumentCount()
+				if ($argCount >= $command->getRequiredArgumentCount()
 					&& $argCount <= $command->getAllArgumentsCount()) {
 					$found = $command;
 					$argumentLength = count($keys);
@@ -132,11 +132,11 @@ 
 			}
 		}
 
-		if($argumentLength > 0) {
+		if ($argumentLength > 0) {
 			array_splice($this->arguments, 0, $argumentLength);
 		}
 
-		if(null === $found) {
+		if (null === $found) {
 			$this->help();
 		}
 		else {
@@ -145,7 +145,7 @@ 
 			try {
 				$found->run($this->arguments);
 			}
-			catch(Exception $x) {
+			catch (Exception $x) {
 				Common::l();
 				Common::e('ERROR: '.$x->getMessage());
 				Common::e(get_class($x));
@@ -163,8 +163,8 @@ 
 		Common::l('CryptTool: '.$defaultCryptTool->getName().' '.$defaultCryptTool->getDescription());
 		Common::l(str_repeat('.', 40));
 		Common::l();
-		foreach($this->commands as $data) {
-			if(is_scalar($data)) {
+		foreach ($this->commands as $data) {
+			if (is_scalar($data)) {
 				Common::l($data);
 				Common::l(str_repeat('-', strlen($data)));
 				Common::l();
@@ -181,10 +181,10 @@ 
 	}
 
 	public function writeHelp(\Closure $writer) {
-		if(null !== $writer) {
+		if (null !== $writer) {
 
-			foreach($this->commands as $data) {
-				if(is_scalar($data)) {
+			foreach ($this->commands as $data) {
+				if (is_scalar($data)) {
 					$writer->__invoke($data, null, null, false);
 				}
 				else {

Braces +4 added lines, -8 removed lines

@@ -138,14 +138,12 @@ 
 
 		if(null === $found) {
 			$this->help();
-		}
-		else {
+		} else {
 
 
 			try {
 				$found->run($this->arguments);
-			}
-			catch(Exception $x) {
+			} catch(Exception $x) {
 				Common::l();
 				Common::e('ERROR: '.$x->getMessage());
 				Common::e(get_class($x));
@@ -168,8 +166,7 @@ 
 				Common::l($data);
 				Common::l(str_repeat('-', strlen($data)));
 				Common::l();
-			}
-			else {
+			} else {
 				list($key, $command) = $data;
 				Common::ln($this->scriptName.' '."\033[1;33m".implode(' ', $key)."\033[0m".' '.$command->help());
 				Common::l();
@@ -186,8 +183,7 @@ 
 			foreach($this->commands as $data) {
 				if(is_scalar($data)) {
 					$writer->__invoke($data, null, null, false);
-				}
-				else {
+				} else {
 					list($key, $command) = $data;
 					$writer->__invoke($command->subject(false), $this->scriptName.' '.implode(' ', $key).' '.$command->help(false), $command->description(), true);
 				}

source/Threema/Core/AssocArray.php

Spacing +5 added lines, -5 removed lines

@@ -28,7 +28,7 @@ 
 	 * @return mixed|null return the key value or the default value
 	 */
 	public function getValue($key, $defaultValue = null) {
-		if(false === array_key_exists($key, $this->data)) {
+		if (false === array_key_exists($key, $this->data)) {
 			return $defaultValue;
 		}
 
@@ -43,15 +43,15 @@ 
 	 */
 	public static final function byJsonString($string, array $requiredKeys = null) {
 		$v = json_decode($string, true);
-		if(null === $v || false === $v) {
+		if (null === $v || false === $v) {
 			throw new Exception('invalid json string');
 		}
 
 		//validate first
-		if(null !== $requiredKeys) {
+		if (null !== $requiredKeys) {
 			//validate array first
-			foreach($requiredKeys as $requiredKey) {
-				if(false === array($v)) {
+			foreach ($requiredKeys as $requiredKey) {
+				if (false === array($v)) {
 					throw new Exception('required key '.$requiredKey.' failed');
 				}
 			}

source/Threema/Core/Url.php

Spacing +13 added lines, -13 removed lines

@@ -38,7 +38,7 @@ 
 	 * @param string $value
 	 * @return $this
 	 */
-	public function setValue($key, $value){
+	public function setValue($key, $value) {
 		$this->values[$key] = $value;
 		return $this;
 	}
@@ -50,18 +50,18 @@ 
 	 * @return $this
 	 */
 	public function addPath($path) {
-		while(substr($this->path, strlen($this->path)-1) == '/') {
+		while (substr($this->path, strlen($this->path)-1) == '/') {
 			$this->path = substr($this->path, 0, strlen($this->path)-1);
 		}
 
 		$realPath = '';
-		foreach(explode('/', $path) as $c => $pathPiece) {
-			if($c > 0) {
+		foreach (explode('/', $path) as $c => $pathPiece) {
+			if ($c > 0) {
 				$realPath .= '/';
 			}
 			$realPath .= urlencode($pathPiece);
 		}
-		while(substr($path, 0, 1) == '/') {
+		while (substr($path, 0, 1) == '/') {
 			$path = substr($path, 1);
 		}
 
@@ -74,9 +74,9 @@ 
 	 */
 	public function getPath() {
 		$p = $this->path;
-		if(count($this->values) > 0) {
+		if (count($this->values) > 0) {
 			$s = http_build_query($this->values);
-			if(strlen($s) > 0) {
+			if (strlen($s) > 0) {
 				$p .= '?'.$s;
 			}
 		}
@@ -100,17 +100,17 @@ 
 	{
 		$result = array();
 
-		while(strlen($urlParameter) > 0) {
+		while (strlen($urlParameter) > 0) {
 			// name
-			$keyPosition= strpos($urlParameter,'=');
-			$keyValue = substr($urlParameter,0,$keyPosition);
+			$keyPosition = strpos($urlParameter, '=');
+			$keyValue = substr($urlParameter, 0, $keyPosition);
 			// value
-			$valuePosition = strpos($urlParameter,'&') ? strpos($urlParameter,'&'): strlen($urlParameter);
-			$valueValue = substr($urlParameter,$keyPosition+1,$valuePosition-$keyPosition-1);
+			$valuePosition = strpos($urlParameter, '&') ? strpos($urlParameter, '&') : strlen($urlParameter);
+			$valueValue = substr($urlParameter, $keyPosition+1, $valuePosition-$keyPosition-1);
 
 			// decoding the response
 			$result[$keyValue] = urldecode($valueValue);
-			$urlParameter = substr($urlParameter,$valuePosition+1,strlen($urlParameter));
+			$urlParameter = substr($urlParameter, $valuePosition+1, strlen($urlParameter));
 		}
 
 		return $result;

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/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 +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());
 			}
 		}
@@ -205,14 +205,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');
 		}
 
@@ -223,15 +223,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(),
 					$this->cryptTool->hex2bin($receiverPublicKey->getPublicKey()),
@@ -243,7 +243,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);
@@ -251,10 +251,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()));
@@ -264,20 +264,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
@@ -304,14 +304,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');
 			}
 		}
@@ -327,11 +327,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);
 			}
 

Doc Comments +1 added lines, -1 removed lines

@@ -190,7 +190,7 @@
 	 * @param string $messageId
 	 * @param string $box box as binary string
 	 * @param string $nonce nonce as binary string
-	 * @param string|null|false $outputFolder folder for storing the files,
+	 * @param null|string $outputFolder folder for storing the files,
 	 * 							null=current folder, false=do not download files
 	 * @param \Closure $downloadMessage
 	 * @return ReceiveMessageResult