From a48b274549acb5be816c712e14fcee3d1239211d Mon Sep 17 00:00:00 2001
From: Bob Weinand <bobwei9@hotmail.com>
Date: Mon, 8 Feb 2016 02:16:01 +0100
Subject: [PATCH] Fix the travis matrix

---
 .travis.yml       |  5 ++---
 travis-install.sh | 13 +++++++------
 2 files changed, 9 insertions(+), 9 deletions(-)

diff --git a/.travis.yml b/.travis.yml
index 7f906e8..7245a8f 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -1,9 +1,8 @@
 language: php
 
 php:
-  - 5.4
-  - 5.5
-  - 5.6
+  - 7.0
+  - nightly
 
 before_install:
   - chmod +x travis-install.sh
diff --git a/travis-install.sh b/travis-install.sh
index bbf155b..2fe53d1 100644
--- a/travis-install.sh
+++ b/travis-install.sh
@@ -3,11 +3,12 @@ set -e
 set -o pipefail
 
 # install 'libuv'
-git clone --recursive --branch v1.0.0 --depth 1 https://github.com/joyent/libuv.git
-pushd libuv
-./autogen.sh && ./configure && make && sudo make install
-popd
+mkdir libuv
+curl -L https://github.com/libuv/libuv/archive/v1.6.1.tar.gz | tar xzf -
+cd libuv-1.6.1 && ./autogen.sh && ./configure --prefix=$(readlink -f `pwd`/../libuv) && make && make install
+cd ..
 
 #install 'php-uv'
-phpize && ./configure --with-uv --enable-httpparser && make && sudo make install
-echo "extension=uv.so" >> `php --ini | grep "Loaded Configuration" | sed -e "s|.*:\s*||"`
+#phpize && ./configure --with-uv=$(readlink -f `pwd`/libuv) --enable-httpparser && make && make install
+phpize && ./configure --with-uv=$(readlink -f `pwd`/libuv) && make && make install
+echo "extension = uv.so" >> ~/.phpenv/versions/$(phpenv version-name)/etc/php.ini