Merge pull request braintree#33 from braintree/re-commit_gw_instantiation

Re-instate gateway instantiation update

Author: jferm

includes/braintree_init.php

@@ -7,7 +7,9 @@
     $dotenv->load();
 }
 
-Braintree\Configuration::environment(getenv('BT_ENVIRONMENT'));
-Braintree\Configuration::merchantId(getenv('BT_MERCHANT_ID'));
-Braintree\Configuration::publicKey(getenv('BT_PUBLIC_KEY'));
-Braintree\Configuration::privateKey(getenv('BT_PRIVATE_KEY'));
+$gateway = new Braintree\Gateway([
+    'environment' => getenv('BT_ENVIRONMENT'),
+    'merchantId' => getenv('BT_MERCHANT_ID'),
+    'publicKey' => getenv('BT_PUBLIC_KEY'),
+    'privateKey' => getenv('BT_PRIVATE_KEY')
+]);

public_html/checkout.php

@@ -4,7 +4,7 @@
 $amount = $_POST["amount"];
 $nonce = $_POST["payment_method_nonce"];
 
-$result = Braintree\Transaction::sale([
+$result = $gateway->transaction()->sale([
     'amount' => $amount,
     'paymentMethodNonce' => $nonce,
     'options' => [

public_html/index.php

@@ -39,7 +39,7 @@
     <script src="https://js.braintreegateway.com/web/dropin/1.9.4/js/dropin.min.js"></script>
     <script>
         var form = document.querySelector('#payment-form');
-        var client_token = "<?php echo(Braintree\ClientToken::generate()); ?>";
+        var client_token = "<?php echo($gateway->ClientToken()->generate()); ?>";
 
         braintree.dropin.create({
           authorization: client_token,

public_html/transaction.php

@@ -6,7 +6,7 @@
     require_once("../includes/braintree_init.php");
     require_once("../includes/header.php");
     if (isset($_GET["id"])) {
-        $transaction = Braintree\Transaction::find($_GET["id"]);
+        $transaction = $gateway->transaction()->find($_GET["id"]);
 
         $transactionSuccessStatuses = [
             Braintree\Transaction::AUTHORIZED,

tests/TestHelper.php

@@ -7,7 +7,9 @@
     $dotenv->load();
 }
 
-Braintree\Configuration::environment(getenv('BT_ENVIRONMENT'));
-Braintree\Configuration::merchantId(getenv('BT_MERCHANT_ID'));
-Braintree\Configuration::publicKey(getenv('BT_PUBLIC_KEY'));
-Braintree\Configuration::privateKey(getenv('BT_PRIVATE_KEY'));
+$gateway = new Braintree\Gateway([
+    'environment' => getenv('BT_ENVIRONMENT'),
+    'merchantId' => getenv('BT_MERCHANT_ID'),
+    'publicKey' => getenv('BT_PUBLIC_KEY'),
+    'privateKey' => getenv('BT_PRIVATE_KEY')
+]);

tests/integration/TransactionPageTest.php

@@ -5,7 +5,8 @@ class TransactionPageTest extends PHPUnit_Framework_TestCase
 {
     function test_showsTransactionInformation()
     {
-        $result = Braintree\Transaction::sale([
+        global $gateway;
+        $result = $gateway->transaction()->sale([
             'amount' => 10,
             'paymentMethodNonce' => 'fake-valid-nonce'
         ]);