rename Request/* files to have a Request suffix (so they are the same…

… as the Response suffix files)

src/Threema/Console/Symfony/VersionCommand.php

@@ -37,7 +37,7 @@ protected function execute(InputInterface $input, OutputInterface $output)
  $table = new Table($output);
  $table->getStyle()->setPadType(STR_PAD_LEFT);
  $table->setRows([
- ['', 'Level', 'Text', 'Capabilities', 'Image', 'File', 'Credits'],
+ ['', 'Level', 'Text', 'Capabilities', 'Image', 'File', 'CreditsRequest'],
  new TableSeparator(),
  [$left(1), '1', 'Y'],
  [$left(2), '2', 'Y', 'Y', 'Y', 'Y', new TableCell()],

src/Threema/MsgApi/Connection.php

@@ -8,16 +8,16 @@
 
 namespace Threema\MsgApi;
 
-use Threema\MsgApi\Request\Capability;
-use Threema\MsgApi\Request\Credits;
-use Threema\MsgApi\Request\DownloadFile;
-use Threema\MsgApi\Request\FetchPublicKey;
-use Threema\MsgApi\Request\LookupBulk;
-use Threema\MsgApi\Request\LookupEmail;
-use Threema\MsgApi\Request\LookupPhone;
-use Threema\MsgApi\Request\SendE2E;
-use Threema\MsgApi\Request\SendSimple;
-use Threema\MsgApi\Request\UploadFile;
+use Threema\MsgApi\Request\CapabilityRequest;
+use Threema\MsgApi\Request\CreditsRequest;
+use Threema\MsgApi\Request\DownloadFileRequest;
+use Threema\MsgApi\Request\FetchPublicKeyRequest;
+use Threema\MsgApi\Request\LookupBulkRequest;
+use Threema\MsgApi\Request\LookupEmailRequest;
+use Threema\MsgApi\Request\LookupPhoneRequest;
+use Threema\MsgApi\Request\SendE2ERequest;
+use Threema\MsgApi\Request\SendSimpleRequest;
+use Threema\MsgApi\Request\UploadFileRequest;
 use Threema\MsgApi\Encryptor\AbstractEncryptor;
 use Threema\MsgApi\Helpers\E2EHelper;
 use Threema\MsgApi\Helpers\ReceiveMessageResult;
@@ -51,21 +51,21 @@ public function __construct(HttpDriverInterface $driver, AbstractEncryptor $encr
 
  public function sendToThreemaID(string $threemaID, string $text): SendSimpleResponse
  {
- $result = $this->driver->postForm(SendSimple::toThreemaID($threemaID, $text));
+ $result = $this->driver->postForm(SendSimpleRequest::toThreemaID($threemaID, $text));
  assert($result instanceof SendSimpleResponse);
  return $result;
  }
 
  public function sendToEmail(string $email, string $text): SendSimpleResponse
  {
- $result = $this->driver->postForm(SendSimple::toEmail($email, $text));
+ $result = $this->driver->postForm(SendSimpleRequest::toEmail($email, $text));
  assert($result instanceof SendSimpleResponse);
  return $result;
  }
 
  public function sendToPhoneNo(string $phoneNo, string $text): SendSimpleResponse
  {
- $result = $this->driver->postForm(SendSimple::toPhoneNo($phoneNo, $text));
+ $result = $this->driver->postForm(SendSimpleRequest::toPhoneNo($phoneNo, $text));
  assert($result instanceof SendSimpleResponse);
  return $result;
  }
@@ -78,7 +78,7 @@ public function sendToPhoneNo(string $phoneNo, string $text): SendSimpleResponse
  */
  public function sendE2E(string $threemaId, string $nonce, string $box): SendE2EResponse
  {
- $command = new SendE2E($threemaId, $this->encryptor->bin2hex($nonce), $this->encryptor->bin2hex($box));
+ $command = new SendE2ERequest($threemaId, $this->encryptor->bin2hex($nonce), $this->encryptor->bin2hex($box));
  $result = $this->driver->postForm($command);
  assert($result instanceof SendE2EResponse);
  return $result;
@@ -88,9 +88,9 @@ public function sendE2E(string $threemaId, string $nonce, string $box): SendE2ER
  * @param string $encryptedFileData (binary string)
  * @return UploadFileResponse
  */
- public function uploadFile($encryptedFileData): UploadFileResponse
+ public function uploadFile(string $encryptedFileData): UploadFileResponse
  {
- $result = $this->driver->postMultiPart(new UploadFile($encryptedFileData));
+ $result = $this->driver->postMultiPart(new UploadFileRequest($encryptedFileData));
  assert($result instanceof UploadFileResponse);
  return $result;
  }
@@ -100,9 +100,9 @@ public function uploadFile($encryptedFileData): UploadFileResponse
  * @param \Closure $progress
  * @return DownloadFileResponse
  */
- public function downloadFile($blobId, \Closure $progress = null): DownloadFileResponse
+ public function downloadFile(string $blobId, \Closure $progress = null): DownloadFileResponse
  {
- $result = $this->driver->get(new DownloadFile($blobId), $progress);
+ $result = $this->driver->get(new DownloadFileRequest($blobId), $progress);
  assert($result instanceof DownloadFileResponse);
  return $result;
  }
@@ -113,7 +113,7 @@ public function downloadFile($blobId, \Closure $progress = null): DownloadFileRe
  */
  public function keyLookupByPhoneNumber(string $phoneNumber): LookupIdResponse
  {
- $result = $this->driver->get(new LookupPhone($phoneNumber, $this->encryptor->hashPhoneNo($phoneNumber)));
+ $result = $this->driver->get(new LookupPhoneRequest($phoneNumber, $this->encryptor->hashPhoneNo($phoneNumber)));
  assert($result instanceof LookupIdResponse);
  return $result;
  }
@@ -124,7 +124,7 @@ public function keyLookupByPhoneNumber(string $phoneNumber): LookupIdResponse
  */
  public function keyLookupByEmail(string $email): LookupIdResponse
  {
- $result = $this->driver->get(new LookupEmail($email, $this->encryptor->hashEmail($email)));
+ $result = $this->driver->get(new LookupEmailRequest($email, $this->encryptor->hashEmail($email)));
  assert($result instanceof LookupIdResponse);
  return $result;
  }
@@ -136,7 +136,7 @@ public function keyLookupByEmail(string $email): LookupIdResponse
  */
  public function bulkLookup(array $emailAddresses, array $phoneNumbers): LookupBulkResponse
  {
- $command = new LookupBulk($emailAddresses, $phoneNumbers);
+ $command = new LookupBulkRequest($emailAddresses, $phoneNumbers);
  $command->calculateHashes($this->encryptor);
  $result = $this->driver->postJson($command);
  assert($result instanceof LookupBulkResponse);
@@ -149,7 +149,7 @@ public function bulkLookup(array $emailAddresses, array $phoneNumbers): LookupBu
  */
  public function keyCapability(string $threemaId): CapabilityResponse
  {
- $result = $this->driver->get(new Capability($threemaId));
+ $result = $this->driver->get(new CapabilityRequest($threemaId));
  assert($result instanceof CapabilityResponse);
  return $result;
  }
@@ -159,7 +159,7 @@ public function keyCapability(string $threemaId): CapabilityResponse
  */
  public function credits(): CreditsResponse
  {
- $result = $this->driver->get(new Credits());
+ $result = $this->driver->get(new CreditsRequest());
  assert($result instanceof CreditsResponse);
  return $result;
  }
@@ -170,7 +170,7 @@ public function credits(): CreditsResponse
  */
  public function fetchPublicKey(string $threemaId): FetchPublicKeyResponse
  {
- $result = $this->driver->get(new FetchPublicKey($threemaId));
+ $result = $this->driver->get(new FetchPublicKeyRequest($threemaId));
  assert($result instanceof FetchPublicKeyResponse);
  return $result;
  }

src/Threema/MsgApi/Request/Capability.php → src/Threema/MsgApi/Request/CapabilityRequest.php

@@ -11,7 +11,7 @@
 use Threema\MsgApi\Response\CapabilityResponse;
 use Threema\MsgApi\Response\Response;
 
-class Capability implements RequestInterface
+class CapabilityRequest implements RequestInterface
 {
  /**
  * @var string

src/Threema/MsgApi/Request/Credits.php → src/Threema/MsgApi/Request/CreditsRequest.php

@@ -11,7 +11,7 @@
 use Threema\MsgApi\Response\CreditsResponse;
 use Threema\MsgApi\Response\Response;
 
-class Credits implements RequestInterface
+class CreditsRequest implements RequestInterface
 {
  /**
  * @return array

src/Threema/MsgApi/Request/DownloadFile.php → src/Threema/MsgApi/Request/DownloadFileRequest.php

@@ -11,7 +11,7 @@
 use Threema\MsgApi\Response\DownloadFileResponse;
 use Threema\MsgApi\Response\Response;
 
-class DownloadFile implements RequestInterface
+class DownloadFileRequest implements RequestInterface
 {
  /**
  * @var string

src/Threema/MsgApi/Request/FetchPublicKey.php → src/Threema/MsgApi/Request/FetchPublicKeyRequest.php

@@ -10,7 +10,7 @@
 
 use Threema\MsgApi\Response\FetchPublicKeyResponse;
 
-class FetchPublicKey implements RequestInterface
+class FetchPublicKeyRequest implements RequestInterface
 {
  /**
  * @var string

src/Threema/MsgApi/Request/LookupBulk.php → src/Threema/MsgApi/Request/LookupBulkRequest.php

@@ -22,7 +22,7 @@
  * BulkLookupIdentity helper class. The original key of the email or phone is returned to you in the match result, which
  * is helpful if it is linked to a user.id or person.id for example.
  */
-class LookupBulk implements JsonRequestInterface
+class LookupBulkRequest implements JsonRequestInterface
 {
  /** @var string[] */
  private $email = [];

src/Threema/MsgApi/Request/LookupEmail.php → src/Threema/MsgApi/Request/LookupEmailRequest.php

@@ -11,7 +11,7 @@
 use Threema\MsgApi\Response\LookupIdResponse;
 use Threema\MsgApi\Response\Response;
 
-class LookupEmail implements RequestInterface
+class LookupEmailRequest implements RequestInterface
 {
  /**
  * @var string

src/Threema/MsgApi/Request/LookupPhone.php → src/Threema/MsgApi/Request/LookupPhoneRequest.php

@@ -11,7 +11,7 @@
 use Threema\MsgApi\Response\LookupIdResponse;
 use Threema\MsgApi\Response\Response;
 
-class LookupPhone implements RequestInterface
+class LookupPhoneRequest implements RequestInterface
 {
  /**
  * @var string

src/Threema/MsgApi/Request/SendE2E.php → src/Threema/MsgApi/Request/SendE2ERequest.php

@@ -11,7 +11,7 @@
 use Threema\MsgApi\Response\Response;
 use Threema\MsgApi\Response\SendE2EResponse;
 
-class SendE2E implements RequestInterface
+class SendE2ERequest implements RequestInterface
 {
  /**
  * @var string

src/Threema/MsgApi/Request/SendSimple.php → src/Threema/MsgApi/Request/SendSimpleRequest.php

@@ -10,7 +10,7 @@
 
 use Threema\MsgApi\Response\SendSimpleResponse;
 
-class SendSimple implements RequestInterface
+class SendSimpleRequest implements RequestInterface
 {
  /** @var string */
  private $text;

src/Threema/MsgApi/Request/UploadFile.php → src/Threema/MsgApi/Request/UploadFileRequest.php

@@ -11,7 +11,7 @@
 use Threema\MsgApi\Response\Response;
 use Threema\MsgApi\Response\UploadFileResponse;
 
-class UploadFile implements MultiPartRequestInterface
+class UploadFileRequest implements MultiPartRequestInterface
 {
  /**
  * @var string

src/Threema/MsgApi/Response/LookupBulkResponse.php

@@ -8,18 +8,18 @@
 
 namespace Threema\MsgApi\Response;
 
-use Threema\MsgApi\Request\LookupBulk;
+use Threema\MsgApi\Request\LookupBulkRequest;
 use Threema\MsgApi\Helpers\BulkLookupIdentity;
 
 class LookupBulkResponse extends Response
 {
- /** @var \Threema\MsgApi\Request\LookupBulk */
+ /** @var \Threema\MsgApi\Request\LookupBulkRequest */
  private $request;
 
  /** @var BulkLookupIdentity[] */
  private $matches = [];
 
- public function __construct(int $httpCode, $response, LookupBulk $request)
+ public function __construct(int $httpCode, $response, LookupBulkRequest $request)
  {
  $this->request = $request;
  parent::__construct($httpCode, $response);

tests/Threema/MsgApi/Commands/Results/LookupBulkResultTest.php

@@ -10,7 +10,7 @@
 namespace Threema\MsgApi\Response;
 
 use PHPUnit\Framework\TestCase;
-use Threema\MsgApi\Request\LookupBulk;
+use Threema\MsgApi\Request\LookupBulkRequest;
 use Threema\MsgApi\ConnectionFactory;
 
 class LookupBulkResultTest extends TestCase
@@ -19,7 +19,7 @@ public function testGetMatches()
  {
  $factory = new ConnectionFactory();
  $encryptor = $factory->getEncryptor();
- $request = new LookupBulk(
+ $request = new LookupBulkRequest(
  [$emailKey = 99 => $emailAddress = '[email protected]'],
  [$phoneKey = 17 => $phoneNumber = '641234567']);
  $request->calculateHashes($encryptor);