Purge ini_set calls and replace through INI sections.

7 files changed, 17 insertions, 16 deletions

diff --git a/ext/session/tests/001.phpt b/ext/session/tests/001.phpt
index ab598415e7..55900fdda6 100644
--- a/ext/session/tests/001.phpt
+++ b/ext/session/tests/001.phpt
@@ -2,11 +2,11 @@
 Session Object Serialization
 --SKIPIF--
 <?php include('skipif.inc'); ?>
+--INI--
+register_globals=1
 --FILE--
 <?php
 
-ini_set("register_globals", 1);
-
 class foo {
 	var $bar = "ok";
 
diff --git a/ext/session/tests/003.phpt b/ext/session/tests/003.phpt
index fec4bcad5e..9471a3504b 100644
--- a/ext/session/tests/003.phpt
+++ b/ext/session/tests/003.phpt
@@ -2,11 +2,11 @@
 Session Object Deserialization
 --SKIPIF--
 <?php include('skipif.inc'); ?>
+--INI--
+register_globals=1
 --FILE--
 <?php
 
-ini_set("register_globals", 1);
-
 class foo {
 	var $bar = "ok";
 	function method() { $this->yes++; }
diff --git a/ext/session/tests/004.phpt b/ext/session/tests/004.phpt
index afcb6d14d2..fd53b8bb84 100644
--- a/ext/session/tests/004.phpt
+++ b/ext/session/tests/004.phpt
@@ -2,10 +2,11 @@
 session_set_save_handler test
 --SKIPIF--
 <?php include('skipif.inc'); ?>
+--INI--
+register_globals=1
 --FILE--
 <?php
 error_reporting(~E_NOTICE);
-ini_set("register_globals", 1);
 
 class handler {
 	var $data = 'baz|O:3:"foo":2:{s:3:"bar";s:2:"ok";s:3:"yes";i:1;}arr|a:1:{i:3;O:3:"foo":2:{s:3:"bar";s:2:"ok";s:3:"yes";i:1;}}';
diff --git a/ext/session/tests/005.phpt b/ext/session/tests/005.phpt
index f85a62d115..d4dc8b3992 100644
--- a/ext/session/tests/005.phpt
+++ b/ext/session/tests/005.phpt
@@ -2,11 +2,11 @@
 Custom save handler, multiple session_start()s, complex data structure test.
 --SKIPIF--
 <?php include('skipif.inc'); ?>
+--INI--
+register_globals=1
 --FILE--
 <?php
 
-ini_set("register_globals", 1);
-
 error_reporting(E_ALL & ~E_NOTICE);
 
 class handler {
diff --git a/ext/session/tests/006.phpt b/ext/session/tests/006.phpt
index 3db2e5f21d..09aedb4732 100644
--- a/ext/session/tests/006.phpt
+++ b/ext/session/tests/006.phpt
@@ -2,12 +2,12 @@
 References between variables in sessions
 --SKIPIF--
 <?php include('skipif.inc'); ?>
+--INI--
+register_globals=1
 --FILE--
 <?php
 error_reporting(E_ALL & ~E_NOTICE);
 
-ini_set("register_globals", 1);
-
 ob_start();
 session_id("abtest");
 session_start();
diff --git a/ext/session/tests/007.phpt b/ext/session/tests/007.phpt
index 40a7317530..cca4d013fa 100644
--- a/ext/session/tests/007.phpt
+++ b/ext/session/tests/007.phpt
@@ -2,13 +2,13 @@
 Verify PHP 4.2 compatibility: unset($c) with enabled register_globals
 --SKIPIF--
 <?php include('skipif.inc'); ?>
+--INI--
+register_globals=1
+session.bug_compat_42=1
 --FILE--
 <?php
 error_reporting(E_ALL & ~E_NOTICE);
 
-ini_set("register.globals", 1);
-ini_set("session.bug_compat_42", 1);
-
 ob_start();
 session_id("abtest");
 
diff --git a/ext/session/tests/008.phpt b/ext/session/tests/008.phpt
index 6f168fab4d..e940abc149 100644
--- a/ext/session/tests/008.phpt
+++ b/ext/session/tests/008.phpt
@@ -2,14 +2,14 @@
 Verify PHP 4.2 compatibility: global is used albeit register_globals=0
 --SKIPIF--
 <?php include('skipif.inc'); ?>
+--INI--
+register_globals=0
+session.bug_compat_42=1
+session.bug_compat_warn=0
 --FILE--
 <?php
 error_reporting(E_ALL & ~E_NOTICE);
 
-ini_set("register.globals", 0);
-ini_set("session.bug_compat_42", 1);
-ini_set("session.bug_compat_warn", 0);
-
 ob_start();
 session_id("abtest");