rugk / threema-msgapi-sdk-php

source/Threema/Console/Command/Base.php

Doc Comments +2 added lines, -2 removed lines

@@ -48,7 +48,7 @@ 
 	 * @param string $subject
 	 * @param string[] $requiredArguments
 	 * @param string $description
-	 * @param array $optionalArguments
+	 * @param string[] $optionalArguments
 	 */
 	public function __construct($subject, array $requiredArguments, $description, array $optionalArguments = array()) {
 		$this->subject = $subject;
@@ -115,7 +115,7 @@ 
 	 * return a valid file path
 	 *
 	 * @param string $pos
-	 * @return null|string
+	 * @return string
 	 * @throws \Threema\Core\Exception
 	 */
 	public function getArgumentFile($pos) {

Braces +1 added lines, -2 removed lines

@@ -103,8 +103,7 @@
 		if(false === array_key_exists($i, $this->arguments)) {
 			if(true === $required) {
 				throw new Exception('no argument at position '.$i.' ('.$pos.')');
-			}
-			else {
+			} else {
 				return null;
 			}
 		}

source/Threema/Core/AssocArray.php

Doc Comments +2 added lines, -2 removed lines

@@ -36,8 +36,8 @@
 	}
 
 	/**
-	 * @param $string
-	 * @param array|null $requiredKeys
+	 * @param string $string
+	 * @param string[] $requiredKeys
 	 * @return AssocArray
 	 * @throws Exception
 	 */

source/Threema/MsgApi/Commands/DownloadFile.php

Doc Comments +1 added lines, -1 removed lines

@@ -40,7 +40,7 @@
 	/**
 	 * @param int $httpCode
 	 * @param object $res
-	 * @return UploadFileResult
+	 * @return DownloadFileResult
 	 */
 	function parseResult($httpCode, $res){
 		return new DownloadFileResult($httpCode, $res);

source/Threema/MsgApi/Helpers/ReceiveMessageResult.php

Doc Comments +2 added lines, -2 removed lines

@@ -73,7 +73,7 @@ 
 	}
 
 	/**
-	 * @return \string[]
+	 * @return string[]
 	 */
 	public function getErrors() {
 		return $this->errors;
@@ -87,7 +87,7 @@ 
 	}
 
 	/**
-	 * @return \string[]
+	 * @return string[]
 	 */
 	public function getFiles() {
 		return $this->files;

source/Threema/MsgApi/Messages/DeliveryReceipt.php

Doc Comments +1 added lines, -1 removed lines

@@ -65,7 +65,7 @@
 
 	/**
 	 * Get the acknowledged message ids
-	 * @return array
+	 * @return string[]
 	 */
 	public function getAckedMessageIds() {
 		return $this->ackedMessageIds;

source/Threema/MsgApi/Tools/CryptTool.php

Doc Comments +13 added lines, -4 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);
 
@@ -376,7 +381,7 @@ 
 	abstract public function validate();
 
 	/**
-	 * @param $data
+	 * @param string $data
 	 * @return EncryptResult
 	 */
 	public final function encryptFile($data) {
@@ -388,7 +393,7 @@ 
 	/**
 	 * @param string $data as binary
 	 * @param string $key as binary
-	 * @return null|string
+	 * @return string
 	 */
 	public final function decryptFile($data, $key) {
 		$result =  $this->openSecretBox($data, self::FILE_NONCE, $key);
@@ -405,6 +410,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;

samples/testSendSimple.php

Braces +1 added lines, -2 removed lines

@@ -29,7 +29,6 @@
 $result = $connector->sendSimple($receiver, "This is a Test Message");
 if($result->isSuccess()) {
 	echo 'Message ID: '.$result->getMessageId() . "\n";
-}
-else {
+} else {
 	echo 'Error: '.$result->getErrorMessage() . "\n";
 }

source/Threema/Console/Run.php

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/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()) {