From 0f1cae864b0c56e9278d3be716efcaad47c89dcd Mon Sep 17 00:00:00 2001
From: Nicolas Grekas <nicolas.grekas@gmail.com>
Date: Thu, 22 Feb 2018 13:59:51 +0100
Subject: [PATCH 1/2] [travis] cache in ~/php-ext/

---
 .travis.yml | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/.travis.yml b/.travis.yml
index 1eaa6cefbc..25ca170da9 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -35,7 +35,7 @@ cache:
     directories:
         - .phpunit
         - php-$MIN_PHP
-        - php-ext
+        - ~/php-ext
 
 services: mongodb
 
@@ -109,7 +109,7 @@ before_install:
           local ext_so=$2
           local INI=$3
           local ext_dir=$(php -r "echo ini_get('extension_dir');")
-          local ext_cache=php-ext/$(basename $ext_dir)/$ext_name
+          local ext_cache=~/php-ext/$(basename $ext_dir)/$ext_name
 
           if [[ -e $ext_cache/$ext_so ]]; then
               echo extension = $ext_cache/$ext_so >> $INI

From 8f1ca2b3e416ae1ca3fed64714d1ce2c3c074332 Mon Sep 17 00:00:00 2001
From: Nicolas Grekas <nicolas.grekas@gmail.com>
Date: Thu, 22 Feb 2018 14:01:17 +0100
Subject: [PATCH 2/2] fix merge

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

diff --git a/.travis.yml b/.travis.yml
index 84d7fec722..8e7f6570b9 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -151,7 +151,7 @@ before_install:
           tfold ext.apcu tpecl apcu-4.0.11 apcu.so $INI
       elif [[ ! $skip && $PHP = 7.* ]]; then
           # install libsodium
-          if [[ ! -e php-ext/$(php -r "echo basename(ini_get('extension_dir'));")/libsodium/sodium.so ]]; then
+          if [[ ! -e ~/php-ext/$(php -r "echo basename(ini_get('extension_dir'));")/libsodium/sodium.so ]]; then
               sudo add-apt-repository ppa:ondrej/php -y
               sudo apt-get update -q
               sudo apt-get install libsodium-dev -y