From: Ferenc Kovacs <tyrael@php.net>
Date: Mon, 19 Oct 2015 20:47:23 +0000 (+0200)
Subject: Merge branch 'PHP-5.5' into PHP-5.6
X-Git-Tag: php-5.6.16RC1~13
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=395ef4efb72aab6a660612be4632794f00991d85;p=php

Merge branch 'PHP-5.5' into PHP-5.6

* PHP-5.5:
  fixup, both catched by nikic
  use another character device in this test as /dev/console seems that it is different for lxc containers
  the de_DE(iso-8859-1) locale is not available on ubuntu by default, but there is no reason to require that over the utf-8 one
  let's try running our testsuite without sudo
---

395ef4efb72aab6a660612be4632794f00991d85
diff --cc .travis.yml
index 658548b9af,e6eec4c45f..c13009a983
--- a/.travis.yml
+++ b/.travis.yml
@@@ -1,5 -1,15 +1,20 @@@
  language: c
+ sudo: false
+ addons:
+   apt:
+     packages:
+       - locales
+       - language-pack-de
+       - re2c
+       - libgmp-dev
+       - libicu-dev
+       - libmcrypt-dev
+       - libtidy-dev
++      - libenchant-dev
++      - libaspell-dev
++      - libpspell-dev
++      - librecode-dev
 +
  notifications:
      email: 
         on_failure: change
diff --cc travis/compile.sh
index 4dce7fc8a4,682d5d8598..fa0a2fcfa1
--- a/travis/compile.sh
+++ b/travis/compile.sh
@@@ -48,14 -50,6 +50,14 @@@ $TS 
  --with-bz2 \
  --with-openssl \
  --with-gmp \
 ---enable-bcmath
 +--enable-bcmath \
 +--enable-phpdbg \
 +--enable-calendar \
 +--enable-ftp \
 +--with-pspell=/usr \
 +--with-recode=/usr \
 +--with-enchant=/usr \
 +--enable-wddx \
 +--enable-sysvmsg 
  make -j2 --quiet
- sudo make install
+ make install