move Commands/Results to Response

src/Threema/Console/Symfony/AbstractNetworkedCommand.php

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

src/Threema/MsgApi/Commands/Capability.php

@@ -8,8 +8,8 @@
 
 namespace Threema\MsgApi\Commands;
 
-use Threema\MsgApi\Commands\Results\CapabilityResponse;
-use Threema\MsgApi\Commands\Results\Response;
+use Threema\MsgApi\Response\CapabilityResponse;
+use Threema\MsgApi\Response\Response;
 
 class Capability implements CommandInterface
 {

src/Threema/MsgApi/Commands/CommandInterface.php

@@ -8,7 +8,7 @@
 
 namespace Threema\MsgApi\Commands;
 
-use Threema\MsgApi\Commands\Results\Response;
+use Threema\MsgApi\Response\Response;
 
 interface CommandInterface
 {

src/Threema/MsgApi/Commands/Credits.php

@@ -8,8 +8,8 @@
 
 namespace Threema\MsgApi\Commands;
 
-use Threema\MsgApi\Commands\Results\CreditsResponse;
-use Threema\MsgApi\Commands\Results\Response;
+use Threema\MsgApi\Response\CreditsResponse;
+use Threema\MsgApi\Response\Response;
 
 class Credits implements CommandInterface
 {

src/Threema/MsgApi/Commands/DownloadFile.php

@@ -8,8 +8,8 @@
 
 namespace Threema\MsgApi\Commands;
 
-use Threema\MsgApi\Commands\Results\DownloadFileResponse;
-use Threema\MsgApi\Commands\Results\Response;
+use Threema\MsgApi\Response\DownloadFileResponse;
+use Threema\MsgApi\Response\Response;
 
 class DownloadFile implements CommandInterface
 {

src/Threema/MsgApi/Commands/FetchPublicKey.php

@@ -8,7 +8,7 @@
 
 namespace Threema\MsgApi\Commands;
 
-use Threema\MsgApi\Commands\Results\FetchPublicKeyResponse;
+use Threema\MsgApi\Response\FetchPublicKeyResponse;
 
 class FetchPublicKey implements CommandInterface
 {
@@ -46,7 +46,7 @@ public function getPath(): string
  * @param string $response
  * @return FetchPublicKeyResponse
  */
- public function parseResult(int $httpCode, string $response): \Threema\MsgApi\Commands\Results\Response
+ public function parseResult(int $httpCode, string $response): \Threema\MsgApi\Response\Response
  {
  return new FetchPublicKeyResponse($httpCode, $response);
  }

src/Threema/MsgApi/Commands/LookupBulk.php

@@ -8,9 +8,9 @@
 
 namespace Threema\MsgApi\Commands;
 
-use Threema\MsgApi\Commands\Results\LookupBulkResponse;
-use Threema\MsgApi\Commands\Results\Response;
 use Threema\MsgApi\Encryptor\AbstractEncryptor;
+use Threema\MsgApi\Response\LookupBulkResponse;
+use Threema\MsgApi\Response\Response;
 
 /**
  * It is possible (though very unlikely) that two different phone numbers or emails will hash to the same value.

src/Threema/MsgApi/Commands/LookupEmail.php

@@ -8,8 +8,8 @@
 
 namespace Threema\MsgApi\Commands;
 
-use Threema\MsgApi\Commands\Results\LookupIdResponse;
-use Threema\MsgApi\Commands\Results\Response;
+use Threema\MsgApi\Response\LookupIdResponse;
+use Threema\MsgApi\Response\Response;
 
 class LookupEmail implements CommandInterface
 {

src/Threema/MsgApi/Commands/LookupPhone.php

@@ -8,8 +8,8 @@
 
 namespace Threema\MsgApi\Commands;
 
-use Threema\MsgApi\Commands\Results\LookupIdResponse;
-use Threema\MsgApi\Commands\Results\Response;
+use Threema\MsgApi\Response\LookupIdResponse;
+use Threema\MsgApi\Response\Response;
 
 class LookupPhone implements CommandInterface
 {

src/Threema/MsgApi/Commands/SendE2E.php

@@ -8,8 +8,8 @@
 
 namespace Threema\MsgApi\Commands;
 
-use Threema\MsgApi\Commands\Results\Response;
-use Threema\MsgApi\Commands\Results\SendE2EResponse;
+use Threema\MsgApi\Response\Response;
+use Threema\MsgApi\Response\SendE2EResponse;
 
 class SendE2E implements CommandInterface
 {

src/Threema/MsgApi/Commands/SendSimple.php

@@ -8,7 +8,7 @@
 
 namespace Threema\MsgApi\Commands;
 
-use Threema\MsgApi\Commands\Results\SendSimpleResponse;
+use Threema\MsgApi\Response\SendSimpleResponse;
 
 class SendSimple implements CommandInterface
 {
@@ -74,7 +74,7 @@ public function getPath(): string
  * @param string $response
  * @return SendSimpleResponse
  */
- public function parseResult(int $httpCode, string $response): \Threema\MsgApi\Commands\Results\Response
+ public function parseResult(int $httpCode, string $response): \Threema\MsgApi\Response\Response
  {
  return new SendSimpleResponse($httpCode, $response);
  }

src/Threema/MsgApi/Commands/UploadFile.php

@@ -8,8 +8,8 @@
 
 namespace Threema\MsgApi\Commands;
 
-use Threema\MsgApi\Commands\Results\Response;
-use Threema\MsgApi\Commands\Results\UploadFileResponse;
+use Threema\MsgApi\Response\Response;
+use Threema\MsgApi\Response\UploadFileResponse;
 
 class UploadFile implements MultiPartCommandInterface
 {

src/Threema/MsgApi/Connection.php

@@ -15,22 +15,22 @@
 use Threema\MsgApi\Commands\LookupBulk;
 use Threema\MsgApi\Commands\LookupEmail;
 use Threema\MsgApi\Commands\LookupPhone;
-use Threema\MsgApi\Commands\Results\CapabilityResponse;
-use Threema\MsgApi\Commands\Results\CreditsResponse;
-use Threema\MsgApi\Commands\Results\DownloadFileResponse;
-use Threema\MsgApi\Commands\Results\FetchPublicKeyResponse;
-use Threema\MsgApi\Commands\Results\LookupBulkResponse;
-use Threema\MsgApi\Commands\Results\LookupIdResponse;
-use Threema\MsgApi\Commands\Results\SendE2EResponse;
-use Threema\MsgApi\Commands\Results\SendSimpleResponse;
-use Threema\MsgApi\Commands\Results\UploadFileResponse;
 use Threema\MsgApi\Commands\SendE2E;
 use Threema\MsgApi\Commands\SendSimple;
 use Threema\MsgApi\Commands\UploadFile;
 use Threema\MsgApi\Encryptor\AbstractEncryptor;
 use Threema\MsgApi\Helpers\E2EHelper;
 use Threema\MsgApi\Helpers\ReceiveMessageResult;
 use Threema\MsgApi\HttpDriver\HttpDriverInterface;
+use Threema\MsgApi\Response\CapabilityResponse;
+use Threema\MsgApi\Response\CreditsResponse;
+use Threema\MsgApi\Response\DownloadFileResponse;
+use Threema\MsgApi\Response\FetchPublicKeyResponse;
+use Threema\MsgApi\Response\LookupBulkResponse;
+use Threema\MsgApi\Response\LookupIdResponse;
+use Threema\MsgApi\Response\SendE2EResponse;
+use Threema\MsgApi\Response\SendSimpleResponse;
+use Threema\MsgApi\Response\UploadFileResponse;
 
 /**
  * talk to the Threema Gateway server via the HttpDriverInterface
@@ -182,7 +182,7 @@ public function fetchPublicKey(string $threemaId): FetchPublicKeyResponse
  * @param string $toThreemaId
  * @param string $toPublicKeyHex
  * @param string $text
- * @return \Threema\MsgApi\Commands\Results\SendE2EResponse
+ * @return \Threema\MsgApi\Response\SendE2EResponse
  * @throws \Threema\MsgApi\Exceptions\Exception
  */
  public function sendTextMessage(string $myPrivateKeyHex, string $toThreemaId, string $toPublicKeyHex,
@@ -199,7 +199,7 @@ public function sendTextMessage(string $myPrivateKeyHex, string $toThreemaId, st
  * @param string $toThreemaId
  * @param string $toPublicKeyHex
  * @param string $imagePath
- * @return \Threema\MsgApi\Commands\Results\SendE2EResponse
+ * @return \Threema\MsgApi\Response\SendE2EResponse
  * @throws \Threema\MsgApi\Exceptions\Exception
  */
  public function sendImageMessage(string $myPrivateKeyHex, string $toThreemaId, string $toPublicKeyHex,
@@ -217,7 +217,7 @@ public function sendImageMessage(string $myPrivateKeyHex, string $toThreemaId, s
  * @param string $toPublicKeyHex
  * @param string $filePath
  * @param string $thumbnailPath
- * @return \Threema\MsgApi\Commands\Results\SendE2EResponse
+ * @return \Threema\MsgApi\Response\SendE2EResponse
  * @throws \Threema\MsgApi\Exceptions\Exception
  */
  public final function sendFileMessage(string $myPrivateKeyHex, string $toThreemaId, string $toPublicKeyHex,

src/Threema/MsgApi/Encryptor/AbstractEncryptor.php

@@ -8,19 +8,19 @@
 
 namespace Threema\MsgApi\Encryptor;
 
-use Threema\MsgApi\Commands\Results\UploadFileResponse;
 use Threema\MsgApi\Exceptions\BadMessageException;
 use Threema\MsgApi\Exceptions\DecryptionFailedException;
 use Threema\MsgApi\Exceptions\UnsupportedMessageTypeException;
 use Threema\MsgApi\Helpers\AssocArray;
 use Threema\MsgApi\Helpers\EncryptResult;
 use Threema\MsgApi\Helpers\FileAnalysisResult;
 use Threema\MsgApi\Helpers\KeyPair;
+use Threema\MsgApi\Message\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;
+use Threema\MsgApi\Response\UploadFileResponse;
 
 /**
  * Contains static methods to do various Threema cryptography related tasks.

src/Threema/MsgApi/Helpers/E2EHelper.php

@@ -8,18 +8,18 @@
 
 namespace Threema\MsgApi\Helpers;
 
-use Threema\MsgApi\Commands\Results\CapabilityResponse;
-use Threema\MsgApi\Commands\Results\DownloadFileResponse;
-use Threema\MsgApi\Commands\Results\SendE2EResponse;
 use Threema\MsgApi\Connection;
 use Threema\MsgApi\Encryptor\AbstractEncryptor;
 use Threema\MsgApi\Exceptions\DecryptionFailedException;
 use Threema\MsgApi\Exceptions\HttpException;
 use Threema\MsgApi\Exceptions\InvalidArgumentException;
 use Threema\MsgApi\Exceptions\UnsupportedMessageTypeException;
+use Threema\MsgApi\Message\AbstractMessage;
 use Threema\MsgApi\Message\FileMessage;
 use Threema\MsgApi\Message\ImageMessage;
-use Threema\MsgApi\Message\AbstractMessage;
+use Threema\MsgApi\Response\CapabilityResponse;
+use Threema\MsgApi\Response\DownloadFileResponse;
+use Threema\MsgApi\Response\SendE2EResponse;
 
 /**
  * Splits some of the bulky code out of the Connection class to keep the Connection small / clean
@@ -59,7 +59,7 @@ public function __construct(string $privateKeyBinary, Connection $connection, Ab
  * @param string $threemaId
  * @param string $receiverPublicKey binary format
  * @param string $text
- * @return \Threema\MsgApi\Commands\Results\SendE2EResponse
+ * @return \Threema\MsgApi\Response\SendE2EResponse
  * @throws \Threema\MsgApi\Exceptions\Exception
  */
  public final function sendTextMessage(string $threemaId, string $receiverPublicKey, string $text): SendE2EResponse
@@ -83,7 +83,7 @@ public final function sendTextMessage(string $threemaId, string $receiverPublicK
  * @param string $threemaId
  * @param string $receiverPublicKey binary format
  * @param string $imagePath
- * @return \Threema\MsgApi\Commands\Results\SendE2EResponse
+ * @return \Threema\MsgApi\Response\SendE2EResponse
  * @throws \Threema\MsgApi\Exceptions\Exception
  */
  public final function sendImageMessage(string $threemaId, string $receiverPublicKey,
@@ -130,7 +130,7 @@ public final function sendImageMessage(string $threemaId, string $receiverPublic
  * @param string $receiverPublicKey binary format
  * @param string $filePath
  * @param string $thumbnailPath
- * @return \Threema\MsgApi\Commands\Results\SendE2EResponse
+ * @return \Threema\MsgApi\Response\SendE2EResponse
  * @throws \Threema\MsgApi\Exceptions\Exception
  */
  public final function sendFileMessage(string $threemaId, string $receiverPublicKey, string $filePath,
@@ -322,7 +322,7 @@ private function assertIsCapable(string $threemaId, string $wantedCapability)
  * @param AbstractMessage $message
  * @param string $blobId blob id as hex
  * @param \Closure $shouldDownload
- * @return null|\Threema\MsgApi\Commands\Results\DownloadFileResponse
+ * @return null|\Threema\MsgApi\Response\DownloadFileResponse
  * @throws \Threema\MsgApi\Exceptions\HttpException
  */
  private function downloadFile(AbstractMessage $message, $blobId, \Closure $shouldDownload): ?DownloadFileResponse

src/Threema/MsgApi/HttpDriver/CurlHttpDriver.php

@@ -11,10 +11,10 @@
 use Threema\MsgApi\Commands\CommandInterface;
 use Threema\MsgApi\Commands\JsonCommandInterface;
 use Threema\MsgApi\Commands\MultiPartCommandInterface;
-use Threema\MsgApi\Commands\Results\Response;
 use Threema\MsgApi\Constants;
 use Threema\MsgApi\Exceptions\HttpException;
 use Threema\MsgApi\Helpers\Url;
+use Threema\MsgApi\Response\Response;
 
 /**
  */

src/Threema/MsgApi/HttpDriver/HttpDriverInterface.php

@@ -11,7 +11,7 @@
 use Threema\MsgApi\Commands\CommandInterface;
 use Threema\MsgApi\Commands\JsonCommandInterface;
 use Threema\MsgApi\Commands\MultiPartCommandInterface;
-use Threema\MsgApi\Commands\Results\Response;
+use Threema\MsgApi\Response\Response;
 
 /**
  */

src/Threema/MsgApi/Commands/Results/CapabilityResponse.php → src/Threema/MsgApi/Response/CapabilityResponse.php

@@ -6,7 +6,7 @@
 
 declare(strict_types=1);
 
-namespace Threema\MsgApi\Commands\Results;
+namespace Threema\MsgApi\Response;
 
 class CapabilityResponse extends Response
 {

src/Threema/MsgApi/Commands/Results/CreditsResponse.php → src/Threema/MsgApi/Response/CreditsResponse.php

@@ -6,7 +6,7 @@
 
 declare(strict_types=1);
 
-namespace Threema\MsgApi\Commands\Results;
+namespace Threema\MsgApi\Response;
 
 class CreditsResponse extends Response
 {

src/Threema/MsgApi/Commands/Results/DownloadFileResponse.php → src/Threema/MsgApi/Response/DownloadFileResponse.php

@@ -6,7 +6,7 @@
 
 declare(strict_types=1);
 
-namespace Threema\MsgApi\Commands\Results;
+namespace Threema\MsgApi\Response;
 
 class DownloadFileResponse extends Response
 {

src/Threema/MsgApi/Commands/Results/FetchPublicKeyResponse.php → src/Threema/MsgApi/Response/FetchPublicKeyResponse.php

@@ -6,7 +6,7 @@
 
 declare(strict_types=1);
 
-namespace Threema\MsgApi\Commands\Results;
+namespace Threema\MsgApi\Response;
 
 class FetchPublicKeyResponse extends Response
 {

src/Threema/MsgApi/Commands/Results/LookupBulkResponse.php → src/Threema/MsgApi/Response/LookupBulkResponse.php

@@ -6,7 +6,7 @@
 
 declare(strict_types=1);
 
-namespace Threema\MsgApi\Commands\Results;
+namespace Threema\MsgApi\Response;
 
 use Threema\MsgApi\Commands\LookupBulk;
 use Threema\MsgApi\Helpers\BulkLookupIdentity;

src/Threema/MsgApi/Commands/Results/LookupIdResponse.php → src/Threema/MsgApi/Response/LookupIdResponse.php

@@ -6,7 +6,7 @@
 
 declare(strict_types=1);
 
-namespace Threema\MsgApi\Commands\Results;
+namespace Threema\MsgApi\Response;
 
 class LookupIdResponse extends Response
 {

src/Threema/MsgApi/Commands/Results/Response.php → src/Threema/MsgApi/Response/Response.php

@@ -6,7 +6,7 @@
 
 declare(strict_types=1);
 
-namespace Threema\MsgApi\Commands\Results;
+namespace Threema\MsgApi\Response;
 
 abstract class Response
 {

src/Threema/MsgApi/Commands/Results/SendE2EResponse.php → src/Threema/MsgApi/Response/SendE2EResponse.php

@@ -6,7 +6,7 @@
 
 declare(strict_types=1);
 
-namespace Threema\MsgApi\Commands\Results;
+namespace Threema\MsgApi\Response;
 
 class SendE2EResponse extends Response
 {

src/Threema/MsgApi/Commands/Results/SendSimpleResponse.php → src/Threema/MsgApi/Response/SendSimpleResponse.php

@@ -6,7 +6,7 @@
 
 declare(strict_types=1);
 
-namespace Threema\MsgApi\Commands\Results;
+namespace Threema\MsgApi\Response;
 
 class SendSimpleResponse extends Response
 {

src/Threema/MsgApi/Commands/Results/UploadFileResponse.php → src/Threema/MsgApi/Response/UploadFileResponse.php

@@ -6,7 +6,7 @@
 
 declare(strict_types=1);
 
-namespace Threema\MsgApi\Commands\Results;
+namespace Threema\MsgApi\Response;
 
 class UploadFileResponse extends Response
 {