delete Receiver class and add Connection::sendToEmail(), sendToPhone(…

…) etc

samples/testSendSimple.php

@@ -1,17 +1,12 @@
 <?php
 declare(strict_types=1);
 
-use Threema\MsgApi\Receiver;
-
 require_once '../vendor/autoload.php';
 
 $factory = new \Threema\MsgApi\ConnectionFactory();
 $connection = $factory->getConnection('*YOUR_GATEWAY_THREEMA_ID', 'YOUR_GATEWAY_THREEMA_ID_SECRET');
 
-//create a receiver
-$receiver = new Receiver('ECHOECHO', Receiver::TYPE_ID);
-
-$result = $connection->sendSimple($receiver, "This is a Test Message");
+$result = $connection->sendToThreemaID('ECHOECHO', "This is a Test Message");
 if ($result->isSuccess()) {
  echo 'Message ID: ' . $result->getMessageId() . "\n";
 } else {

src/Threema/Console/Symfony/MessageSendSimpleCommand.php

@@ -10,7 +10,6 @@
 
 use Symfony\Component\Console\Input\InputInterface;
 use Symfony\Component\Console\Output\OutputInterface;
-use Threema\MsgApi\Receiver;
 
 class MessageSendSimpleCommand extends AbstractNetworkedCommand
 {
@@ -27,8 +26,8 @@ protected function configure()
 
  protected function execute(InputInterface $input, OutputInterface $output)
  {
- $receiver = new Receiver($this->getRecipientID($input), Receiver::TYPE_ID);
- $result = $this->getConnection($input, $output)->sendSimple($receiver, $this->getMessage($input));
+ $result = $this->getConnection($input, $output)
+  ->sendToThreemaID($this->getRecipientID($input), $this->getMessage($input));
  $this->assertSuccess($result);
  $output->writeln($result->getMessageId());
  return 0;

src/Threema/MsgApi/Commands/SendSimple.php

@@ -9,28 +9,38 @@
 namespace Threema\MsgApi\Commands;
 
 use Threema\MsgApi\Commands\Results\SendSimpleResult;
-use Threema\MsgApi\Receiver;
 
 class SendSimple implements CommandInterface
 {
- /**
- * @var string
- */
+ /** @var string */
  private $text;
 
- /**
- * @var \Threema\MsgApi\Receiver
- */
- private $receiver;
+ /** @var string */
+ private $to;
 
- /**
- * @param \Threema\MsgApi\Receiver $receiver
- * @param string $text
- */
- public function __construct(Receiver $receiver, $text)
+ /** @var string */
+ private $address;
+
+ protected function __construct(string $to, string $address, string $text)
+ {
+ $this->text = $text;
+ $this->to = $to;
+ $this->address = $address;
+ }
+
+ public static function toThreemaID(string $threemaID, string $text): self
+ {
+ return new self('to', strtoupper($threemaID), $text);
+ }
+
+ public static function toEmail(string $email, string $text): self
+ {
+ return new self('email', strtolower(trim($email)), $text);
+ }
+
+ public static function toPhoneNo(string $phoneNo, string $text): self
  {
- $this->text = $text;
- $this->receiver = $receiver;
+ return new self('phone', preg_replace('/[^0-9]/', '', $phoneNo), $text);
  }
 
  /**
@@ -46,8 +56,8 @@ public function getText(): string
  */
  public function getParams(): array
  {
- $p = $this->receiver->getParams();
- $p['text'] = $this->getText();
+ $p[$this->to] = $this->address;
+ $p['text']  = $this->text;
  return $p;
  }
 

src/Threema/MsgApi/Connection.php

@@ -49,14 +49,23 @@ public function __construct(HttpDriverInterface $driver, AbstractEncryptor $encr
  $this->encryptor = $encryptor;
  }
 
- /**
- * @param Receiver $receiver
- * @param string $text
- * @return SendSimpleResult
- */
- public function sendSimple(Receiver $receiver, string $text): SendSimpleResult
+ public function sendToThreemaID(string $threemaID, string $text): SendSimpleResult
+ {
+ $result = $this->driver->postForm(SendSimple::toThreemaID($threemaID, $text));
+ assert($result instanceof SendSimpleResult);
+ return $result;
+ }
+
+ public function sendToEmail(string $email, string $text): SendSimpleResult
+ {
+ $result = $this->driver->postForm(SendSimple::toEmail($email, $text));
+ assert($result instanceof SendSimpleResult);
+ return $result;
+ }
+
+ public function sendToPhoneNo(string $phoneNo, string $text): SendSimpleResult
  {
- $result = $this->driver->postForm(new SendSimple($receiver, $text));
+ $result = $this->driver->postForm(SendSimple::toPhoneNo($phoneNo, $text));
  assert($result instanceof SendSimpleResult);
  return $result;
  }