From af2d6a63bf6a187a68164a3cc3384539357ac7b8 Mon Sep 17 00:00:00 2001
From: Nuno Lopes <nlopess@php.net>
Date: Sun, 27 May 2012 19:57:34 -0400
Subject: [PATCH] remove remaining traces of unicode.* ini settings

---
 ext/soap/tests/bugs/bug47273.phpt         | 3 ---
 ext/standard/tests/array/compact.phpt     | 3 ---
 ext/standard/tests/array/locale_sort.phpt | 3 ---
 run-tests.php                             | 4 ----
 4 files changed, 13 deletions(-)

diff --git a/ext/soap/tests/bugs/bug47273.phpt b/ext/soap/tests/bugs/bug47273.phpt
index 174948f59f..1cfb0f3cd9 100644
--- a/ext/soap/tests/bugs/bug47273.phpt
+++ b/ext/soap/tests/bugs/bug47273.phpt
@@ -2,9 +2,6 @@
 Bug #47273 (Encoding bug in SoapServer->fault)
 --SKIPIF--
 <?php require_once('skipif.inc'); ?>
---INI--
-unicode.script_encoding=ISO-8859-1
-unicode.output_encoding=ISO-8859-1
 --FILE--
 <?php
 $request1 = <<<EOF
diff --git a/ext/standard/tests/array/compact.phpt b/ext/standard/tests/array/compact.phpt
index 4b4bfbb732..02df44ebd8 100644
--- a/ext/standard/tests/array/compact.phpt
+++ b/ext/standard/tests/array/compact.phpt
@@ -1,8 +1,5 @@
 --TEST--
 compact()
---INI--
-unicode.script_encoding=UTF-8
-unicode.output_encoding=UTF-8
 --FILE--
 <?php
 
diff --git a/ext/standard/tests/array/locale_sort.phpt b/ext/standard/tests/array/locale_sort.phpt
index 1db96042e8..c2f66c01df 100644
--- a/ext/standard/tests/array/locale_sort.phpt
+++ b/ext/standard/tests/array/locale_sort.phpt
@@ -9,9 +9,6 @@ if (false == setlocale(LC_CTYPE, "fr_FR.ISO8859-1", "fr_FR")) {
   die("skip setlocale() failed\n");
 }
 ?>
---INI--
-unicode.script_encoding=ISO8859-1
-unicode.output_encoding=ISO8859-1
 --FILE--
 <?php
 setlocale(LC_ALL, 'fr_FR.ISO8859-1', 'fr_FR');
diff --git a/run-tests.php b/run-tests.php
index 1fe0deb6af..929de4a660 100755
--- a/run-tests.php
+++ b/run-tests.php
@@ -239,10 +239,6 @@ $ini_overwrites = array(
 		'magic_quotes_runtime=0',
 		'ignore_repeated_errors=0',
 		'precision=14',
-		'unicode.runtime_encoding=ISO-8859-1',
-		'unicode.script_encoding=UTF-8',
-		'unicode.output_encoding=UTF-8',
-		'unicode.from_error_mode=U_INVALID_SUBSTITUTE',
 	);
 
 function write_information($show_html)
-- 
2.50.1