Merge branch 'PHP-5.5' into PHP-5.6

* PHP-5.5:
  add initial install
  switch to C travis project instead of PHP
  use the generic TRAVIS environment var to check for travis (see http://docs.travis-ci.com/user/ci-environment/)

3 files changed, 5 insertions, 6 deletions

diff --git a/.travis.yml b/.travis.yml
index 2125e8d3d6..3baf50be3b 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -1,8 +1,4 @@
-language: php
-
-php:
-    # We only specify one version so we only get one worker
-    - 5.4
+language: c
 
 notifications:
     email: 
@@ -29,6 +25,7 @@ before_install:
     - sudo apt-get install -y libenchant-dev libaspell-dev libpspell-dev librecode-dev
     - sudo cp ./travis/de /var/lib/locales/supported.d/de
     - sudo dpkg-reconfigure locales
+    - ./travis/install.sh
 
 before_script:
     # Compile PHP
diff --git a/run-tests.php b/run-tests.php
index 7d7767f662..87a67768cc 100755
--- a/run-tests.php
+++ b/run-tests.php
@@ -314,7 +314,7 @@ VALGRIND    : " . ($leak_check ? $valgrind_header : 'Not used') . "
 define('PHP_QA_EMAIL', 'qa-reports@lists.php.net');
 define('QA_SUBMISSION_PAGE', 'http://qa.php.net/buildtest-process.php');
 define('QA_REPORTS_PAGE', 'http://qa.php.net/reports');
-define('TRAVIS_CI' , (bool) getenv('TRAVIS_PHP_VERSION'));
+define('TRAVIS_CI' , (bool) getenv('TRAVIS'));
 
 function save_or_mail_results()
 {
diff --git a/travis/install.sh b/travis/install.sh
new file mode 100755
index 0000000000..5c6a3c1913
--- /dev/null
+++ b/travis/install.sh
@@ -0,0 +1,2 @@
+#!/bin/bash
+sudo apt-get install re2c libgmp-dev libicu-dev libmcrypt-dev libtidy-dev