split CurlHttpDriver out of Connection and simplified. ConnectionSett…

…ings no longer needed: they are all driver parameters now
pavarnos · Aug 12, 2018 · 0b26785 · 0b26785
1 parent 05b7830
commit 0b26785
Show file tree

Hide file tree

Showing 28 changed files with 382 additions and 407 deletions.
diff --git a/samples/testFetchPublicKey.php b/samples/testFetchPublicKey.php
@@ -1,24 +1,21 @@
 <?php
 
 use Threema\MsgApi\Connection;
-use Threema\MsgApi\ConnectionSettings;
 
 require_once '../vendor/autoload.php';
 
 //define your connection settings
-$settings = new ConnectionSettings(
- '*YOUR_GATEWAY_THREEMA_ID',
- 'YOUR_GATEWAY_THREEMA_ID_SECRET'
+$driver = new \Threema\MsgApi\HttpDriver\CurlHttpDriver(
+ '*YOUR_GATEWAY_THREEMA_ID',
+ 'YOUR_GATEWAY_THREEMA_ID_SECRET'
 );
 
 //create a connection
-$connector = new Connection($settings);
-
+$connector = new Connection($driver);
 
 $result = $connector->fetchPublicKey('ECHOECHO');
-if($result->isSuccess()) {
- echo 'public key '.$result->getPublicKey() . "\n";
-}
-else {
- echo 'error '.$result->getErrorMessage() . "\n";
+if ($result->isSuccess()) {
+ echo 'public key ' . $result->getPublicKey() . "\n";
+} else {
+ echo 'error ' . $result->getErrorMessage() . "\n";
 }
diff --git a/samples/testKeyLookup.php b/samples/testKeyLookup.php
@@ -1,18 +1,17 @@
 <?php
 
 use Threema\MsgApi\Connection;
-use Threema\MsgApi\ConnectionSettings;
 
 require_once '../vendor/autoload.php';
 
 //define your connection settings
-$settings = new ConnectionSettings(
+$driver = new \Threema\MsgApi\HttpDriver\CurlHttpDriver(
  '*YOUR_GATEWAY_THREEMA_ID',
  'YOUR_GATEWAY_THREEMA_ID_SECRET'
 );
 
 //create a connection
-$connector = new Connection($settings);
+$connector = new Connection($driver);
 
 $result = $connector->keyLookupByPhoneNumber('123456789');
 if ($result->isSuccess()) {

diff --git a/samples/testSendE2EFile.php b/samples/testSendE2EFile.php
@@ -1,18 +1,17 @@
 <?php
 
 use Threema\MsgApi\Connection;
-use Threema\MsgApi\ConnectionSettings;
 
 require_once '../vendor/autoload.php';
 
 //define your connection settings
-$settings = new ConnectionSettings(
+$driver = new \Threema\MsgApi\HttpDriver\CurlHttpDriver(
  '*YOUR_GATEWAY_THREEMA_ID',
  'YOUR_GATEWAY_THREEMA_ID_SECRET'
 );
 
 //create a connection
-$connector = new Connection($settings);
+$connector = new Connection($driver);
 
 $senderPrivateKey = "MY_PUBLIC_KEY_IN_BIN";
 $filePath = "/path/to/my/file.pdf";

diff --git a/samples/testSendE2EText.php b/samples/testSendE2EText.php
@@ -1,27 +1,25 @@
 <?php
 
 use Threema\MsgApi\Connection;
-use Threema\MsgApi\ConnectionSettings;
 
 require_once '../vendor/autoload.php';
 
 //define your connection settings
-$settings = new ConnectionSettings(
- '*YOUR_GATEWAY_THREEMA_ID',
- 'YOUR_GATEWAY_THREEMA_ID_SECRET'
+$driver = new \Threema\MsgApi\HttpDriver\CurlHttpDriver(
+ '*YOUR_GATEWAY_THREEMA_ID',
+ 'YOUR_GATEWAY_THREEMA_ID_SECRET'
 );
 
 //create a connection
-$connector = new Connection($settings);
+$connector = new Connection($driver);
 
 $senderPrivateKey = "MY_PUBLIC_KEY_IN_BIN";
 
-$e2eHelper = new \Threema\MsgApi\Helpers\E2EHelper($senderPrivateKey,$connector);
-$result = $e2eHelper->sendTextMessage("TEST1234", "thePublicKeyAsHex", "This is an end-to-end encrypted message");
+$e2eHelper = new \Threema\MsgApi\Helpers\E2EHelper($senderPrivateKey, $connector);
+$result  = $e2eHelper->sendTextMessage("TEST1234", "thePublicKeyAsHex", "This is an end-to-end encrypted message");
 
-if(true === $result->isSuccess()) {
- echo 'Message ID: '.$result->getMessageId() . "\n";
-}
-else {
- echo 'Error: '.$result->getErrorMessage() . "\n";
+if (true === $result->isSuccess()) {
+ echo 'Message ID: ' . $result->getMessageId() . "\n";
+} else {
+ echo 'Error: ' . $result->getErrorMessage() . "\n";
 }
diff --git a/samples/testSendSimple.php b/samples/testSendSimple.php
@@ -1,23 +1,21 @@
 <?php
 
 use Threema\MsgApi\Connection;
-use Threema\MsgApi\ConnectionSettings;
 use Threema\MsgApi\Receiver;
 
 require_once '../vendor/autoload.php';
 
 //define your connection settings
-$settings = new ConnectionSettings(
+$driver = new \Threema\MsgApi\HttpDriver\CurlHttpDriver(
  '*YOUR_GATEWAY_THREEMA_ID',
  'YOUR_GATEWAY_THREEMA_ID_SECRET'
 );
 
 //create a connection
-$connector = new Connection($settings);
+$connector = new Connection($driver);
 
 //create a receiver
-$receiver = new Receiver('ECHOECHO',
- Receiver::TYPE_ID);
+$receiver = new Receiver('ECHOECHO', Receiver::TYPE_ID);
 
 $result = $connector->sendSimple($receiver, "This is a Test Message");
 if ($result->isSuccess()) {

diff --git a/src/Threema/Console/Symfony/AbstractNetworkedCommand.php b/src/Threema/Console/Symfony/AbstractNetworkedCommand.php
@@ -15,9 +15,9 @@
 use Threema\Core\Exception;
 use Threema\MsgApi\Commands\Results\Result;
 use Threema\MsgApi\Connection;
-use Threema\MsgApi\ConnectionSettings;
 use Threema\MsgApi\Constants;
 use Threema\MsgApi\Exceptions\InvalidArgumentException;
+use Threema\MsgApi\HttpDriver\CurlHttpDriver;
 
 abstract class AbstractNetworkedCommand extends AbstractLocalCommand
 {
@@ -33,8 +33,7 @@ protected function configure()
  protected function getConnection(InputInterface $input, OutputInterface $output): Connection
  {
  $this->loadDefaults($input, $output);
- $settings = new ConnectionSettings($this->getSenderID($input), $this->getSecret($input, $output));
- return new Connection($settings);
+ return new Connection(new CurlHttpDriver($this->getSenderID($input), $this->getSecret($input, $output)));
  }
 
  protected function assertSuccess(Result $result)

diff --git a/src/Threema/MsgApi/Commands/Capability.php b/src/Threema/MsgApi/Commands/Capability.php
@@ -26,12 +26,12 @@ public function __construct($threemaId)
  /**
  * @return array
  */
- public function getParams()
+ public function getParams(): array
  {
  return [];
  }
 
- public function getPath()
+ public function getPath(): string
  {
  return 'capabilities/' . $this->threemaId;
  }
@@ -41,7 +41,7 @@ public function getPath()
  * @param object $res
  * @return CapabilityResult
  */
- public function parseResult($httpCode, $res)
+ public function parseResult($httpCode, $res): \Threema\MsgApi\Commands\Results\Result
  {
  return new CapabilityResult($httpCode, $res);
  }

diff --git a/src/Threema/MsgApi/Commands/CommandInterface.php b/src/Threema/MsgApi/Commands/CommandInterface.php
@@ -4,6 +4,8 @@
  * @copyright Copyright (c) 2015-2016 Threema GmbH
  */
 
+declare(strict_types=1);
+
 namespace Threema\MsgApi\Commands;
 
 use Threema\MsgApi\Commands\Results\Result;
@@ -13,17 +15,17 @@ interface CommandInterface
  /**
  * @return string
  */
- public function getPath();
+ public function getPath(): string;
 
  /**
  * @return array
  */
- public function getParams();
+ public function getParams(): array;
 
  /**
  * @param int $httpCode
  * @param object $res
  * @return Result
  */
- public function parseResult($httpCode, $res);
+ public function parseResult($httpCode, $res): \Threema\MsgApi\Commands\Results\Result;
 }
diff --git a/src/Threema/MsgApi/Commands/Credits.php b/src/Threema/MsgApi/Commands/Credits.php
@@ -13,12 +13,12 @@ class Credits implements CommandInterface
  /**
  * @return array
  */
- public function getParams()
+ public function getParams(): array
  {
  return [];
  }
 
- public function getPath()
+ public function getPath(): string
  {
  return 'credits';
  }
@@ -28,7 +28,7 @@ public function getPath()
  * @param object $res
  * @return CreditsResult
  */
- public function parseResult($httpCode, $res)
+ public function parseResult($httpCode, $res): \Threema\MsgApi\Commands\Results\Result
  {
  return new CreditsResult($httpCode, $res);
  }

diff --git a/src/Threema/MsgApi/Commands/DownloadFile.php b/src/Threema/MsgApi/Commands/DownloadFile.php
@@ -26,15 +26,15 @@ public function __construct($blobId)
  /**
  * @return array
  */
- public function getParams()
+ public function getParams(): array
  {
  return [];
  }
 
  /**
  * @return string
  */
- public function getPath()
+ public function getPath(): string
  {
  return 'blobs/' . $this->blobId;
  }
@@ -44,7 +44,7 @@ public function getPath()
  * @param object $res
  * @return DownloadFileResult
  */
- public function parseResult($httpCode, $res)
+ public function parseResult($httpCode, $res): \Threema\MsgApi\Commands\Results\Result
  {
  return new DownloadFileResult($httpCode, $res);
  }

diff --git a/src/Threema/MsgApi/Commands/FetchPublicKey.php b/src/Threema/MsgApi/Commands/FetchPublicKey.php
@@ -26,15 +26,15 @@ public function __construct($threemaId)
  /**
  * @return array
  */
- public function getParams()
+ public function getParams(): array
  {
  return [];
  }
 
  /**
  * @return string
  */
- public function getPath()
+ public function getPath(): string
  {
  return 'pubkeys/' . $this->threemaId;
  }
@@ -44,7 +44,7 @@ public function getPath()
  * @param object $res
  * @return FetchPublicKeyResult
  */
- public function parseResult($httpCode, $res)
+ public function parseResult($httpCode, $res): \Threema\MsgApi\Commands\Results\Result
  {
  return new FetchPublicKeyResult($httpCode, $res);
  }

diff --git a/src/Threema/MsgApi/Commands/JsonCommandInterface.php b/src/Threema/MsgApi/Commands/JsonCommandInterface.php
@@ -4,6 +4,8 @@
  * @copyright Copyright (c) 2015-2016 Threema GmbH
  */
 
+declare(strict_types=1);
+
 namespace Threema\MsgApi\Commands;
 
 interface JsonCommandInterface extends CommandInterface

diff --git a/src/Threema/MsgApi/Commands/LookupBulk.php b/src/Threema/MsgApi/Commands/LookupBulk.php
@@ -52,7 +52,7 @@ public function findPhone(string $phoneHash): array
  /**
  * @return array
  */
- public function getParams()
+ public function getParams(): array
  {
  return [];
  }
@@ -77,7 +77,7 @@ public function getJson(): string
  /**
  * @return string
  */
- public function getPath()
+ public function getPath(): string
  {
  return 'lookup/bulk';
  }
@@ -87,7 +87,7 @@ public function getPath()
  * @param object $res
  * @return LookupBulkResult
  */
- public function parseResult($httpCode, $res)
+ public function parseResult($httpCode, $res): \Threema\MsgApi\Commands\Results\Result
  {
  return new LookupBulkResult($httpCode, $res, $this);
  }

diff --git a/src/Threema/MsgApi/Commands/LookupEmail.php b/src/Threema/MsgApi/Commands/LookupEmail.php
@@ -35,15 +35,15 @@ public function getEmailAddress()
  /**
  * @return array
  */
- public function getParams()
+ public function getParams(): array
  {
  return [];
  }
 
  /**
  * @return string
  */
- public function getPath()
+ public function getPath(): string
  {
  return 'lookup/email_hash/' . urlencode(AbstractEncryptor::getInstance()->hashEmail($this->emailAddress));
  }
@@ -53,7 +53,7 @@ public function getPath()
  * @param object $res
  * @return LookupIdResult
  */
- public function parseResult($httpCode, $res)
+ public function parseResult($httpCode, $res): \Threema\MsgApi\Commands\Results\Result
  {
  return new LookupIdResult($httpCode, $res);
  }

diff --git a/src/Threema/MsgApi/Commands/LookupPhone.php b/src/Threema/MsgApi/Commands/LookupPhone.php
@@ -35,15 +35,15 @@ public function getPhoneNumber()
  /**
  * @return array
  */
- public function getParams()
+ public function getParams(): array
  {
  return [];
  }
 
  /**
  * @return string
  */
- public function getPath()
+ public function getPath(): string
  {
  return 'lookup/phone_hash/' . urlencode(AbstractEncryptor::getInstance()->hashPhoneNo($this->phoneNumber));
  }
@@ -53,7 +53,7 @@ public function getPath()
  * @param object $res
  * @return LookupIdResult
  */
- public function parseResult($httpCode, $res)
+ public function parseResult($httpCode, $res): \Threema\MsgApi\Commands\Results\Result
  {
  return new LookupIdResult($httpCode, $res);
  }

diff --git a/src/Threema/MsgApi/Commands/MultiPartCommandInterface.php b/src/Threema/MsgApi/Commands/MultiPartCommandInterface.php
@@ -4,9 +4,11 @@
  * @copyright Copyright (c) 2015-2016 Threema GmbH
  */
 
+declare(strict_types=1);
+
 namespace Threema\MsgApi\Commands;
 
 interface MultiPartCommandInterface extends CommandInterface
 {
- public function getData();
+ public function getData(): string;
 }