move KeyPair class to Helpers

pavarnos · Aug 14, 2018 · f9ce8d4 · f9ce8d4
1 parent b97fca8
commit f9ce8d4
Show file tree

Hide file tree

Showing 5 changed files with 8 additions and 10 deletions.
diff --git a/src/Threema/MsgApi/Encryptor/AbstractEncryptor.php b/src/Threema/MsgApi/Encryptor/AbstractEncryptor.php
@@ -7,14 +7,13 @@
 namespace Threema\MsgApi\Encryptor;
 
 use Threema\Core\AssocArray;
-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;
+use Threema\MsgApi\Helpers\KeyPair;
 use Threema\MsgApi\Messages\DeliveryReceipt;
 use Threema\MsgApi\Messages\FileMessage;
 use Threema\MsgApi\Messages\ImageMessage;

diff --git a/src/Threema/MsgApi/Encryptor/SodiumEncryptor.php b/src/Threema/MsgApi/Encryptor/SodiumEncryptor.php
@@ -6,8 +6,7 @@
 
 namespace Threema\MsgApi\Encryptor;
 
-use Threema\Core\KeyPair;
-use Threema\MsgApi\Exceptions\Exception;
+use Threema\MsgApi\Helpers\KeyPair;
 
 /**
  * Contains static methods to do various Threema cryptography related tasks.

diff --git a/src/Threema/Core/KeyPair.php → src/Threema/MsgApi/Helpers/KeyPair.php b/src/Threema/Core/KeyPair.php → src/Threema/MsgApi/Helpers/KeyPair.php
@@ -4,15 +4,15 @@
  * @copyright Copyright (c) 2015-2016 Threema GmbH
  */
 
-namespace Threema\Core;
+namespace Threema\MsgApi\Helpers;
 
 class KeyPair
 {
  /** @var string */
- public $privateKey;
+ private $privateKey;
 
  /** @var string */
- public $publicKey;
+ private $publicKey;
 
  public function __construct(string $privateKey, string $publicKey)
  {

diff --git a/tests/Threema/Console/Symfony/EncryptDecryptTest.php b/tests/Threema/Console/Symfony/EncryptDecryptTest.php
@@ -11,9 +11,9 @@
 
 use PHPUnit\Framework\TestCase;
 use Symfony\Component\Console\Tester\CommandTester;
-use Threema\Core\KeyPair;
 use Threema\MsgApi\ConnectionFactory;
 use Threema\MsgApi\Constants;
+use Threema\MsgApi\Helpers\KeyPair;
 
 class EncryptDecryptTest extends TestCase
 {

diff --git a/tests/Threema/MsgApi/EncryptorTest.php b/tests/Threema/MsgApi/EncryptorTest.php
@@ -22,8 +22,8 @@ public function testCreateKeyPair(AbstractEncryptor $encryptor, string $prefix)
  $this->assertNotNull($encryptor, $prefix . ' could not instance crypto tool');
  $keyPair = $encryptor->generateKeyPair();
  $this->assertNotNull($keyPair, $prefix . ': invalid key pair');
- $this->assertNotNull($keyPair->privateKey, $prefix . ': private key is null');
- $this->assertNotNull($keyPair->publicKey, $prefix . ': public key is null');
+ $this->assertNotNull($keyPair->getPrivateKey(), $prefix . ': private key is null');
+ $this->assertNotNull($keyPair->getPublicKey(), $prefix . ': public key is null');
  }
 
  /**