rugk / threema-msgapi-sdk-php

samples/testFetchPublicKey.php

Spacing +3 added lines, -3 removed lines

@@ -22,9 +22,9 @@
 
 
 $result = $connector->fetchPublicKey('ECHOECHO');
-if($result->isSuccess()) {
-	echo 'public key '.$result->getPublicKey() . "\n";
+if ($result->isSuccess()) {
+	echo 'public key '.$result->getPublicKey()."\n";
 }
 else {
-	echo 'error '.$result->getErrorMessage() . "\n";
+	echo 'error '.$result->getErrorMessage()."\n";
 }

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

samples/testKeyLookup.php

Spacing +3 added lines, -3 removed lines

@@ -21,9 +21,9 @@
 $connector = new Connection($settings, $publicKeyStore);
 
 $result = $connector->keyLookupByPhoneNumber('123456789');
-if($result->isSuccess()) {
-	echo 'Threema ID found: '.$result->getId() . "\n";
+if ($result->isSuccess()) {
+	echo 'Threema ID found: '.$result->getId()."\n";
 }
 else {
-	echo 'Error: '.$result->getErrorMessage() . "\n";
+	echo 'Error: '.$result->getErrorMessage()."\n";
 }

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

samples/testSendE2EFile.php

Spacing +4 added lines, -4 removed lines

@@ -23,12 +23,12 @@
 $senderPrivateKey = "MY_PUBLIC_KEY_IN_BIN";
 $filePath = "/path/to/my/file.pdf";
 
-$e2eHelper = new \Threema\MsgApi\Helpers\E2EHelper($senderPrivateKey,$connector);
+$e2eHelper = new \Threema\MsgApi\Helpers\E2EHelper($senderPrivateKey, $connector);
 $result = $e2eHelper->sendFileMessage("TEST1234", $filePath);
 
-if(true === $result->isSuccess()) {
-	echo 'File Message ID: '.$result->getMessageId() . "\n";
+if (true === $result->isSuccess()) {
+	echo 'File Message ID: '.$result->getMessageId()."\n";
 }
 else {
-	echo 'Error: '.$result->getErrorMessage() . "\n";
+	echo 'Error: '.$result->getErrorMessage()."\n";
 }

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

samples/testSendE2EText.php

Spacing +4 added lines, -4 removed lines

@@ -22,12 +22,12 @@
 
 $senderPrivateKey = "MY_PUBLIC_KEY_IN_BIN";
 
-$e2eHelper = new \Threema\MsgApi\Helpers\E2EHelper($senderPrivateKey,$connector);
+$e2eHelper = new \Threema\MsgApi\Helpers\E2EHelper($senderPrivateKey, $connector);
 $result = $e2eHelper->sendTextMessage("TEST1234", "This is an end-to-end encrypted message");
 
-if(true === $result->isSuccess()) {
-	echo 'Message ID: '.$result->getMessageId() . "\n";
+if (true === $result->isSuccess()) {
+	echo 'Message ID: '.$result->getMessageId()."\n";
 }
 else {
-	echo 'Error: '.$result->getErrorMessage() . "\n";
+	echo 'Error: '.$result->getErrorMessage()."\n";
 }

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

samples/testSendSimple.php

Spacing +3 added lines, -3 removed lines

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

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/Command/Base.php

Spacing +18 added lines, -18 removed lines

@@ -68,7 +68,7 @@ 
 	 * @return int
 	 */
 	public function getAllArgumentsCount() {
-		return $this->getRequiredArgumentCount() + (null !== $this->optionalArguments ? count($this->optionalArguments) : 0);
+		return $this->getRequiredArgumentCount()+(null !== $this->optionalArguments ? count($this->optionalArguments) : 0);
 	}
 
 	/**
@@ -76,15 +76,15 @@ 
 	 * @return int
 	 * @throws \Threema\Core\Exception
 	 */
-	private function getIndexByPos($pos){
+	private function getIndexByPos($pos) {
 		$i = array_search($pos, $this->requiredArguments);
-		if(false === $i) {
+		if (false === $i) {
 			$i = array_search($pos, $this->optionalArguments);
-			if(false !== $i) {
+			if (false !== $i) {
 				$i += count($this->requiredArguments);
 			}
 		}
-		if(false === $i) {
+		if (false === $i) {
 			throw new Exception('argument '.$pos.' not found');
 		}
 
@@ -100,8 +100,8 @@ 
 		$i = $this->getIndexByPos($pos);
 		$required = $i < count($this->requiredArguments);
 
-		if(false === array_key_exists($i, $this->arguments)) {
-			if(true === $required) {
+		if (false === array_key_exists($i, $this->arguments)) {
+			if (true === $required) {
 				throw new Exception('no argument at position '.$i.' ('.$pos.')');
 			}
 			else {
@@ -121,7 +121,7 @@ 
 	public function getArgumentFile($pos) {
 		$i = $this->getIndexByPos($pos);
 
-		if(false === is_file($this->arguments[$i])) {
+		if (false === is_file($this->arguments[$i])) {
 			throw new Exception('argument '.$i.' is not a file');
 		}
 
@@ -134,7 +134,7 @@ 
 	 */
 	public function getArgumentPrivateKey($pos) {
 		$content = Common::getPrivateKey($this->getArgumentStringOrFileContent($pos));
-		if(null !== $content) {
+		if (null !== $content) {
 			return hex2bin($content);
 		}
 		return null;
@@ -146,7 +146,7 @@ 
 	 */
 	public function getArgumentPublicKey($pos) {
 		$content = Common::getPublicKey($this->getArgumentStringOrFileContent($pos));
-		if(null !== $content) {
+		if (null !== $content) {
 			return hex2bin($content);
 		}
 		return null;
@@ -158,7 +158,7 @@ 
 	 */
 	private function getArgumentStringOrFileContent($pos) {
 		$content = $this->getArgument($pos);
-		if(file_exists($content)) {
+		if (file_exists($content)) {
 			$content = trim(file_get_contents($content));
 		}
 		return $content;
@@ -170,7 +170,7 @@ 
 	 */
 	public function getArgumentThreemaId($pos) {
 		$content = $this->getArgument($pos);
-		if(null !== $content && strlen($content) == 8) {
+		if (null !== $content && strlen($content) == 8) {
 			return strtoupper($content);
 		}
 		return null;
@@ -180,12 +180,12 @@ 
 	 * @return string
 	 */
 	protected function readStdIn() {
-		$f = fopen( 'php://stdin', 'r' );
+		$f = fopen('php://stdin', 'r');
 
 		$lines = array();
-		while( $line = trim(fgets($f)) ) {
+		while ($line = trim(fgets($f))) {
 
-			if(strlen($line) == 0 || $line == "\n") {
+			if (strlen($line) == 0 || $line == "\n") {
 				continue;
 			}
 
@@ -204,7 +204,7 @@ 
 
 		$argCount = null !== $this->arguments ? count($this->arguments) : 0;
 
-		if($argCount < count($this->requiredArguments)) {
+		if ($argCount < count($this->requiredArguments)) {
 			throw new Exception('invalid count of arguments');
 		}
 		$this->doRun();
@@ -217,10 +217,10 @@ 
 	final public function help($shellColors = true) {
 		$args = array_merge($this->requiredArguments, $this->optionalArguments);
 
-		if(count($args) > 0) {
+		if (count($args) > 0) {
 			$colorPrefix = '';
 			$colorPostfix = '';
-			if(true === $shellColors) {
+			if (true === $shellColors) {
 				$colorPrefix = "\033[0;36m\033[40m";
 				$colorPostfix = "\033[0m";
 			}

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/Console/Command/Capability.php

Spacing +2 added lines, -2 removed lines

@@ -36,7 +36,7 @@ 
 
 		Common::required($threemaId, $from, $secret);
 
-		if(strlen($threemaId) != 8) {
+		if (strlen($threemaId) != 8) {
 			throw new Exception('invalid threema id');
 		}
 		//define connection settings
@@ -47,7 +47,7 @@ 
 
 		$result = $connector->keyCapability($threemaId);
 		Common::required($result);
-		if($result->isSuccess()) {
+		if ($result->isSuccess()) {
 			Common::l(implode("\n", $result->getCapabilities()));
 		}
 		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/LookupIdByEmail.php

Spacing +2 added lines, -2 removed lines

@@ -43,9 +43,9 @@
 		//create a connection
 		$connector = new Connection($settings, $this->publicKeyStore);
 
-		$result = $connector->keyLookupByEmail($email);;
+		$result = $connector->keyLookupByEmail($email); ;
 		Common::required($result);
-		if($result->isSuccess()) {
+		if ($result->isSuccess()) {
 			Common::l($result->getId());
 		}
 		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/LookupIdByPhoneNo.php

Spacing +2 added lines, -2 removed lines

@@ -43,9 +43,9 @@
 		//create a connection
 		$connector = new Connection($settings, $this->publicKeyStore);
 
-		$result = $connector->keyLookupByPhoneNumber($phoneNo);;
+		$result = $connector->keyLookupByPhoneNumber($phoneNo); ;
 		Common::required($result);
-		if($result->isSuccess()) {
+		if ($result->isSuccess()) {
 			Common::l($result->getId());
 		}
 		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)) {