Added make() method to bypass service locator caching (#248)

* Added make() method to bypass service locator caching

* Missed an 's' on the Accounts client factory

* Added unit tests to show Account\ClientFactory has the correct URLs and URIs

Author: dragonmantank

src/Account/Client.php

@@ -41,7 +41,7 @@ public function __construct(?APIResource $accountAPI = null, ?APIResource $secre
      * Shim to handle older instatiations of this class
      * @deprecated Will remove in v3
      */
-    protected function getAccountAPI() : APIResource
+    public function getAccountAPI() : APIResource
     {
         if (is_null($this->accountAPI)) {
             $api = new APIResource();
@@ -65,7 +65,7 @@ public function getAPIResource(): APIResource
      * Shim to handle older instatiations of this class
      * @deprecated Will remove in v3
      */
-    protected function getSecretsAPI() : APIResource
+    public function getSecretsAPI() : APIResource
     {
         if (is_null($this->secretsAPI)) {
             $api = new APIResource();

src/Account/ClientFactory.php

@@ -11,15 +11,15 @@ class ClientFactory
     public function __invoke(ContainerInterface $container) : Client
     {
         /** @var APIResource $accountApi */
-        $accountApi = $container->get(APIResource::class);
+        $accountApi = $container->make(APIResource::class);
         $accountApi
             ->setBaseUrl($accountApi->getClient()->getRestUrl())
             ->setIsHAL(false)
             ->setBaseUri('/account')
         ;
 
-        $secretsApi = $container->get(APIResource::class);
-        $secretsApi->setBaseUri('/account');
+        $secretsApi = $container->make(APIResource::class);
+        $secretsApi->setBaseUri('/accounts');
 
         return new Client($accountApi, $secretsApi);
     }

src/Application/ClientFactory.php

@@ -14,7 +14,7 @@ class ClientFactory
     public function __invoke(ContainerInterface $container) : Client
     {
         /** @var APIResource $api */
-        $api = $container->get(APIResource::class);
+        $api = $container->make(APIResource::class);
         $api
             ->setBaseUri('/v2/applications')
             ->setCollectionName('applications')

src/Client/Factory/MapFactory.php

@@ -59,7 +59,28 @@ public function get($key)
             return $this->cache[$key];
         }
 
-        if (!$this->hasApi($key)) {
+        $instance = $this->make($key);
+        $this->cache[$key] = $instance;
+
+        return $instance;
+    }
+
+    public function getClient()
+    {
+        return $this->client;
+    }
+
+    /**
+     * @deprecated Use get() instead
+     */
+    public function getApi($api)
+    {
+        return $this->get($api);
+    }
+
+    public function make($key)
+    {
+        if (!$this->has($key)) {
             throw new \RuntimeException(sprintf(
                 'no map defined for `%s`',
                 $key
@@ -79,21 +100,8 @@ public function get($key)
         if ($instance instanceof Client\ClientAwareInterface) {
             $instance->setClient($this->client);
         }
-        $this->cache[$key] = $instance;
-        return $instance;
-    }
 
-    public function getClient()
-    {
-        return $this->client;
-    }
-
-    /**
-     * @deprecated Use get() instead
-     */
-    public function getApi($api)
-    {
-        return $this->get($api);
+        return $instance;
     }
 
     public function set($key, $value)

src/Conversion/ClientFactory.php

@@ -14,7 +14,7 @@ class ClientFactory
     public function __invoke(ContainerInterface $container) : Client
     {
         /** @var APIResource $api */
-        $api = $container->get(APIResource::class);
+        $api = $container->make(APIResource::class);
         $api->setBaseUri('/conversions/');
 
         return new Client($api);

src/Insights/ClientFactory.php

@@ -11,7 +11,7 @@ class ClientFactory
     public function __invoke(ContainerInterface $container) : Client
     {
         /** @var APIResource $api */
-        $api = $container->get(APIResource::class);
+        $api = $container->make(APIResource::class);
         $api->setIsHAL(false);
 
         return new Client($api);

src/Numbers/ClientFactory.php

@@ -11,7 +11,7 @@ class ClientFactory
     public function __invoke(ContainerInterface $container) : Client
     {
         /** @var APIResource $api */
-        $api = $container->get(APIResource::class);
+        $api = $container->make(APIResource::class);
         $api
             ->setBaseUrl($api->getClient()->getRestUrl())
             ->setIsHAL(false)

src/Redact/ClientFactory.php

@@ -15,7 +15,7 @@ class ClientFactory
     public function __invoke(ContainerInterface $container) : Client
     {
         /** @var APIResource $api */
-        $api = $container->get(APIResource::class);
+        $api = $container->make(APIResource::class);
         $api
             ->setBaseUri('/v1/redact/transaction')
             ->setCollectionName('')

src/SMS/ClientFactory.php

@@ -11,7 +11,7 @@ class ClientFactory
     public function __invoke(ContainerInterface $container) : Client
     {
         /** @var APIResource $api */
-        $api = $container->get(APIResource::class);
+        $api = $container->make(APIResource::class);
         $api
             ->setBaseUrl($api->getClient()->getRestUrl())
             ->setCollectionName('messages')

src/Verify/ClientFactory.php

@@ -11,7 +11,7 @@ class ClientFactory
     public function __invoke(ContainerInterface $container) : Client
     {
         /** @var APIResource $api */
-        $api = $container->get(APIResource::class);
+        $api = $container->make(APIResource::class);
         $api
             ->setIsHAL(false)
             ->setBaseUri('/verify')