Renamed MemoryAccountStore to LoginAccountStore

Author: mrm

Atomx/ApiClient.php

@@ -4,6 +4,7 @@
 use GuzzleHttp\Client;
 use GuzzleHttp\Exception\RequestException;
 use GuzzleHttp\Message\Response;
+use GuzzleHttp\Stream\StreamInterface;
 
 class ApiClient {
     protected $endpoint;
@@ -64,6 +65,12 @@ public function post($fields = [])
         return $this->postUrl($this->endpoint, ['json' => $fields]);
     }
 
+    /**
+     * @param $url
+     * @param array $options
+     * @return string|StreamInterface
+     * @throws ApiException
+     */
     public function postUrl($url, $options = [])
     {
         return $this->request('post', $url, $options);
@@ -133,7 +140,6 @@ public function __get($name)
 
     public function fill($fields)
     {
-        // TODO: Merge with the other fields
         $this->fields = $fields;
     }
 

Atomx/AtomxClient.php

@@ -26,6 +26,8 @@ function __construct($accountStore = null, $idOrFields = null)
         if ($accountStore) {
             $this->accountStore = $accountStore;
             $this->apiBase = $accountStore->getApiBase();
+        } else if ($this->requiresToken) {
+            throw new \InvalidArgumentException("{$this->endpoint} endpoint requires an AccountStore for the token");
         } else {
             $this->apiBase = AtomxClient::API_BASE;
         }

Atomx/MemoryAccountStore.php Atomx/LoginAccountStore.phpAtomx/MemoryAccountStore.php renamed to Atomx/LoginAccountStore.php

@@ -3,7 +3,7 @@
 use Atomx\Exceptions\TotpRequiredException;
 use Atomx\Resources\Login;
 
-class MemoryAccountStore implements AccountStore {
+class LoginAccountStore implements AccountStore {
     protected $token = null;
     protected $username, $password, $totp, $apiBase;
 

Atomx/Resources/Report.php

@@ -23,6 +23,11 @@ public function run($json, $timeout = 600)
         return new ReportStreamer($stream);
     }
 
+    /**
+     * @param Response $response
+     * @return \GuzzleHttp\Stream\StreamInterface|mixed|null|string
+     * @throws ApiException
+     */
     protected function handleResponse(Response $response)
     {
         if ($response->getStatusCode() == 200) {

tests/ClientTest.php

@@ -3,11 +3,11 @@
 use Atomx\AccountStore;
 use Atomx\Exceptions\ApiException;
 use Atomx\Exceptions\TotpRequiredException;
-use Atomx\MemoryAccountStore;
+use Atomx\LoginAccountStore;
 use Atomx\Resources\Advertiser;
+use Atomx\Resources\Browsers;
 use Atomx\Resources\Domain;
 use Atomx\Resources\Login;
-use Atomx\Resources\Totp;
 use GuzzleHttp\Message\Response;
 use GuzzleHttp\Stream\Stream;
 use GuzzleHttp\Subscriber\History;
@@ -23,13 +23,22 @@ public function getPassword() { return ''; }
     public function getApiBase() { return 'https://api.atomx.com/v3/'; }
 }
 
-class TestLoginAccountStore extends MemoryAccountStore {
+class TestLoginAccountStore extends LoginAccountStore {
     private $loginClient;
     public function setLoginClient($client) { $this->loginClient = $client; }
     protected function getLoginClient() { return $this->loginClient; }
 }
 
 class ClientTest extends \PHPUnit_Framework_TestCase {
+    /**
+     * @expectedException \InvalidArgumentException
+     */
+    public function testTokenEndpointWithoutAS()
+    {
+        new Advertiser();
+    }
+
+
     public function testDiscardInvalidToken()
     {
         $store = new TestAccountStore();