rugk / threema-msgapi-sdk-php

source/Threema/MsgApi/PublicKeyStores/File.php

Indentation +3 added lines, -3 removed lines

@@ -1,8 +1,8 @@
 <?php
 /**
- * @author Threema GmbH
- * @copyright Copyright (c) 2015 Threema GmbH
- */
+	 * @author Threema GmbH
+	 * @copyright Copyright (c) 2015 Threema GmbH
+	 */
 
 namespace Threema\MsgApi\PublicKeyStores;
 

Spacing +3 added lines, -3 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;
 				}

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/MsgApi/PublicKeyStores/PhpFile.php

Indentation +3 added lines, -3 removed lines

@@ -1,8 +1,8 @@
 <?php
 /**
- * @author Threema GmbH
- * @copyright Copyright (c) 2015 Threema GmbH
- */
+	 * @author Threema GmbH
+	 * @copyright Copyright (c) 2015 Threema GmbH
+	 */
 
 
 namespace Threema\MsgApi\PublicKeyStores;

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

Indentation +3 added lines, -3 removed lines

@@ -1,8 +1,8 @@
 <?php
 /**
- * @author Threema GmbH
- * @copyright Copyright (c) 2015 Threema GmbH
- */
+	 * @author Threema GmbH
+	 * @copyright Copyright (c) 2015 Threema GmbH
+	 */
 
 
 namespace Threema\MsgApi;

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/Tests/CommonTests.php

Indentation +3 added lines, -3 removed lines

@@ -1,8 +1,8 @@
 <?php
 /**
- * @author Threema GmbH
- * @copyright Copyright (c) 2015 Threema GmbH
- */
+	 * @author Threema GmbH
+	 * @copyright Copyright (c) 2015 Threema GmbH
+	 */
 
 
 

source/Threema/MsgApi/Tests/Constants.php

Indentation +3 added lines, -3 removed lines

@@ -1,8 +1,8 @@
 <?php
 /**
- * @author Threema GmbH
- * @copyright Copyright (c) 2015 Threema GmbH
- */
+	 * @author Threema GmbH
+	 * @copyright Copyright (c) 2015 Threema GmbH
+	 */
 
 
 namespace Threema\MsgApi\Tests;

source/Threema/MsgApi/Tests/CryptToolTest.php

Indentation +3 added lines, -3 removed lines

@@ -1,8 +1,8 @@
 <?php
 /**
- * @author Threema GmbH
- * @copyright Copyright (c) 2015 Threema GmbH
- */
+	 * @author Threema GmbH
+	 * @copyright Copyright (c) 2015 Threema GmbH
+	 */
 
 
 

Spacing +4 added lines, -4 removed lines

@@ -56,7 +56,7 @@ 
 
 			$this->assertNotNull($message);
 			$this->assertTrue($message instanceof TextMessage);
-			if($message instanceof TextMessage) {
+			if ($message instanceof TextMessage) {
 				$this->assertEquals($message->getText(), 'Dies ist eine Testnachricht. äöü');
 			}
 		});
@@ -92,7 +92,7 @@ 
 
 
 	public function testDerivePublicKey() {
-		$this->doTest(function(CryptTool $cryptTool, $prefix){
+		$this->doTest(function(CryptTool $cryptTool, $prefix) {
 			$publicKey = $cryptTool->derivePublicKey(hex2bin(Common::getPrivateKey(Constants::myPrivateKey)));
 			$myPublicKey = hex2bin(Common::getPublicKey(Constants::myPublicKey));
 
@@ -120,12 +120,12 @@ 
 		});
 	}
 	private function doTest(\Closure $c) {
-		foreach(array(
+		foreach (array(
 					'Salt' => CryptTool::createInstance(CryptTool::TYPE_SALT),
 					'Sodium' => CryptTool::createInstance(CryptTool::TYPE_SODIUM)
 				) as $key => $instance) {
 
-			if($instance === null) {
+			if ($instance === null) {
 				echo $key.": could not instance crypt tool\n";
 				break;
 			}

source/Threema/MsgApi/Tools/CryptToolSalt.php

Indentation +3 added lines, -3 removed lines

@@ -1,8 +1,8 @@
 <?php
 /**
- * @author Threema GmbH
- * @copyright Copyright (c) 2015 Threema GmbH
- */
+	 * @author Threema GmbH
+	 * @copyright Copyright (c) 2015 Threema GmbH
+	 */
 
 
 namespace Threema\MsgApi\Tools;

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/CryptToolSodium.php

Indentation +3 added lines, -3 removed lines

@@ -1,8 +1,8 @@
 <?php
 /**
- * @author Threema GmbH
- * @copyright Copyright (c) 2015 Threema GmbH
- */
+	 * @author Threema GmbH
+	 * @copyright Copyright (c) 2015 Threema GmbH
+	 */
 
 
 namespace Threema\MsgApi\Tools;

Spacing +1 added lines, -1 removed lines

@@ -121,7 +121,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/CryptToolSodiumDep.php

Indentation +3 added lines, -3 removed lines

@@ -1,8 +1,8 @@
 <?php
 /**
- * @author Threema GmbH
- * @copyright Copyright (c) 2015 Threema GmbH
- */
+	 * @author Threema GmbH
+	 * @copyright Copyright (c) 2015 Threema GmbH
+	 */
 
 
 namespace Threema\MsgApi\Tools;

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;