Use Braintree gateway instance instead of static methods

Author: barryvdh

src/Gateway.php

@@ -3,12 +3,44 @@
 namespace Omnipay\Braintree;
 
 use Omnipay\Common\AbstractGateway;
-
+use Braintree_Gateway;
+use Braintree_Configuration;
+use Guzzle\Http\ClientInterface;
+use Symfony\Component\HttpFoundation\Request as HttpRequest;
 /**
  * Braintree Gateway
  */
 class Gateway extends AbstractGateway
 {
+    /**
+     * @var \Braintree_Gateway
+     */
+    protected $braintree;
+
+    /**
+     * Create a new gateway instance
+     *
+     * @param ClientInterface $httpClient  A Guzzle client to make API calls with
+     * @param HttpRequest     $httpRequest A Symfony HTTP request object
+     * @param Braintree_Gateway $braintree The Braintree gateway
+     */
+    public function __construct(ClientInterface $httpClient = null, HttpRequest $httpRequest = null, Braintree_Gateway $braintree = null)
+    {
+        $this->braintree = $braintree ?: Braintree_Configuration::gateway();
+
+        parent::__construct($httpClient, $httpRequest);
+    }
+
+    /**
+     * {@inheritdoc}
+     */
+    protected function createRequest($class, array $parameters)
+    {
+        $obj = new $class($this->httpClient, $this->httpRequest, $this->braintree);
+
+        return $obj->initialize(array_replace($this->getParameters(), $parameters));
+    }
+
     public function getName()
     {
         return 'Braintree';

src/Message/AbstractRequest.php

@@ -2,7 +2,9 @@
 
 namespace Omnipay\Braintree\Message;
 
-use Braintree_Configuration;
+use Braintree_Gateway;
+use Guzzle\Http\ClientInterface;
+use Symfony\Component\HttpFoundation\Request as HttpRequest;
 use Omnipay\Common\Message\AbstractRequest as BaseAbstractRequest;
 
 /**
@@ -11,6 +13,25 @@
  */
 abstract class AbstractRequest extends BaseAbstractRequest
 {
+    /**
+     * @var \Braintree_Gateway
+     */
+    protected $braintree;
+
+    /**
+     * Create a new Request
+     *
+     * @param ClientInterface $httpClient  A Guzzle client to make API calls with
+     * @param HttpRequest     $httpRequest A Symfony HTTP request object
+     * @param Braintree_Gateway $braintree The Braintree Gateway
+     */
+    public function __construct(ClientInterface $httpClient, HttpRequest $httpRequest, Braintree_Gateway $braintree)
+    {
+        $this->braintree = $braintree;
+
+          parent::__construct($httpClient, $httpRequest);
+    }
+
     /**
      * Set the correct configuration sending
      *
@@ -25,21 +46,19 @@ public function send()
 
     public function configure()
     {
-        // Reset to the initial state
-        Braintree_Configuration::reset();
-
         // When in testMode, use the sandbox environment
         if ($this->getTestMode()) {
-            Braintree_Configuration::environment('sandbox');
+            $this->braintree->config->environment('sandbox');
         } else {
-            Braintree_Configuration::environment('production');
+            $this->braintree->config->environment('production');
         }
 
         // Set the keys
-        Braintree_Configuration::merchantId($this->getMerchantId());
-        Braintree_Configuration::publicKey($this->getPublicKey());
-        Braintree_Configuration::privateKey($this->getPrivateKey());
+        $this->braintree->config->merchantId($this->getMerchantId());
+        $this->braintree->config->publicKey($this->getPublicKey());
+        $this->braintree->config->privateKey($this->getPrivateKey());
     }
+
     public function getMerchantId()
     {
         return $this->getParameter('merchantId');

src/Message/AuthorizeRequest.php

@@ -1,7 +1,6 @@
 <?php
 namespace Omnipay\Braintree\Message;
 
-use Braintree_Transaction;
 use Omnipay\Common\Message\ResponseInterface;
 
 /**
@@ -60,7 +59,7 @@ public function getData()
      */
     public function sendData($data)
     {
-        $response = Braintree_Transaction::sale($data);
+        $response = $this->braintree->transaction()->sale($data);
 
         return $this->createResponse($response);
     }

src/Message/CaptureRequest.php

@@ -1,7 +1,6 @@
 <?php
 namespace Omnipay\Braintree\Message;
 
-use Braintree_Transaction;
 use Omnipay\Common\Message\ResponseInterface;
 
 /**
@@ -29,7 +28,7 @@ public function getData()
      */
     public function sendData($data)
     {
-        $response = Braintree_Transaction::submitForSettlement($data['transactionReference'], $data['amount']);
+        $response = $this->braintree->transaction()->submitForSettlement($data['transactionReference'], $data['amount']);
 
         return $this->createResponse($response);
     }

src/Message/ClientTokenRequest.php

@@ -1,7 +1,6 @@
 <?php
 namespace Omnipay\Braintree\Message;
 
-use Braintree_ClientToken;
 use Omnipay\Common\Message\ResponseInterface;
 
 /**
@@ -25,7 +24,7 @@ public function getData()
      */
     public function sendData($data)
     {
-        $token = Braintree_ClientToken::generate($data);
+        $token = $this->braintree->clientToken()->generate($data);
 
         return new ClientTokenResponse($this, $token);
     }

src/Message/FindRequest.php

@@ -1,7 +1,6 @@
 <?php
 namespace Omnipay\Braintree\Message;
 
-use Braintree_Transaction;
 use Omnipay\Common\Message\ResponseInterface;
 
 /**
@@ -28,7 +27,7 @@ public function getData()
      */
     public function sendData($data)
     {
-        $response = Braintree_Transaction::find($data['transactionReference']);
+        $response = $this->braintree->transaction()->find($data['transactionReference']);
 
         return $this->createResponse($response);
     }

src/Message/RefundRequest.php

@@ -1,7 +1,6 @@
 <?php
 namespace Omnipay\Braintree\Message;
 
-use Braintree_Transaction;
 use Omnipay\Common\Message\ResponseInterface;
 
 /**
@@ -29,7 +28,7 @@ public function getData()
      */
     public function sendData($data)
     {
-        $response = Braintree_Transaction::void($data['transactionReference'], $data['amount']);
+        $response = $this->braintree->transaction()->refund($data['transactionReference'], $data['amount']);
 
         return $this->createResponse($response);
     }

src/Message/VoidRequest.php

@@ -1,7 +1,6 @@
 <?php
 namespace Omnipay\Braintree\Message;
 
-use Braintree_Transaction;
 use Omnipay\Common\Message\ResponseInterface;
 
 /**
@@ -28,7 +27,7 @@ public function getData()
      */
     public function sendData($data)
     {
-        $response = Braintree_Transaction::void($data['transactionReference']);
+        $response = $this->braintree->transaction()->void($data['transactionReference']);
 
         return $this->createResponse($response);
     }

tests/Message/AuthorizeRequestTest.php

@@ -15,7 +15,7 @@ public function setUp()
     {
         parent::setUp();
 
-        $this->request = new AuthorizeRequest($this->getHttpClient(), $this->getHttpRequest());
+        $this->request = new AuthorizeRequest($this->getHttpClient(), $this->getHttpRequest(), \Braintree_Configuration::gateway());
         $this->request->initialize(
             array(
                 'amount' => '10.00',

tests/Message/PurchaseRequestTest.php

@@ -15,7 +15,7 @@ public function setUp()
     {
         parent::setUp();
 
-        $this->request = new PurchaseRequest($this->getHttpClient(), $this->getHttpRequest());
+        $this->request = new PurchaseRequest($this->getHttpClient(), $this->getHttpRequest(), \Braintree_Configuration::gateway());
         $this->request->initialize(
             array(
                 'amount' => '10.00',