rugk / threema-msgapi-sdk-php

source/Threema/MsgApi/Commands/Credits.php

Spacing +1 added lines, -1 removed lines

@@ -27,7 +27,7 @@
 	 * @param object $res
 	 * @return CreditsResult
 	 */
-	public function parseResult($httpCode, $res){
+	public function parseResult($httpCode, $res) {
 		return new CreditsResult($httpCode, $res);
 	}
 }

source/Threema/MsgApi/Commands/SendE2E.php

Spacing +1 added lines, -1 removed lines

@@ -76,7 +76,7 @@
 	 * @param object $res
 	 * @return SendE2EResult
 	 */
-	public function parseResult($httpCode, $res){
+	public function parseResult($httpCode, $res) {
 		return new SendE2EResult($httpCode, $res);
 	}
 }

source/Threema/MsgApi/Tools/CryptTool.php

Spacing +19 added lines, -19 removed lines

@@ -42,8 +42,8 @@ 
 	 * @return CryptTool
 	 */
 	public static function getInstance() {
-		if(null === self::$instance) {
-			foreach(array(
+		if (null === self::$instance) {
+			foreach (array(
 				function() {
 					return self::createInstance(self::TYPE_SODIUM);
 				},
@@ -51,7 +51,7 @@ 
 					return self::createInstance(self::TYPE_SALT);
 				}) as $instanceGenerator) {
 				$i = $instanceGenerator->__invoke();
-				if(null !== $i) {
+				if (null !== $i) {
 					self::$instance = $i;
 					break;
 				}
@@ -66,18 +66,18 @@ 
 	 * @return null|CryptTool null on unknown type
 	 */
 	public static function createInstance($type) {
-		switch($type) {
+		switch ($type) {
 			case self::TYPE_SODIUM:
 				$instance = new CryptToolSodium();
-				if(false === $instance->isSupported()) {
+				if (false === $instance->isSupported()) {
 					//try to instance old version of sodium wrapper
 					/** @noinspection PhpDeprecationInspection */
 					$instance = new CryptToolSodiumDep();
 				}
-				return $instance->isSupported() ? $instance :null;
+				return $instance->isSupported() ? $instance : null;
 			case self::TYPE_SALT:
 				$instance = new CryptToolSalt();
-				return $instance->isSupported() ? $instance :null;
+				return $instance->isSupported() ? $instance : null;
 			default:
 				return null;
 		}
@@ -105,7 +105,7 @@ 
 	 */
 	final public function encryptMessageText($text, $senderPrivateKey, $recipientPublicKey, $nonce) {
 		/* prepend type byte (0x01) to message data */
-		$textBytes = "\x01" . $text;
+		$textBytes = "\x01".$text;
 
 		/* determine random amount of PKCS7 padding */
 		$padbytes = $this->generatePadBytes();
@@ -130,7 +130,7 @@ 
 			$senderPrivateKey,
 			$recipientPublicKey,
 			$nonce) {
-		$message = "\x02" . $this->hex2bin($uploadFileResult->getBlobId());
+		$message = "\x02".$this->hex2bin($uploadFileResult->getBlobId());
 		$message .= pack('V', $encryptResult->getSize());
 		$message .= $encryptResult->getNonce();
 
@@ -161,11 +161,11 @@ 
 			'i' => 0
 		);
 
-		if($thumbnailUploadFileResult !== null && strlen($thumbnailUploadFileResult->getBlobId()) > 0) {
+		if ($thumbnailUploadFileResult !== null && strlen($thumbnailUploadFileResult->getBlobId()) > 0) {
 			$messageContent['t'] = $thumbnailUploadFileResult->getBlobId();
 		}
 
-		$message = "\x17" . json_encode($messageContent);
+		$message = "\x17".json_encode($messageContent);
 
 		/* determine random amount of PKCS7 padding */
 		$padbytes = $this->generatePadBytes();
@@ -238,7 +238,7 @@ 
 
 		/* remove padding */
 		$padbytes = ord($data[strlen($data)-1]);
-		$realDataLength = strlen($data) - $padbytes;
+		$realDataLength = strlen($data)-$padbytes;
 		if ($realDataLength < 1) {
 			throw new BadMessageException();
 		}
@@ -264,7 +264,7 @@ 
 				return new TextMessage(substr($data, 1));
 			case DeliveryReceipt::TYPE_CODE:
 				/* Delivery receipt */
-				if ($realDataLength < (self::MESSAGE_ID_LEN-2) || (($realDataLength - 2) % self::MESSAGE_ID_LEN) != 0)  {
+				if ($realDataLength < (self::MESSAGE_ID_LEN-2) || (($realDataLength-2)%self::MESSAGE_ID_LEN) != 0) {
 					throw new BadMessageException();
 				}
 
@@ -274,7 +274,7 @@ 
 				return new DeliveryReceipt($receiptType, $messageIds);
 			case ImageMessage::TYPE_CODE:
 				/* Image Message */
-				if ($realDataLength != 1 + self::BLOB_ID_LEN + self::IMAGE_FILE_SIZE_LEN + self::IMAGE_NONCE_LEN)  {
+				if ($realDataLength != 1+self::BLOB_ID_LEN+self::IMAGE_FILE_SIZE_LEN+self::IMAGE_NONCE_LEN) {
 					throw new BadMessageException();
 				}
 
@@ -285,12 +285,12 @@ 
 			case FileMessage::TYPE_CODE:
 				/* Image Message */
 				$decodeResult = json_decode(substr($data, 1), true);
-				if(null === $decodeResult || false === $decodeResult) {
+				if (null === $decodeResult || false === $decodeResult) {
 					throw new BadMessageException();
 				}
 
 				$values = AssocArray::byJsonString(substr($data, 1), array('b', 't', 'k', 'm', 'n', 's'));
-				if(null === $values) {
+				if (null === $values) {
 					throw new BadMessageException();
 				}
 
@@ -392,7 +392,7 @@ 
 	 * @return null|string
 	 */
 	public final function decryptFile($data, $key) {
-		$result =  $this->openSecretBox($data, self::FILE_NONCE, $key);
+		$result = $this->openSecretBox($data, self::FILE_NONCE, $key);
 		return false === $result ? null : $result;
 	}
 
@@ -403,7 +403,7 @@ 
 	 */
 	public final function encryptFileThumbnail($data, $key) {
 		$box = $this->makeSecretBox($data, self::FILE_THUMBNAIL_NONCE, $key);
-		return new EncryptResult($box, $key,  self::FILE_THUMBNAIL_NONCE, strlen($box));
+		return new EncryptResult($box, $key, self::FILE_THUMBNAIL_NONCE, strlen($box));
 	}
 
 	public final function decryptFileThumbnail($data, $key) {
@@ -450,7 +450,7 @@ 
 	 */
 	private function generatePadBytes() {
 		$padbytes = 0;
-		while($padbytes < 1 || $padbytes > 255) {
+		while ($padbytes < 1 || $padbytes > 255) {
 			$padbytes = ord($this->createRandom(1));
 		}
 		return $padbytes;

scripts/buildPhar.php

Spacing +2 added lines, -2 removed lines

@@ -2,8 +2,8 @@
 <?php
 // set variables
 $dir = dirname(__DIR__);
-$source = dirname(__DIR__) . '/source';
-$file = $dir . '/threema_msgapi.phar';
+$source = dirname(__DIR__).'/source';
+$file = $dir.'/threema_msgapi.phar';
 
 // preparation
 if (!is_dir($dir)) {

source/Threema/Console/Command/Base.php

Spacing +18 added lines, -18 removed lines

@@ -69,7 +69,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);
 	}
 
 	/**
@@ -77,15 +77,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');
 		}
 
@@ -101,8 +101,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 {
@@ -122,7 +122,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');
 		}
 
@@ -136,7 +136,7 @@ 
 	public function getArgumentPrivateKey($pos) {
 		$content = Common::getPrivateKey($this->getArgumentStringOrFileContent($pos));
 		$cryptTool = CryptTool::getInstance();
-		if(null !== $content) {
+		if (null !== $content) {
 			return $cryptTool->hex2bin($content);
 		}
 		return null;
@@ -149,7 +149,7 @@ 
 	public function getArgumentPublicKey($pos) {
 		$content = Common::getPublicKey($this->getArgumentStringOrFileContent($pos));
 		$cryptTool = CryptTool::getInstance();
-		if(null !== $content) {
+		if (null !== $content) {
 			return $cryptTool->hex2bin($content);
 		}
 		return null;
@@ -161,7 +161,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;
@@ -173,7 +173,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;
@@ -183,12 +183,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;
 			}
 
@@ -207,7 +207,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();
@@ -220,10 +220,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";
 			}

source/Threema/Console/Run.php

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

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 @@ 
 	 */
 	public 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/Helpers/E2EHelper.php

Spacing +28 added lines, -28 removed lines

@@ -42,7 +42,7 @@ 
 		$this->cryptTool = $cryptTool;
 		$this->privateKey = $privateKey;
 
-		if(null === $this->cryptTool) {
+		if (null === $this->cryptTool) {
 			$this->cryptTool = CryptTool::getInstance();
 		}
 	}
@@ -84,11 +84,11 @@ 
 		//analyse the file
 		$fileAnalyzeResult = FileAnalysisTool::analyse($imagePath);
 
-		if(null === $fileAnalyzeResult) {
+		if (null === $fileAnalyzeResult) {
 			throw new Exception('could not analyze the file');
 		}
 
-		if(false === in_array($fileAnalyzeResult->getMimeType(), array(
+		if (false === in_array($fileAnalyzeResult->getMimeType(), array(
 				'image/jpg',
 				'image/jpeg',
 				'image/png' ))) {
@@ -102,9 +102,9 @@ 
 
 		//encrypt the image file
 		$encryptionResult = $this->cryptTool->encryptImage(file_get_contents($imagePath), $this->privateKey, $receiverPublicKey);
-		$uploadResult =  $this->connection->uploadFile($encryptionResult->getData());
+		$uploadResult = $this->connection->uploadFile($encryptionResult->getData());
 
-		if($uploadResult === null || !$uploadResult->isSuccess()) {
+		if ($uploadResult === null || !$uploadResult->isSuccess()) {
 			throw new Exception('could not upload the image ('.$uploadResult->getErrorCode().' '.$uploadResult->getErrorMessage().') '.$uploadResult->getRawResponse());
 		}
 
@@ -134,7 +134,7 @@ 
 		//analyse the file
 		$fileAnalyzeResult = FileAnalysisTool::analyse($filePath);
 
-		if(null === $fileAnalyzeResult) {
+		if (null === $fileAnalyzeResult) {
 			throw new Exception('could not analyze the file');
 		}
 
@@ -145,21 +145,21 @@ 
 
 		//encrypt the main file
 		$encryptionResult = $this->cryptTool->encryptFile(file_get_contents($filePath));
-		$uploadResult =  $this->connection->uploadFile($encryptionResult->getData());
+		$uploadResult = $this->connection->uploadFile($encryptionResult->getData());
 
-		if($uploadResult === null || !$uploadResult->isSuccess()) {
+		if ($uploadResult === null || !$uploadResult->isSuccess()) {
 			throw new Exception('could not upload the file ('.$uploadResult->getErrorCode().' '.$uploadResult->getErrorMessage().') '.$uploadResult->getRawResponse());
 		}
 
 		$thumbnailUploadResult = null;
 
 		//encrypt the thumbnail file (if exists)
-		if(strlen($thumbnailPath) > 0 && true === file_exists($thumbnailPath)) {
+		if (strlen($thumbnailPath) > 0 && true === file_exists($thumbnailPath)) {
 			//encrypt the main file
 			$thumbnailEncryptionResult = $this->cryptTool->encryptFileThumbnail(file_get_contents($thumbnailPath), $encryptionResult->getKey());
 			$thumbnailUploadResult = $this->connection->uploadFile($thumbnailEncryptionResult->getData());
 
-			if($thumbnailUploadResult === null || !$thumbnailUploadResult->isSuccess()) {
+			if ($thumbnailUploadResult === null || !$thumbnailUploadResult->isSuccess()) {
 				throw new Exception('could not upload the thumbnail file ('.$thumbnailUploadResult->getErrorCode().' '.$thumbnailUploadResult->getErrorMessage().') '.$thumbnailUploadResult->getRawResponse());
 			}
 		}
@@ -209,7 +209,7 @@ 
 		//fetch the public key
 		$receiverPublicKey = $this->connection->fetchPublicKey($threemaId);
 
-		if(null === $receiverPublicKey || !$receiverPublicKey->isSuccess()) {
+		if (null === $receiverPublicKey || !$receiverPublicKey->isSuccess()) {
 			throw new Exception('Invalid threema id');
 		}
 
@@ -220,22 +220,22 @@ 
 			$nonce
 		);
 
-		if(null === $message || false === is_object($message)) {
+		if (null === $message || false === is_object($message)) {
 			throw new Exception('Could not encrypt box');
 		}
 
 		$receiveResult = new ReceiveMessageResult($messageId, $message);
 
-		if($outputFolder === false) {
+		if ($outputFolder === false) {
 			return $receiveResult;
 		}
-		if($outputFolder === null || strlen($outputFolder) == 0) {
+		if ($outputFolder === null || strlen($outputFolder) == 0) {
 			$outputFolder = '.';
 		}
 
-		if($message instanceof ImageMessage) {
+		if ($message instanceof ImageMessage) {
 			$result = $this->downloadFile($message, $message->getBlobId(), $downloadMessage);
-			if(null !== $result && true === $result->isSuccess()) {
+			if (null !== $result && true === $result->isSuccess()) {
 				$image = $this->cryptTool->decryptImage(
 					$result->getData(),
 					$this->cryptTool->hex2bin($receiverPublicKey->getPublicKey()),
@@ -247,7 +247,7 @@ 
 					throw new Exception('decryption of image failed');
 				}
 				//save file
-				$filePath = $outputFolder . '/' . $messageId . '.jpg';
+				$filePath = $outputFolder.'/'.$messageId.'.jpg';
 				$f = fopen($filePath, 'w+');
 				fwrite($f, $image);
 				fclose($f);
@@ -255,10 +255,10 @@ 
 				$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()) {
+			if (null !== $result && true === $result->isSuccess()) {
 				$file = $this->cryptTool->decryptFile(
 					$result->getData(),
 					$this->cryptTool->hex2bin($message->getEncryptionKey()));
@@ -268,20 +268,20 @@ 
 				}
 
 				//save file
-				$filePath = $outputFolder . '/' . $messageId . '-' . $message->getFilename();
+				$filePath = $outputFolder.'/'.$messageId.'-'.$message->getFilename();
 				file_put_contents($filePath, $file);
 
 				$receiveResult->addFile('file', $filePath);
 			}
 
-			if(null !== $message->getThumbnailBlobId() && strlen($message->getThumbnailBlobId()) > 0) {
+			if (null !== $message->getThumbnailBlobId() && strlen($message->getThumbnailBlobId()) > 0) {
 				$result = $this->downloadFile($message, $message->getThumbnailBlobId(), $downloadMessage);
-				if(null !== $result && true === $result->isSuccess()) {
+				if (null !== $result && true === $result->isSuccess()) {
 					$file = $this->cryptTool->decryptFileThumbnail(
 						$result->getData(),
 						$this->cryptTool->hex2bin($message->getEncryptionKey()));
 
-					if(null === $file) {
+					if (null === $file) {
 						throw new Exception('thumbnail decryption failed');
 					}
 					//save file
@@ -327,14 +327,14 @@ 
 		//fetch the public key
 		$receiverPublicKey = $this->connection->fetchPublicKey($threemaId);
 
-		if(null === $receiverPublicKey || !$receiverPublicKey->isSuccess()) {
+		if (null === $receiverPublicKey || !$receiverPublicKey->isSuccess()) {
 			throw new Exception('Invalid threema id');
 		}
 
-		if(null !== $capabilityCheck) {
+		if (null !== $capabilityCheck) {
 			//check capability
 			$capability = $this->connection->keyCapability($threemaId);
-			if(null === $capability || false === $capabilityCheck->__invoke($capability)) {
+			if (null === $capability || false === $capabilityCheck->__invoke($capability)) {
 				throw new Exception('threema id does not have the capability');
 			}
 		}
@@ -350,11 +350,11 @@ 
 	 * @throws Exception
 	 */
 	private final function downloadFile(ThreemaMessage $message, $blobId, \Closure $downloadMessage = null) {
-		if(null === $downloadMessage
+		if (null === $downloadMessage
 			|| true === $downloadMessage->__invoke($message, $blobId)) {
 			//make a download
 			$result = $this->connection->downloadFile($blobId);
-			if(null === $result || false === $result->isSuccess()) {
+			if (null === $result || false === $result->isSuccess()) {
 				throw new Exception('could not download the file with blob id '.$blobId);
 			}
 

source/Threema/MsgApi/Tools/CryptToolSodiumDep.php

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;