rugk / threema-msgapi-sdk-php

source/Threema/MsgApi/PublicKeyStore.php

Spacing +2 added lines, -2 removed lines

@@ -27,12 +27,12 @@
 	 * @return string|null
 	 */
 	public final function getPublicKey($threemaId) {
-		if(array_key_exists($threemaId, $this->cache)) {
+		if (array_key_exists($threemaId, $this->cache)) {
 			return $this->cache[$threemaId];
 		}
 
 		$publicKey = $this->findPublicKey($threemaId);
-		if(null !== $publicKey) {
+		if (null !== $publicKey) {
 			$this->cache[$threemaId] = $publicKey;
 		}
 		return $publicKey;

source/Threema/MsgApi/PublicKeyStores/File.php

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

Spacing +4 added lines, -4 removed lines

@@ -25,7 +25,7 @@ 
 	 * @throws Exception if the file does not exist or not writable
 	 */
 	public function __construct($file) {
-		if(false === is_writable($file)) {
+		if (false === is_writable($file)) {
 			throw new Exception('file '.$file.' does not exist or is not writable');
 		}
 		$this->file = $file;
@@ -39,7 +39,7 @@ 
 	 */
 	function findPublicKey($threemaId) {
 		$storeHandle = fopen($this->file, 'r');
-		if(false === $storeHandle) {
+		if (false === $storeHandle) {
 			throw new Exception('could not open file '.$this->file);
 		}
 		else {
@@ -47,7 +47,7 @@ 
 			$publicKey = null;
 			while (!feof($storeHandle)) {
 				$buffer = fgets($storeHandle, 4096);
-				if(substr($buffer, 0, 8) == $threemaId) {
+				if (substr($buffer, 0, 8) == $threemaId) {
 					$publicKey = str_replace("\n", '', substr($buffer, 8));
 					continue;
 				}
@@ -74,7 +74,7 @@ 
 	 * @return File
 	 */
 	public static function create($path) {
-		if(false === file_exists($path)) {
+		if (false === file_exists($path)) {
 			//touch
 			touch($path);
 		}

source/Threema/MsgApi/PublicKeyStores/PhpFile.php

Spacing +11 added lines, -11 removed lines

@@ -43,10 +43,10 @@ 
 	public function __construct($file)
 	{
 		if (false === is_writable($file)) {
-			throw new Exception('file ' . $file . ' does not exist or is not writable');
+			throw new Exception('file '.$file.' does not exist or is not writable');
 		}
 		if (pathinfo($file, PATHINFO_EXTENSION) != 'php') {
-			throw new Exception('file ' . $file . ' is not a valid PHP file');
+			throw new Exception('file '.$file.' is not a valid PHP file');
 		}
 		$this->file = $file;
 	}
@@ -104,12 +104,12 @@ 
 
 		//add key
 		$this->keystore[$threemaId] = $publicKey;
-		$content = '$keystore[\'' . $threemaId . '\'] = \'' . $publicKey . '\';' . PHP_EOL;
+		$content = '$keystore[\''.$threemaId.'\'] = \''.$publicKey.'\';'.PHP_EOL;
 
 		//write content
 		$fileadd = file_put_contents($this->file, $content, FILE_APPEND);
 		if (!$fileadd) {
-			throw new Exception('could not write to file ' . $this->file);
+			throw new Exception('could not write to file '.$this->file);
 		}
 
 		return true;
@@ -137,28 +137,28 @@ 
 
 			//check for success
 			if (null === $fileHandle) {
-				throw new Exception('could not open file ' . $this->file);
+				throw new Exception('could not open file '.$this->file);
 			}
 		}
 
 		//create content
-		$content = $this->fileBlocker . PHP_EOL;
+		$content = $this->fileBlocker.PHP_EOL;
 		$content .= PHP_EOL;
-		$content .= '//Threema MsgApi phpfile keystore' . PHP_EOL;
-		$content .= '//DO NOT EDIT THIS FILE!' . PHP_EOL;
+		$content .= '//Threema MsgApi phpfile keystore'.PHP_EOL;
+		$content .= '//DO NOT EDIT THIS FILE!'.PHP_EOL;
 		$content .= PHP_EOL;
 
 		//write file
 		$fwrite = fwrite($fileHandle, $content);
 		if (!$fwrite) {
-			throw new Exception('could not write to file ' . $this->file);
+			throw new Exception('could not write to file '.$this->file);
 		}
 
 		//close file if necessary
 		if ($fileopened) {
 			$fclose = fclose($fileHandle);
 			if (!$fclose) {
-				throw new Exception('error while processing file ' . $this->file);
+				throw new Exception('error while processing file '.$this->file);
 			}
 		}
 		return true;
@@ -170,7 +170,7 @@ 
 	 * @return PhpFile
 	 */
 	public static function create($path) {
-		if(false === file_exists($path)) {
+		if (false === file_exists($path)) {
 			//touch
 			touch($path);
 		}

source/Threema/MsgApi/Receiver.php

Spacing +1 added lines, -1 removed lines

@@ -73,7 +73,7 @@
 	 * @throws \InvalidArgumentException
 	 */
 	public function getParams() {
-		switch($this->type) {
+		switch ($this->type) {
 			case self::TYPE_ID:
 				$to = $this->type;
 				$this->value = strtoupper(trim($this->value));

source/Threema/MsgApi/Tools/CryptToolSalt.php

Spacing +5 added lines, -5 removed lines

@@ -48,7 +48,7 @@ 
 	 * @return null|string
 	 */
 	protected function openBox($box, $recipientPrivateKey, $senderPublicKey, $nonce) {
-		$boxPad = str_repeat("\x00", 16) . $box;
+		$boxPad = str_repeat("\x00", 16).$box;
 		try {
 			$data = Salt::box_open($boxPad, $recipientPrivateKey, $senderPublicKey, $nonce);
 		} catch (\SaltException $e) {
@@ -71,7 +71,7 @@ 
 	 * @return string as binary
 	 */
 	protected function openSecretBox($box, $nonce, $key) {
-		$boxPad = str_repeat("\x00", 16) . $box;
+		$boxPad = str_repeat("\x00", 16).$box;
 		$data = Salt::secretbox_open($boxPad, $nonce, $key);
 
 		if ($data) {
@@ -130,7 +130,7 @@ 
 			Salt::decodeInput($nonce),
 			$key);
 
-		if($data === false) {
+		if ($data === false) {
 			throw new Exception('encryption failed');
 		}
 
@@ -152,11 +152,11 @@ 
 	 * @throws Exception
 	 */
 	public function validate() {
-		if(false === $this->isSupported()) {
+		if (false === $this->isSupported()) {
 			throw new Exception('SALT implementation not supported');
 		}
 
-		if(PHP_INT_SIZE < 8) {
+		if (PHP_INT_SIZE < 8) {
 			throw new Exception('Pure PHP Crypto implementation requires 64Bit PHP. Please install the libsodium PHP extension.');
 		}
 		return true;

source/Threema/MsgApi/Tools/CryptToolSodiumDep.php

Spacing +1 added lines, -1 removed lines

@@ -124,7 +124,7 @@
 	 * @throws Exception
 	 */
 	public function validate() {
-		if(false === $this->isSupported()) {
+		if (false === $this->isSupported()) {
 			throw new Exception('Sodium implementation not supported');
 		}
 		return true;

source/Threema/MsgApi/Tools/FileAnalysisTool.php

Spacing +5 added lines, -5 removed lines

@@ -14,12 +14,12 @@ 
 	 */
 	public static function analyse($file) {
 		//check if file exists
-		if(false === file_exists($file)) {
+		if (false === file_exists($file)) {
 			return null;
 		}
 
 		//is not a file
-		if(false === is_file($file)) {
+		if (false === is_file($file)) {
 			return null;
 		}
 
@@ -28,16 +28,16 @@ 
 
 		$mimeType = null;
 		//mime type getter
-		if(function_exists('finfo_open')) {
+		if (function_exists('finfo_open')) {
 			$finfo = finfo_open(FILEINFO_MIME_TYPE);
 			$mimeType = finfo_file($finfo, $file);
 		}
-		else if(function_exists('mime_content_type')) {
+		else if (function_exists('mime_content_type')) {
 			$mimeType = mime_content_type($file);
 		}
 
 		//default mime type
-		if(strlen($mimeType) == 0) {
+		if (strlen($mimeType) == 0) {
 			//default mime type
 			$mimeType = 'application/octet-stream';
 		}

Braces +1 added lines, -2 removed lines

@@ -31,8 +31,7 @@
 		if(function_exists('finfo_open')) {
 			$finfo = finfo_open(FILEINFO_MIME_TYPE);
 			$mimeType = finfo_file($finfo, $file);
-		}
-		else if(function_exists('mime_content_type')) {
+		} else if(function_exists('mime_content_type')) {
 			$mimeType = mime_content_type($file);
 		}
 

threema-msgapi-tool.php

Spacing +2 added lines, -2 removed lines

@@ -8,7 +8,7 @@ 
 //disallow using the cli tool in a web project
 if ('cli' !== php_sapi_name() || null === $argv) {
 	//file not called from the cli
-	die('please run ' . basename(__FILE__) . ' only in a cli. '.
+	die('please run '.basename(__FILE__).' only in a cli. '.
 		'To use the threema msgapi sdk in your web project, include the source/bootstrap.php or the threema_msgapi.phar file.');
 }
 try {
@@ -20,6 +20,6 @@ 
 		Threema\MsgApi\PublicKeyStores\PhpFile::create('keystore.php'));
 	$tool->run();
 } catch (\Threema\Core\Exception $exception) {
-	echo "ERROR: " . $exception->getMessage() . "\n";
+	echo "ERROR: ".$exception->getMessage()."\n";
 	die();
 }

source/Threema/Console/Command/Credits.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)) {