rename Messages directory to Message

pavarnos · Aug 14, 2018 · 597cc97 · 597cc97
1 parent f509258
commit 597cc97
Show file tree

Hide file tree

Showing 9 changed files with 15 additions and 15 deletions.
diff --git a/src/Threema/MsgApi/Encryptor/AbstractEncryptor.php b/src/Threema/MsgApi/Encryptor/AbstractEncryptor.php
@@ -16,11 +16,11 @@
 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;
-use Threema\MsgApi\Messages\TextMessage;
-use Threema\MsgApi\Messages\AbstractMessage;
+use Threema\MsgApi\Message\DeliveryReceipt;
+use Threema\MsgApi\Message\FileMessage;
+use Threema\MsgApi\Message\ImageMessage;
+use Threema\MsgApi\Message\TextMessage;
+use Threema\MsgApi\Message\AbstractMessage;
 
 /**
  * Contains static methods to do various Threema cryptography related tasks.

diff --git a/src/Threema/MsgApi/Helpers/E2EHelper.php b/src/Threema/MsgApi/Helpers/E2EHelper.php
@@ -17,9 +17,9 @@
 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;
-use Threema\MsgApi\Messages\AbstractMessage;
+use Threema\MsgApi\Message\FileMessage;
+use Threema\MsgApi\Message\ImageMessage;
+use Threema\MsgApi\Message\AbstractMessage;
 
 /**
  * Splits some of the bulky code out of the Connection class to keep the Connection small / clean

diff --git a/src/Threema/MsgApi/Helpers/ReceiveMessageResult.php b/src/Threema/MsgApi/Helpers/ReceiveMessageResult.php
@@ -8,7 +8,7 @@
 
 namespace Threema\MsgApi\Helpers;
 
-use Threema\MsgApi\Messages\AbstractMessage;
+use Threema\MsgApi\Message\AbstractMessage;
 
 class ReceiveMessageResult
 {

diff --git a/...reema/MsgApi/Messages/AbstractMessage.php → ...hreema/MsgApi/Message/AbstractMessage.php b/...reema/MsgApi/Messages/AbstractMessage.php → ...hreema/MsgApi/Message/AbstractMessage.php
@@ -4,7 +4,7 @@
  * @copyright Copyright (c) 2015-2016 Threema GmbH
  */
 
-namespace Threema\MsgApi\Messages;
+namespace Threema\MsgApi\Message;
 
 /**
  * Abstract base class of messages that can be sent with end-to-end encryption via Threema.

diff --git a/...reema/MsgApi/Messages/DeliveryReceipt.php → ...hreema/MsgApi/Message/DeliveryReceipt.php b/...reema/MsgApi/Messages/DeliveryReceipt.php → ...hreema/MsgApi/Message/DeliveryReceipt.php
@@ -6,7 +6,7 @@
 
 declare(strict_types=1);
 
-namespace Threema\MsgApi\Messages;
+namespace Threema\MsgApi\Message;
 
 class DeliveryReceipt extends AbstractMessage
 {

diff --git a/src/Threema/MsgApi/Messages/FileMessage.php → src/Threema/MsgApi/Message/FileMessage.php b/src/Threema/MsgApi/Messages/FileMessage.php → src/Threema/MsgApi/Message/FileMessage.php
@@ -6,7 +6,7 @@
 
 declare(strict_types=1);
 
-namespace Threema\MsgApi\Messages;
+namespace Threema\MsgApi\Message;
 
 class FileMessage extends AbstractMessage
 {

diff --git a/src/Threema/MsgApi/Messages/ImageMessage.php → src/Threema/MsgApi/Message/ImageMessage.php b/src/Threema/MsgApi/Messages/ImageMessage.php → src/Threema/MsgApi/Message/ImageMessage.php
@@ -6,7 +6,7 @@
 
 declare(strict_types=1);
 
-namespace Threema\MsgApi\Messages;
+namespace Threema\MsgApi\Message;
 
 class ImageMessage extends AbstractMessage
 {

diff --git a/src/Threema/MsgApi/Messages/TextMessage.php → src/Threema/MsgApi/Message/TextMessage.php b/src/Threema/MsgApi/Messages/TextMessage.php → src/Threema/MsgApi/Message/TextMessage.php
@@ -6,7 +6,7 @@
 
 declare(strict_types=1);
 
-namespace Threema\MsgApi\Messages;
+namespace Threema\MsgApi\Message;
 
 class TextMessage extends AbstractMessage
 {

diff --git a/tests/Threema/MsgApi/EncryptorTest.php b/tests/Threema/MsgApi/EncryptorTest.php
@@ -11,7 +11,7 @@
 use Threema\MsgApi\Encryptor\AbstractEncryptor;
 use Threema\MsgApi\Encryptor\SodiumEncryptor;
 use Threema\MsgApi\Helpers\KeyPrefix;
-use Threema\MsgApi\Messages\TextMessage;
+use Threema\MsgApi\Message\TextMessage;
 
 class EncryptorTest extends TestCase
 {