2.10.1

printathing · Jun 16, 2011 · 056aae8 · 056aae8
1 parent 81bcfef
commit 056aae8
Show file tree

Hide file tree

Showing 12 changed files with 27 additions and 19 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -1,3 +1,7 @@
+## 2.10.1
+
+* Wrap dependency requirement in a function, to prevent pollution of the global namespace
+
 ## 2.10.0
 
 * Added subscriptionDetails to Transaction

diff --git a/README.md b/README.md
@@ -49,7 +49,7 @@ The following PHP extensions are required:
 
 ## Documentation
 
- * [Official documentation](http://www.braintreepaymentsolutions.com/docs/php)
+ * [Official documentation](http://www.braintreepayments.com/docs/php)
 
 ## License
 

diff --git a/lib/Braintree.php b/lib/Braintree.php
@@ -139,11 +139,14 @@ public static function returnObjectOrThrowException($className, $resultObj)
     throw new Braintree_Exception('PHP version >= 5.2.1 required');
 }
 
-$requiredExtensions = array('xmlwriter', 'SimpleXML', 'openssl', 'dom', 'hash', 'curl');
-foreach ($requiredExtensions AS $ext) {
-    if (!extension_loaded($ext)) {
-        throw new Braintree_Exception('The Braintree library requires the ' . $ext . ' extension.');
+
+function requireDependencies() {
+    $requiredExtensions = array('xmlwriter', 'SimpleXML', 'openssl', 'dom', 'hash', 'curl');
+    foreach ($requiredExtensions AS $ext) {
+        if (!extension_loaded($ext)) {
+            throw new Braintree_Exception('The Braintree library requires the ' . $ext . ' extension.');
+        }
     }
 }
 
-
+requireDependencies();
diff --git a/lib/Braintree/CreditCard.php b/lib/Braintree/CreditCard.php
@@ -12,8 +12,8 @@
  *
  * <b>== More information ==</b>
  *
- * For more detailed information on CreditCards, see {@link http://www.braintreepaymentsolutions.com/gateway/credit-card-api http://www.braintreepaymentsolutions.com/gateway/credit-card-api}<br />
- * For more detailed information on CreditCard verifications, see {@link http://www.braintreepaymentsolutions.com/gateway/credit-card-verification-api http://www.braintreepaymentsolutions.com/gateway/credit-card-verification-api}
+ * For more detailed information on CreditCards, see {@link http://www.braintreepayments.com/gateway/credit-card-api http://www.braintreepaymentsolutions.com/gateway/credit-card-api}<br />
+ * For more detailed information on CreditCard verifications, see {@link http://www.braintreepayments.com/gateway/credit-card-verification-api http://www.braintreepaymentsolutions.com/gateway/credit-card-verification-api}
  *
  * @package    Braintree
  * @category   Resources

diff --git a/lib/Braintree/Customer.php b/lib/Braintree/Customer.php
@@ -12,7 +12,7 @@
  *
  * <b>== More information ==</b>
  *
- * For more detailed information on Customers, see {@link http://www.braintreepaymentsolutions.com/gateway/customer-api http://www.braintreepaymentsolutions.com/gateway/customer-api}
+ * For more detailed information on Customers, see {@link http://www.braintreepayments.com/gateway/customer-api http://www.braintreepaymentsolutions.com/gateway/customer-api}
  *
  * @package    Braintree
  * @category   Resources
@@ -288,7 +288,7 @@ public static function saleNoValidate($customerId, $transactionAttribs)
      *
      * If <b>query</b> is a string, the search will be a basic search.
      * If <b>query</b> is a hash, the search will be an advanced search.
-     * For more detailed information and examples, see {@link http://www.braintreepaymentsolutions.com/gateway/customer-api#searching http://www.braintreepaymentsolutions.com/gateway/customer-api}
+     * For more detailed information and examples, see {@link http://www.braintreepayments.com/gateway/customer-api#searching http://www.braintreepaymentsolutions.com/gateway/customer-api}
      *
      * @param mixed $query search query
      * @param array $options options such as page number

diff --git a/lib/Braintree/Error/Validation.php b/lib/Braintree/Error/Validation.php
@@ -13,7 +13,7 @@
  *
  * <b>== More information ==</b>
  *
- * For more detailed information on Validation errors, see {@link http://www.braintreepaymentsolutions.com/gateway/validation-errors http://www.braintreepaymentsolutions.com/gateway/validation-errors}
+ * For more detailed information on Validation errors, see {@link http://www.braintreepayments.com/gateway/validation-errors http://www.braintreepaymentsolutions.com/gateway/validation-errors}
  *
  * @package    Braintree
  * @subpackage Error

diff --git a/lib/Braintree/Error/ValidationErrorCollection.php b/lib/Braintree/Error/ValidationErrorCollection.php
@@ -12,7 +12,7 @@
  *
  * <b>== More information ==</b>
  *
- * For more detailed information on Validation errors, see {@link http://www.braintreepaymentsolutions.com/gateway/validation-errors http://www.braintreepaymentsolutions.com/gateway/validation-errors}
+ * For more detailed information on Validation errors, see {@link http://www.braintreepayments.com/gateway/validation-errors http://www.braintreepaymentsolutions.com/gateway/validation-errors}
  *
  * @package    Braintree
  * @subpackage Error

diff --git a/lib/Braintree/Http.php b/lib/Braintree/Http.php
@@ -65,6 +65,7 @@ private static function _doRequest($httpVerb, $path, $requestBody = null)
         curl_setopt($curl, CURLOPT_TIMEOUT, 60);
         curl_setopt($curl, CURLOPT_CUSTOMREQUEST, $httpVerb);
         curl_setopt($curl, CURLOPT_URL, Braintree_Configuration::merchantUrl() . $path);
+        curl_setopt($curl, CURLOPT_ENCODING, 'gzip');
         curl_setopt($curl, CURLOPT_HTTPHEADER, array(
             'Accept: application/xml',
             'Content-Type: application/xml',

diff --git a/lib/Braintree/Subscription.php b/lib/Braintree/Subscription.php
@@ -4,7 +4,7 @@
  *
  * <b>== More information ==</b>
  *
- * For more detailed information on Subscriptions, see {@link http://www.braintreepaymentsolutions.com/gateway/subscription-api http://www.braintreepaymentsolutions.com/gateway/subscription-api}
+ * For more detailed information on Subscriptions, see {@link http://www.braintreepayments.com/gateway/subscription-api http://www.braintreepaymentsolutions.com/gateway/subscription-api}
  *
  * PHP Version 5
  *

diff --git a/lib/Braintree/Transaction.php b/lib/Braintree/Transaction.php
@@ -45,7 +45,7 @@
  *     'email' => '[email protected]',
  *     'phone' => '419-555-1234',
  *     'fax' => '419-555-1235',
- *     'website' => 'http://braintreepaymentsolutions.com'
+ *     'website' => 'http://braintreepayments.com'
  *    ),
  *    'billing'    => array(
  *      'firstName' => 'Carl',
@@ -139,7 +139,7 @@
  *
  * <b>== More information ==</b>
  *
- * For more detailed information on Transactions, see {@link http://www.braintreepaymentsolutions.com/gateway/transaction-api http://www.braintreepaymentsolutions.com/gateway/transaction-api}
+ * For more detailed information on Transactions, see {@link http://www.braintreepayments.com/gateway/transaction-api http://www.braintreepaymentsolutions.com/gateway/transaction-api}
  *
  * @package    Braintree
  * @category   Resources
@@ -369,7 +369,7 @@ public static function saleNoValidate($attribs)
      *
      * If <b>query</b> is a string, the search will be a basic search.
      * If <b>query</b> is a hash, the search will be an advanced search.
-     * For more detailed information and examples, see {@link http://www.braintreepaymentsolutions.com/gateway/transaction-api#searching http://www.braintreepaymentsolutions.com/gateway/transaction-api}
+     * For more detailed information and examples, see {@link http://www.braintreepayments.com/gateway/transaction-api#searching http://www.braintreepaymentsolutions.com/gateway/transaction-api}
      *
      * @param mixed $query search query
      * @param array $options options such as page number

diff --git a/lib/Braintree/Version.php b/lib/Braintree/Version.php
@@ -18,7 +18,7 @@ final class Braintree_Version
      */
     const MAJOR = 2;
     const MINOR = 10;
-    const TINY = 0;
+    const TINY = 1;
 
     /**
      * @ignore

diff --git a/tests/integration/TransactionTest.php b/tests/integration/TransactionTest.php
@@ -87,7 +87,7 @@ function testSale_withAllAttributes()
                 'email' => '[email protected]',
                 'phone' => '419-555-1234',
                 'fax' => '419-555-1235',
-                'website' => 'http://braintreepaymentsolutions.com'
+                'website' => 'http://braintreepayments.com'
             ),
             'billing' => array(
                 'firstName' => 'Carl',
@@ -148,7 +148,7 @@ function testSale_withAllAttributes()
       $this->assertEquals('[email protected]', $transaction->customerDetails->email);
       $this->assertEquals('419-555-1234', $transaction->customerDetails->phone);
       $this->assertEquals('419-555-1235', $transaction->customerDetails->fax);
-      $this->assertEquals('http://braintreepaymentsolutions.com', $transaction->customerDetails->website);
+      $this->assertEquals('http://braintreepayments.com', $transaction->customerDetails->website);
 
       $this->assertEquals('Carl', $transaction->billingDetails->firstName);
       $this->assertEquals('Jones', $transaction->billingDetails->lastName);