From f48ae8d05d4472d15d7c50b36aae1efa26150df8 Mon Sep 17 00:00:00 2001
From: Eric Dowell <eric@d0we11.com>
Date: Wed, 13 Jan 2016 16:35:33 -0600
Subject: Update composer.json

Updated satooshi/php-coveralls package to 1.0.* so guzzlehttp/guzzle (~6.0) is used instead of old deprecated guzzle/guzzle (3.9.3)
---
 composer.json | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/composer.json b/composer.json
index 9101239..3024184 100644
--- a/composer.json
+++ b/composer.json
@@ -24,7 +24,7 @@
         "php" : ">=5.3.0"
     },
     "require-dev": {
-        "satooshi/php-coveralls": "0.6.*",
+        "satooshi/php-coveralls": "1.0.*",
         "phpunit/phpunit" : "4.*",
         "sami/sami": "~2.0"
     },
-- 
cgit v1.2.3


From 8d7e15ba1f56dac53c77a65755e1d8f9911b8d6f Mon Sep 17 00:00:00 2001
From: Eric Dowell <eric@d0we11.com>
Date: Thu, 14 Jan 2016 09:13:12 -0600
Subject: phpunit fails to run on php 7.1.0-dev, adding php 7.0 to travis
 config and removing nightly.

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

diff --git a/.travis.yml b/.travis.yml
index d6ad971..2f845a6 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -11,8 +11,8 @@ php:
   - 5.4
   - 5.5
   - 5.6
+  - 7.0
   - hhvm
-  - nightly
 
 notifications:
   irc: "irc.freenode.net#masterminds"
@@ -28,4 +28,3 @@ script:
 after_script:
   - bash -c 'if [ "$TRAVIS_PHP_VERSION" == "5.6" ] ; then wget https://scrutinizer-ci.com/ocular.phar; fi;'
   - bash -c 'if [ "$TRAVIS_PHP_VERSION" == "5.6" ] ; then php ocular.phar code-coverage:upload --format=php-clover coverage.xml; fi;'
-  
-- 
cgit v1.2.3