zoe Sun Jan 25 11:06:38 2009 UTC
Modified files: (Branch: PHP_5_3)
/php-src/ext/standard/tests/assert assert04.phpt assert.phpt
assert03.phpt assert02.phpt
Log:
added INI and fixed assert02 to run on PHP6 and PHP53
http://cvs.php.net/viewvc.cgi/php-src/ext/standard/tests/assert/assert04.phpt?r1=1.1.2.2.2.1&r2=1.1.2.2.2.2&diff_format=u
Index: php-src/ext/standard/tests/assert/assert04.phpt
diff -u php-src/ext/standard/tests/assert/assert04.phpt:1.1.2.2.2.1
php-src/ext/standard/tests/assert/assert04.phpt:1.1.2.2.2.2
--- php-src/ext/standard/tests/assert/assert04.phpt:1.1.2.2.2.1 Wed Jul 23
19:34:35 2008
+++ php-src/ext/standard/tests/assert/assert04.phpt Sun Jan 25 11:06:36 2009
@@ -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_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
http://cvs.php.net/viewvc.cgi/php-src/ext/standard/tests/assert/assert.phpt?r1=1.4&r2=1.4.8.1&diff_format=u
Index: php-src/ext/standard/tests/assert/assert.phpt
diff -u php-src/ext/standard/tests/assert/assert.phpt:1.4
php-src/ext/standard/tests/assert/assert.phpt:1.4.8.1
--- php-src/ext/standard/tests/assert/assert.phpt:1.4 Mon Feb 16 06:39:13 2004
+++ php-src/ext/standard/tests/assert/assert.phpt Sun Jan 25 11:06:36 2009
@@ -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)
http://cvs.php.net/viewvc.cgi/php-src/ext/standard/tests/assert/assert03.phpt?r1=1.1.2.2&r2=1.1.2.2.2.1&diff_format=u
Index: php-src/ext/standard/tests/assert/assert03.phpt
diff -u php-src/ext/standard/tests/assert/assert03.phpt:1.1.2.2
php-src/ext/standard/tests/assert/assert03.phpt:1.1.2.2.2.1
--- php-src/ext/standard/tests/assert/assert03.phpt:1.1.2.2 Fri Dec 8
14:39:25 2006
+++ php-src/ext/standard/tests/assert/assert03.phpt Sun Jan 25 11:06:36 2009
@@ -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)
http://cvs.php.net/viewvc.cgi/php-src/ext/standard/tests/assert/assert02.phpt?r1=1.1.2.6&r2=1.1.2.6.2.1&diff_format=u
Index: php-src/ext/standard/tests/assert/assert02.phpt
diff -u php-src/ext/standard/tests/assert/assert02.phpt:1.1.2.6
php-src/ext/standard/tests/assert/assert02.phpt:1.1.2.6.2.1
--- php-src/ext/standard/tests/assert/assert02.phpt:1.1.2.6 Wed May 2
07:27:36 2007
+++ php-src/ext/standard/tests/assert/assert02.phpt Sun Jan 25 11:06:36 2009
@@ -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('$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 @@
--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"
--
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php
