Merge branch '4.0'

nicolas-grekas · nicolas-grekas · commit a38cbd08ced3 · 2018-02-22T15:57:47.000+01:00
* 4.0:
  [travis] fix libsodium install
diff --git a/.travis.yml b/.travis.yml
@@ -135,11 +135,9 @@ 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
-              sudo add-apt-repository ppa:ondrej/php -y
-              sudo apt-get update -q
-              sudo apt-get install libsodium-dev -y
-          fi
+          sudo add-apt-repository ppa:ondrej/php -y
+          sudo apt-get update -q
+          sudo apt-get install libsodium-dev -y
 
           tfold ext.apcu tpecl apcu-5.1.6 apcu.so $INI
           tfold ext.libsodium tpecl libsodium sodium.so $INI
