From 2c658b2a9e79b4da1480f47de391154ec4d0268b Mon Sep 17 00:00:00 2001
From: Stefan Giehl <stefan.giehl@mayflower.de>
Date: Fri, 5 May 2017 13:57:55 +0200
Subject: [PATCH] update travis file

---
 .travis.yml  | 7 +------
 tests/travis | 2 +-
 2 files changed, 2 insertions(+), 7 deletions(-)

diff --git a/.travis.yml b/.travis.yml
index 463a521af5..08672b09a2 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -84,8 +84,6 @@ sudo: required
 script: $PIWIK_ROOT_DIR/tests/travis/travis.sh
 
 before_install:
-  # do not use the Zend allocator on PHP 5.3 since it will randomly segfault after program execution
-  - '[[ "$TRAVIS_PHP_VERSION" == 5.3* ]] && export USE_ZEND_ALLOC=0 || true'
   - ./tests/travis/install_git_lfs.sh
 
 install:
@@ -96,9 +94,6 @@ install:
 
   - ./tests/travis/configure_git.sh
 
-  # disable tls for php 5.3 as openssl isn't available
-  - '[[ "$TRAVIS_PHP_VERSION" == 5.3* ]] && composer config -g -- disable-tls true || true'
-
   # travis now complains about this failing 9 times out of 10, so removing it
   #- travis_retry composer self-update
   - '[ "$SKIP_COMPOSER_INSTALL" == "1" ] || travis_retry composer install' 
@@ -145,7 +140,7 @@ before_script:
 
   - ./tests/travis/prepare.sh
   - ./tests/travis/setup_webserver.sh
-  - if [[ "$TRAVIS_PHP_VERSION" != 5.3* ]]; then ./tests/travis/install_phantomjs.sh; export PATH=$PWD/travis_phantomjs/phantomjs-2.1.1-linux-x86_64/bin:$PATH; fi
+  - ./tests/travis/install_phantomjs.sh; export PATH=$PWD/travis_phantomjs/phantomjs-2.1.1-linux-x86_64/bin:$PATH;
 
   - cd tests/PHPUnit
 
diff --git a/tests/travis b/tests/travis
index e3ee1bc4a1..2b964578ba 160000
--- a/tests/travis
+++ b/tests/travis
@@ -1 +1 @@
-Subproject commit e3ee1bc4a16a93e807b1cfbcee42567cd5b8fcb4
+Subproject commit 2b964578ba1b74e28699ae75d9fee3402258b5d4
-- 
GitLab