From 28c9db985b973fc53eec5c1ef024d96577cc2e70 Mon Sep 17 00:00:00 2001
From: Daniel Gomez Pan <pana_1990@hotmail.com>
Date: Mon, 7 Dec 2015 07:43:02 +0100
Subject: [PATCH 1/2] Update travis

---
 .travis.yml | 12 +++++-------
 1 file changed, 5 insertions(+), 7 deletions(-)

diff --git a/.travis.yml b/.travis.yml
index def49ecea..791d171f1 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -6,18 +6,16 @@ php:
   - 5.6
   - 7.0
   - hhvm
-  - hhvm-nightly
 
 services:
   - redis-server
 
 # run build against hhvm but allow them to fail
 # http://docs.travis-ci.com/user/build-configuration/#Rows-That-are-Allowed-To-Fail
-matrix:
-  fast_finish: true
-  allow_failures:
-    - php: hhvm-nightly
-    - php: 7.0
+#matrix:
+#  fast_finish: true
+#  allow_failures:
+#    - php: 7.0
 
 # faster builds on new travis setup not using sudo
 sudo: false
@@ -29,7 +27,7 @@ cache:
 
 install:
   - travis_retry composer self-update && composer --version
-  - travis_retry composer global require "fxp/composer-asset-plugin:~1.0.0"
+  - travis_retry composer global require "fxp/composer-asset-plugin:~1.1.1"
   - export PATH="$HOME/.composer/vendor/bin:$PATH"
   - travis_retry composer install --prefer-dist --no-interaction
 

From 08ea23a4944c3089eb207da33c26dd3c6fb18da0 Mon Sep 17 00:00:00 2001
From: Daniel Gomez Pan <pana_1990@hotmail.com>
Date: Mon, 7 Dec 2015 12:55:25 +0100
Subject: [PATCH 2/2] Remove block comment [skip ci]

---
 .travis.yml | 7 -------
 1 file changed, 7 deletions(-)

diff --git a/.travis.yml b/.travis.yml
index 791d171f1..e095aa6c4 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -10,13 +10,6 @@ php:
 services:
   - redis-server
 
-# run build against hhvm but allow them to fail
-# http://docs.travis-ci.com/user/build-configuration/#Rows-That-are-Allowed-To-Fail
-#matrix:
-#  fast_finish: true
-#  allow_failures:
-#    - php: 7.0
-
 # faster builds on new travis setup not using sudo
 sudo: false