Moved exception base class, use better exceptions

src/Threema/Console/Symfony/AbstractNetworkedCommand.php

@@ -12,10 +12,10 @@
 use Symfony\Component\Console\Input\InputInterface;
 use Symfony\Component\Console\Input\InputOption;
 use Symfony\Component\Console\Output\OutputInterface;
-use Threema\Core\Exception;
 use Threema\MsgApi\Commands\Results\Result;
 use Threema\MsgApi\Connection;
 use Threema\MsgApi\Constants;
+use Threema\MsgApi\Exceptions\Exception;
 use Threema\MsgApi\Exceptions\InvalidArgumentException;
 
 abstract class AbstractNetworkedCommand extends AbstractLocalCommand

src/Threema/Core/AssocArray.php

@@ -6,6 +6,8 @@
 
 namespace Threema\Core;
 
+use Threema\MsgApi\Exceptions\Exception;
+
 class AssocArray
 {
  /**

src/Threema/MsgApi/Connection.php

@@ -172,7 +172,7 @@ public function fetchPublicKey(string $threemaId): FetchPublicKeyResult
  * @param string $toPublicKeyHex
  * @param string $text
  * @return \Threema\MsgApi\Commands\Results\SendE2EResult
- * @throws \Threema\Core\Exception
+ * @throws \Threema\MsgApi\Exceptions\Exception
  */
  public function sendTextMessage(string $myPrivateKeyHex, string $toThreemaId, string $toPublicKeyHex,
  string $text): SendE2EResult
@@ -189,7 +189,7 @@ public function sendTextMessage(string $myPrivateKeyHex, string $toThreemaId, st
  * @param string $toPublicKeyHex
  * @param string $imagePath
  * @return \Threema\MsgApi\Commands\Results\SendE2EResult
- * @throws \Threema\Core\Exception
+ * @throws \Threema\MsgApi\Exceptions\Exception
  */
  public function sendImageMessage(string $myPrivateKeyHex, string $toThreemaId, string $toPublicKeyHex,
  string $imagePath): SendE2EResult
@@ -207,7 +207,7 @@ public function sendImageMessage(string $myPrivateKeyHex, string $toThreemaId, s
  * @param string $filePath
  * @param string $thumbnailPath
  * @return \Threema\MsgApi\Commands\Results\SendE2EResult
- * @throws \Threema\Core\Exception
+ * @throws \Threema\MsgApi\Exceptions\Exception
  */
  public final function sendFileMessage(string $myPrivateKeyHex, string $toThreemaId, string $toPublicKeyHex,
  string $filePath, string $thumbnailPath = '')
@@ -252,7 +252,7 @@ public final function macIsValid(string $threemaId, string $gatewayId, string $m
  * null=current folder, false=do not download files
  * @param \Closure $shouldDownload
  * @return \Threema\MsgApi\Helpers\ReceiveMessageResult
- * @throws \Threema\Core\Exception
+ * @throws \Threema\MsgApi\Exceptions\Exception
  * @throws \Threema\MsgApi\Exceptions\BadMessageException
  * @throws \Threema\MsgApi\Exceptions\DecryptionFailedException
  * @throws \Threema\MsgApi\Exceptions\HttpException

src/Threema/MsgApi/Encryptor/AbstractEncryptor.php

@@ -7,11 +7,11 @@
 namespace Threema\MsgApi\Encryptor;
 
 use Threema\Core\AssocArray;
-use Threema\Core\Exception;
 use Threema\Core\KeyPair;
 use Threema\MsgApi\Commands\Results\UploadFileResult;
 use Threema\MsgApi\Exceptions\BadMessageException;
 use Threema\MsgApi\Exceptions\DecryptionFailedException;
+use Threema\MsgApi\Exceptions\Exception;
 use Threema\MsgApi\Exceptions\UnsupportedMessageTypeException;
 use Threema\MsgApi\Helpers\EncryptResult;
 use Threema\MsgApi\Helpers\FileAnalysisResult;
@@ -76,7 +76,7 @@ final public function encryptMessageText($text, $senderPrivateKey, $recipientPub
  * @param string $recipientPublicKey the public key of the receiving ID (as binary)
  * @param string $nonce the nonce to be used for the encryption (usually 24 random bytes)
  * @return string
- * @throws \Threema\Core\Exception
+ * @throws \Threema\MsgApi\Exceptions\Exception
  */
  final public function encryptImageMessage(
  UploadFileResult $uploadFileResult,
@@ -140,7 +140,7 @@ final public function encryptFileMessage(UploadFileResult $uploadFileResult,
  * @throws BadMessageException
  * @throws DecryptionFailedException
  * @throws UnsupportedMessageTypeException
- * @throws \Threema\Core\Exception
+ * @throws \Threema\MsgApi\Exceptions\Exception
  */
  final public function decryptMessage($box, $recipientPrivateKey, $senderPublicKey, $nonce)
  {
@@ -282,14 +282,6 @@ abstract public function derivePublicKey($privateKey);
  */
  abstract public function isSupported();
 
- /**
- * Validate crypt tool
- *
- * @return bool
- * @throws Exception
- */
- abstract public function validate();
-
  /**
  * @param string $data
  * @return EncryptResult
@@ -391,14 +383,12 @@ public function bin2hex($binaryString)
  *
  * @param string $hexString The hex string to convert
  * @param string|null $ignore (optional) Characters to ignore
- * @throws \Threema\Core\Exception
+ * @throws \Threema\MsgApi\Exceptions\Exception
  * @return string
  */
  public function hex2bin($hexString, $ignore = null)
  {
- if ($ignore !== null) {
- throw new Exception('$ignore parameter is not supported');
- }
+ assert($ignore == null, '$ignore parameter is not supported');
  return hex2bin($hexString) ?: '';
  }
 

src/Threema/MsgApi/Encryptor/SodiumEncryptor.php

@@ -6,8 +6,8 @@
 
 namespace Threema\MsgApi\Encryptor;
 
-use Threema\Core\Exception;
 use Threema\Core\KeyPair;
+use Threema\MsgApi\Exceptions\Exception;
 
 /**
  * Contains static methods to do various Threema cryptography related tasks.
@@ -53,20 +53,6 @@ public function isSupported()
  return function_exists('sodium_crypto_box');
  }
 
- /**
- * Validate crypt tool
- *
- * @return bool
- * @throws Exception
- */
- public function validate()
- {
- if (false === $this->isSupported()) {
- throw new Exception('Sodium implementation not supported');
- }
- return true;
- }
-
  /**
  * @return string
  */

src/Threema/MsgApi/Exceptions/BadMessageException.php

@@ -8,8 +8,6 @@
 
 namespace Threema\MsgApi\Exceptions;
 
-use Threema\Core\Exception;
-
 class BadMessageException extends Exception
 {
 }

src/Threema/MsgApi/Exceptions/DecryptionFailedException.php

@@ -8,8 +8,6 @@
 
 namespace Threema\MsgApi\Exceptions;
 
-use Threema\Core\Exception;
-
 class DecryptionFailedException extends Exception
 {
 }

src/Threema/Core/Exception.php → src/Threema/MsgApi/Exceptions/Exception.php

@@ -4,7 +4,7 @@
  * @copyright Copyright (c) 2015-2016 Threema GmbH
  */
 
-namespace Threema\Core;
+namespace Threema\MsgApi\Exceptions;
 
 class Exception extends \Exception
 {

src/Threema/MsgApi/Exceptions/HttpException.php

@@ -8,8 +8,6 @@
 
 namespace Threema\MsgApi\Exceptions;
 
-use Threema\Core\Exception;
-
 class HttpException extends Exception
 {
 }

src/Threema/MsgApi/Exceptions/InvalidArgumentException.php

@@ -8,8 +8,6 @@
 
 namespace Threema\MsgApi\Exceptions;
 
-use Threema\Core\Exception;
-
 class InvalidArgumentException extends Exception
 {
 }

src/Threema/MsgApi/Exceptions/UnsupportedMessageTypeException.php

@@ -8,8 +8,6 @@
 
 namespace Threema\MsgApi\Exceptions;
 
-use Threema\Core\Exception;
-
 class UnsupportedMessageTypeException extends Exception
 {
 }

src/Threema/MsgApi/Helpers/E2EHelper.php

@@ -6,12 +6,13 @@
 
 namespace Threema\MsgApi\Helpers;
 
-use Threema\Core\Exception;
 use Threema\MsgApi\Commands\Results\CapabilityResult;
 use Threema\MsgApi\Connection;
 use Threema\MsgApi\Encryptor\AbstractEncryptor;
 use Threema\MsgApi\Exceptions\DecryptionFailedException;
+use Threema\MsgApi\Exceptions\Exception;
 use Threema\MsgApi\Exceptions\HttpException;
+use Threema\MsgApi\Exceptions\InvalidArgumentException;
 use Threema\MsgApi\Exceptions\UnsupportedMessageTypeException;
 use Threema\MsgApi\Messages\FileMessage;
 use Threema\MsgApi\Messages\ImageMessage;
@@ -56,7 +57,7 @@ public function __construct(string $privateKeyBinary, Connection $connection, Ab
  * @param string $receiverPublicKey binary format
  * @param string $text
  * @return \Threema\MsgApi\Commands\Results\SendE2EResult
- * @throws \Threema\Core\Exception
+ * @throws \Threema\MsgApi\Exceptions\Exception
  */
  public final function sendTextMessage(string $threemaId, string $receiverPublicKey, string $text)
  {
@@ -80,7 +81,7 @@ public final function sendTextMessage(string $threemaId, string $receiverPublicK
  * @param string $receiverPublicKey binary format
  * @param string $imagePath
  * @return \Threema\MsgApi\Commands\Results\SendE2EResult
- * @throws \Threema\Core\Exception
+ * @throws \Threema\MsgApi\Exceptions\Exception
  */
  public final function sendImageMessage(string $threemaId, string $receiverPublicKey, string $imagePath)
  {
@@ -90,7 +91,7 @@ public final function sendImageMessage(string $threemaId, string $receiverPublic
  'image/jpg',
  'image/jpeg',
  'image/png'])) {
- throw new Exception('file is not a jpg or png');
+ throw new InvalidArgumentException('file is not a jpg or png');
  }
 
  $this->assertIsCapable($threemaId, CapabilityResult::IMAGE);
@@ -126,7 +127,7 @@ public final function sendImageMessage(string $threemaId, string $receiverPublic
  * @param string $filePath
  * @param string $thumbnailPath
  * @return \Threema\MsgApi\Commands\Results\SendE2EResult
- * @throws \Threema\Core\Exception
+ * @throws \Threema\MsgApi\Exceptions\Exception
  */
  public final function sendFileMessage(string $threemaId, string $receiverPublicKey, string $filePath,
  string $thumbnailPath = '')
@@ -186,7 +187,7 @@ public final function sendFileMessage(string $threemaId, string $receiverPublicK
  * null=current folder, false=do not download files
  * @param \Closure $shouldDownload
  * @return ReceiveMessageResult
- * @throws \Threema\Core\Exception
+ * @throws \Threema\MsgApi\Exceptions\Exception
  * @throws \Threema\MsgApi\Exceptions\BadMessageException
  * @throws \Threema\MsgApi\Exceptions\DecryptionFailedException
  * @throws \Threema\MsgApi\Exceptions\HttpException

src/Threema/MsgApi/Helpers/FileAnalysisTool.php

@@ -6,23 +6,23 @@
 
 namespace Threema\MsgApi\Helpers;
 
-use Threema\Core\Exception;
+use Threema\MsgApi\Exceptions\InvalidArgumentException;
 
 final class FileAnalysisTool
 {
  /**
  * @param string $file
  * @return FileAnalysisResult
- * @throws \Threema\Core\Exception
+ * @throws \Threema\MsgApi\Exceptions\InvalidArgumentException
  */
  public static function analyseOrDie(string $file): FileAnalysisResult
  {
  if (false === file_exists($file)) {
- throw new Exception('No such file ' . $file);
+ throw new InvalidArgumentException('No such file ' . $file);
  }
 
  if (false === is_file($file)) {
- throw new Exception('Not a file: ' . $file);
+ throw new InvalidArgumentException('Not a file: ' . $file);
  }
 
  $mimeType = '';