added INI and fixed assert02 to run on PHP6 and PHP53

diff --git a/ext/standard/tests/assert/assert.phpt b/ext/standard/tests/assert/assert.phpt
index bced47d8f3330b9fe59eda073a6a12dd32849de2..44fb6091dbc7ab3656bc9a8eba69912a2eb9cbc5 100644 (file)
--- a/ext/standard/tests/assert/assert.phpt
+++ b/ext/standard/tests/assert/assert.phpt
@@ -2,6 +2,11 @@
 assert()
 --INI--
 error_reporting = 2039
+assert.active = 0
+assert.warning = 1
+assert.callback = 
+assert.bail = 0
+assert.quiet_eval = 0
 --FILE--
 <?php
 function a($file,$line,$myev)

diff --git a/ext/standard/tests/assert/assert02.phpt b/ext/standard/tests/assert/assert02.phpt
index ac0824cda2a556cf0506d684969106198cd4bf07..8f986d543c53b53432bc7910da95db50ab31bc30 100644 (file)
--- a/ext/standard/tests/assert/assert02.phpt
+++ b/ext/standard/tests/assert/assert02.phpt
@@ -1,5 +1,11 @@
 --TEST--
 catch assert() errors
+--INI--
+assert.active=1
+assert.warning=1
+assert.callback=
+assert.bbail=0
+assert.quiet_eval=0
 --FILE--
 <?php
 function handler($errno, $errstr) {
@@ -14,12 +20,12 @@ assert(1);
 assert('1');
 assert('$a');
 
-assert('aa=sd+as+safsafasfaçsafçsafç');
+assert('aa=sd+as+safsafasfasafsaf');
 
 assert('0');
 
 assert_options(ASSERT_BAIL, 1);
-assert('aa=sd+as+safsafasfaçsafçsafç');
+assert('aa=sd+as+safsafasfasafsaf');
 
 echo "done\n";
 
@@ -27,16 +33,16 @@ echo "done\n";
 --EXPECTF--
 Notice: Undefined variable: a in %sassert02.php(12) : assert code on line 1
 
-Warning: assert(): Assertion "$a" failed in %sassert02.php on line %d
+Warning: assert(): Assertion "$a" failed in %sassert02.php on line 12
 
-Parse error: %s error%sassert02.php(%d) : assert code on line 1
+Parse error: %s error%sin %sassert02.php(14) : assert code on line 1
 in handler()
-string(%d) "assert(): Failure evaluating code: 
-aa=sd+as+safsafasfaçsafçsafç"
+%string|unicode%(%d) "assert(): Failure evaluating code: 
+aa=sd+as+safsafasfasafsaf"
 
-Warning: assert(): Assertion "0" failed in %sassert02.php on line %d
+Warning: assert(): Assertion "0" failed in %sassert02.php on line 16
 
-Parse error: %s error%sassert02.php(%d) : assert code on line 1
+Parse error: %s error%sin %sassert02.php(19) : assert code on line 1
 in handler()
-string(%d) "assert(): Failure evaluating code: 
-aa=sd+as+safsafasfaçsafçsafç"
+%string|unicode%(%d) "assert(): Failure evaluating code: 
+aa=sd+as+safsafasfasafsaf"

diff --git a/ext/standard/tests/assert/assert03.phpt b/ext/standard/tests/assert/assert03.phpt
index 077474d4dae46c3f7a54d08d9a091ef4b9c3ad24..3fe6abd59164df10e8af0287d081cdeacf04f5df 100644 (file)
--- a/ext/standard/tests/assert/assert03.phpt
+++ b/ext/standard/tests/assert/assert03.phpt
@@ -1,5 +1,11 @@
 --TEST--
 assert() - set callback using ini_set()
+---INI---
+assert.active = 1
+assert.warning = 0
+assert.callback = 
+assert.bail = 0
+assert.quiet_eval = 1
 --FILE--
 <?php
 function a($file,$line,$myev)

diff --git a/ext/standard/tests/assert/assert04.phpt b/ext/standard/tests/assert/assert04.phpt
index 4e0e6af816a72e275cf225b770ae278e89b830c4..5b7a77a9c22e0349aeb0f89363fc2433a9e2ce70 100644 (file)
--- a/ext/standard/tests/assert/assert04.phpt
+++ b/ext/standard/tests/assert/assert04.phpt
@@ -1,5 +1,11 @@
 --TEST--
 misc assert() tests tests
+---INI---
+assert.active = 1
+assert.warning = 1
+assert.callback = 
+assert.bail = 0
+assert.quiet_eval = 0
 --FILE--
 <?php
 /* Assert not active */
@@ -34,7 +40,7 @@ Warning: assert() expects exactly 1 parameter, 2 given in %s on line %d
 
 Warning: assert_options() expects at most 2 parameters, 3 given in %s on line %d
 
-Warning: assert_options() expects parameter 1 to be long, string given in %s on line %d
+Warning: assert_options() expects parameter 1 to be long, %unicode_string_optional% given in %s on line %d
 
 Warning: assert(): Assertion failed in %s on line %d