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

Author: Tyrael

.travis.yml

@@ -1,4 +1,19 @@
 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: 
@@ -27,13 +42,6 @@ env:
       - ENABLE_MAINTAINER_ZTS=0 ENABLE_DEBUG=0
       - ENABLE_MAINTAINER_ZTS=1 ENABLE_DEBUG=1
 
-before_install:
-    - sudo apt-get update -qq
-    - 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
     - ./travis/compile.sh

ext/intl/tests/bug67052.phpt

@@ -17,7 +17,7 @@ setlocale(LC_ALL, $l);
 
 function ut_main()
 {
-        setlocale(LC_ALL, 'de_DE');
+        setlocale(LC_ALL, 'de_DE.UTF-8');
         $fmt = new NumberFormatter( 'sl_SI.UTF-8', NumberFormatter::DECIMAL);
         $num = "1.234.567,891";
         $res_str =  $fmt->parse($num)."\n";
@@ -31,5 +31,5 @@ ut_run();
 ?>
 --EXPECT--
 1234567,891
-de_DE
+de_DE.UTF-8
 

ext/standard/tests/file/filetype_variation2.phpt

@@ -7,8 +7,8 @@ Dave Kelsey <[email protected]>
 if (substr(PHP_OS, 0, 3) == 'WIN') {
     die('skip no /dev on Windows');
 }
-if (!file_exists("/dev/console")) {
-    die('skip /dev/console not available');
+if (!file_exists("/dev/null")) {
+    die('skip /dev/null not available');
 }    
 ?>
 --FILE--
@@ -20,7 +20,7 @@ Description: Returns the type of the file. Possible values are fifo, char,
 */
 
 echo "-- Checking for char --\n";
-print( filetype("/dev/console") )."\n";
+print( filetype("/dev/null") )."\n";
 ?>
 ===DONE===
 --EXPECTF--

travis/compile.sh

@@ -10,7 +10,9 @@ else
 	DEBUG="";
 fi
 ./buildconf --force
-./configure --quiet \
+./configure \
+--prefix=$HOME"/php-install" \
+--quiet \
 $DEBUG \
 $TS \
 --enable-fpm \
@@ -58,4 +60,4 @@ $TS \
 --enable-wddx \
 --enable-sysvmsg 
 make -j2 --quiet
-sudo make install
+make install

travis/de

@@ -1,5 +1,5 @@
 #!/bin/bash
-export PHP_CURL_HTTP_REMOTE_SERVER="http://localhost"
+export PHP_CURL_HTTP_REMOTE_SERVER="http://localhost:8080"
 cd ./ext/curl/tests/responder
-sudo php -S localhost:80 &
-cd -
+php -S localhost:8080 &
+cd -