rugk / threema-msgapi-sdk-php

source/Threema/Console/Command/LookupPublicKeyById.php

Spacing +1 added lines, -1 removed lines

@@ -42,7 +42,7 @@
 		$connector = new Connection($settings, $this->publicKeyStore);
 
 		$result = $connector->fetchPublicKey($id);
-		if($result->isSuccess()) {
+		if ($result->isSuccess()) {
 			Common::l(Common::convertPublicKey($result->getPublicKey()));
 		}
 		else {

Braces +1 added lines, -2 removed lines

@@ -44,8 +44,7 @@
 		$result = $connector->fetchPublicKey($id);
 		if($result->isSuccess()) {
 			Common::l(Common::convertPublicKey($result->getPublicKey()));
-		}
-		else {
+		} else {
 			Common::e($result->getErrorMessage());
 		}
 	}

source/Threema/Console/Command/ReceiveMessage.php

Spacing +3 added lines, -3 removed lines

@@ -61,14 +61,14 @@
 			$outputFolder
 		);
 
-		if(null === $message) {
+		if (null === $message) {
 			Common::e('invalid message');
 			return;
 		}
 
-		if($message->isSuccess()) {
+		if ($message->isSuccess()) {
 			Common::l($message->getMessageId().' - '.$message->getThreemaMessage());
-			foreach($message->getFiles() as $fileName => $filePath) {
+			foreach ($message->getFiles() as $fileName => $filePath) {
 				Common::l('   received file '.$fileName.' in '.$filePath);
 			}
 		}

Braces +1 added lines, -2 removed lines

@@ -71,8 +71,7 @@
 			foreach($message->getFiles() as $fileName => $filePath) {
 				Common::l('   received file '.$fileName.' in '.$filePath);
 			}
-		}
-		else {
+		} else {
 			Common::e('Error: '.implode("\n", $message->getErrors()));
 		}
 	}

source/Threema/Console/Command/SendE2EFile.php

Spacing +1 added lines, -1 removed lines

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

Braces +1 added lines, -2 removed lines

@@ -55,8 +55,7 @@
 
 		if($result->isSuccess()) {
 			Common::l('Message ID: '.$result->getMessageId());
-		}
-		else {
+		} else {
 			Common::e('Error: '.$result->getErrorMessage());
 		}
 	}

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

@@ -55,8 +55,7 @@
 
 		if($result->isSuccess()) {
 			Common::l('Message ID: '.$result->getMessageId());
-		}
-		else {
+		} else {
 			Common::e('Error: '.$result->getErrorMessage());
 		}
 	}

source/Threema/Console/Command/SendE2EText.php

Spacing +2 added lines, -2 removed lines

@@ -38,7 +38,7 @@ 
 		Common::required($threemaId, $from, $secret, $privateKey);
 
 		$message = $this->readStdIn();
-		if(strlen($message) === 0) {
+		if (strlen($message) === 0) {
 			throw new \InvalidArgumentException('please define a message');
 		}
 
@@ -52,7 +52,7 @@ 
 		$helper = new E2EHelper($privateKey, $connector);
 		$result = $helper->sendTextMessage($threemaId, $message);
 
-		if($result->isSuccess()) {
+		if ($result->isSuccess()) {
 			Common::l('Message ID: '.$result->getMessageId());
 		}
 		else {

Braces +1 added lines, -2 removed lines

@@ -55,8 +55,7 @@
 
 		if($result->isSuccess()) {
 			Common::l('Message ID: '.$result->getMessageId());
-		}
-		else {
+		} else {
 			Common::e('Error: '.$result->getErrorMessage());
 		}
 	}

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

@@ -51,8 +51,7 @@
 		$result = $connector->sendSimple($receiver, $message);
 		if($result->isSuccess()) {
 			Common::l('Message ID: '.$result->getMessageId());
-		}
-		else {
+		} else {
 			Common::l('Error: '.$result->getErrorMessage());
 		}
 	}

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

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);
 				}

Spacing +16 added lines, -16 removed lines

@@ -88,15 +88,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');
 				}
@@ -115,17 +115,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);
@@ -134,11 +134,11 @@ 
 			}
 		}
 
-		if($argumentLength > 0) {
+		if ($argumentLength > 0) {
 			array_splice($this->arguments, 0, $argumentLength);
 		}
 
-		if(null === $found) {
+		if (null === $found) {
 			$this->help();
 		}
 		else {
@@ -147,7 +147,7 @@ 
 			try {
 				$found->run($this->arguments);
 			}
-			catch(Exception $x) {
+			catch (Exception $x) {
 				Common::l();
 				Common::e('ERROR: '.$x->getMessage());
 				Common::e(get_class($x));
@@ -166,8 +166,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();
@@ -184,10 +184,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 {

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');
 				}
 			}