Purge ini_set calls and replace through INI sections.

diff --git a/ext/session/tests/001.phpt b/ext/session/tests/001.phpt
index ab598415e7d99fcb2b1e48c7514ab70d785e9a20..55900fdda630449947b2a53da4f0201f378c72f1 100644 (file)
--- 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 fec4bcad5ece21b060c9497ac26844edd8802244..9471a3504b3b9bf84091c5467f7659096a51e344 100644 (file)
--- 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 afcb6d14d21d064d85af18e9106ebf3155b6ad3c..fd53b8bb84fc0409da7a49c8a9e8f4c6808427e7 100644 (file)
--- 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 f85a62d115fea0d39844e328bf1ec904d1b9879e..d4dc8b3992dfedfa07e4e353ca67bab59b4195d5 100644 (file)
--- 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 3db2e5f21d4d901c4666e9cd6ab63d96e7bc4155..09aedb47326cb3034adda905ea6a99529b0f5806 100644 (file)
--- 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 40a7317530f62df6029b4bb359efc4ea08b308ba..cca4d013fa25f41a9d778d28bab1021606d5c4d7 100644 (file)
--- 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 6f168fab4d18d8a8097791508c575b4c8366980b..e940abc1497957a98f729ae455f750cc3d208e97 100644 (file)
--- 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");