Merge branch '3.4' into 4.0

* 3.4:
  fix merge
  [travis] cache in ~/php-ext/

.travis.yml

@@ -32,7 +32,7 @@ cache:
     directories:
         - .phpunit
         - php-$MIN_PHP
-        - php-ext
+        - ~/php-ext
 
 services:
     - memcached
@@ -104,7 +104,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
@@ -135,7 +135,7 @@ before_install:
       # Install extra PHP extensions
       if [[ ! $skip ]]; 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