Merge branch 'pr-1483' into PHP-5.5

* pr-1483:
  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

7 files changed, 23 insertions, 20 deletions

diff --git a/.travis.yml b/.travis.yml
index 090f6cd2bc..e6eec4c45f 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -1,5 +1,15 @@
 language: c
-
+sudo: false
+addons:
+  apt:
+    packages:
+      - locales
+      - language-pack-de
+      - re2c
+      - libgmp-dev
+      - libicu-dev
+      - libmcrypt-dev
+      - libtidy-dev
 notifications:
     email: 
        on_failure: change
@@ -27,11 +37,6 @@ env:
       - ENABLE_MAINTAINER_ZTS=0 ENABLE_DEBUG=0
       - ENABLE_MAINTAINER_ZTS=1 ENABLE_DEBUG=1
 
-before_install:
-    - sudo cp ./travis/de /var/lib/locales/supported.d/de
-    - sudo dpkg-reconfigure locales
-    - ./travis/install.sh
-
 before_script:
     # Compile PHP
     - ./travis/compile.sh
diff --git a/ext/intl/tests/bug67052.phpt b/ext/intl/tests/bug67052.phpt
index 8edd65de71..f44ae282fc 100644
--- a/ext/intl/tests/bug67052.phpt
+++ b/ext/intl/tests/bug67052.phpt
@@ -12,7 +12,7 @@ if (substr(PHP_OS, 0, 3) == 'WIN') {
 
 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";
@@ -26,5 +26,5 @@ ut_run();
 ?>
 --EXPECT--
 1234567,891
-de_DE
+de_DE.UTF-8
 
diff --git a/ext/standard/tests/file/filetype_variation2.phpt b/ext/standard/tests/file/filetype_variation2.phpt
index d538e32e6c..125b48c02c 100644
--- a/ext/standard/tests/file/filetype_variation2.phpt
+++ b/ext/standard/tests/file/filetype_variation2.phpt
@@ -7,8 +7,8 @@ Dave Kelsey <d_kelsey@uk.ibm.com>
 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--
diff --git a/travis/compile.sh b/travis/compile.sh
index 039ed65cb9..682d5d8598 100755
--- a/travis/compile.sh
+++ b/travis/compile.sh
@@ -10,7 +10,9 @@ else
 	DEBUG="";
 fi
 ./buildconf --force
-./configure --quiet \
+./configure \
+--prefix=$HOME"/php-install" \
+--quiet \
 $DEBUG \
 $TS \
 --enable-fpm \
@@ -50,4 +52,4 @@ $TS \
 --with-gmp \
 --enable-bcmath
 make -j2 --quiet
-sudo make install
+make install
diff --git a/travis/de b/travis/de
deleted file mode 100644
index ae49d969ee..0000000000
--- a/travis/de
+++ /dev/null
@@ -1,2 +0,0 @@
-de_DE.UTF-8 UTF-8
-de_DE ISO-8859-1
diff --git a/travis/ext/curl/setup.sh b/travis/ext/curl/setup.sh
index 74dad16eb3..02e8ce5bb8 100755
--- a/travis/ext/curl/setup.sh
+++ b/travis/ext/curl/setup.sh
@@ -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 -
\ No newline at end of file
+php -S localhost:8080 &
+cd -
diff --git a/travis/install.sh b/travis/install.sh
deleted file mode 100755
index 5c6a3c1913..0000000000
--- a/travis/install.sh
+++ /dev/null
@@ -1,2 +0,0 @@
-#!/bin/bash
-sudo apt-get install re2c libgmp-dev libicu-dev libmcrypt-dev libtidy-dev