From 3ceebc637d78b1257227095a2cbfeff202152243 Mon Sep 17 00:00:00 2001
From: Bryant Luk <bryant.luk@getbraintree.com>
Date: Thu, 7 Jan 2016 15:05:36 -0600
Subject: [PATCH 1/2] Add PHP 7.0 to Travis-CI tested PHP versions

---
 .travis.yml | 1 +
 1 file changed, 1 insertion(+)

diff --git a/.travis.yml b/.travis.yml
index fb6a6ae..583b7f9 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -5,6 +5,7 @@ php:
 - 5.4
 - 5.5
 - 5.6
+- 7.0
 - hhvm
 matrix:
   allow_failures:

From 7f8ebae5e7727d2b63e92fa71328b6de52041466 Mon Sep 17 00:00:00 2001
From: Bryant Luk <bryant.luk@getbraintree.com>
Date: Thu, 7 Jan 2016 15:18:53 -0600
Subject: [PATCH 2/2] Ensure backwards compatible behavior with PHP5

---
 lib/PayPal/Validation/JsonValidator.php | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/lib/PayPal/Validation/JsonValidator.php b/lib/PayPal/Validation/JsonValidator.php
index 9f064ed..1159237 100644
--- a/lib/PayPal/Validation/JsonValidator.php
+++ b/lib/PayPal/Validation/JsonValidator.php
@@ -21,6 +21,9 @@ class JsonValidator
     {
         @json_decode($string);
         if (json_last_error() != JSON_ERROR_NONE) {
+            if ($string === '' || $string === null) {
+                return true;
+            }
             if ($silent == false) {
                 //Throw an Exception for string or array
                 throw new \InvalidArgumentException("Invalid JSON String");