stas Mon, 01 Aug 2011 03:42:02 +0000
Revision: http://svn.php.net/viewvc?view=revision&revision=314005
Log:
fix tests
Changed paths:
U php/php-src/branches/PHP_5_4/ext/posix/tests/posix_times_basic.phpt
U
php/php-src/branches/PHP_5_4/ext/session/tests/rfc1867_invalid_settings.phpt
U
php/php-src/branches/PHP_5_4/ext/session/tests/rfc1867_invalid_settings_2.phpt
U php/php-src/branches/PHP_5_4/ext/session/tests/session_encode_basic.phpt
U
php/php-src/branches/PHP_5_4/ext/standard/tests/file/copy_variation4.phpt
U
php/php-src/branches/PHP_5_4/ext/standard/tests/file/parse_ini_file_variation3.phpt
U
php/php-src/branches/PHP_5_4/ext/standard/tests/file/stream_rfc2397_006.phpt
U
php/php-src/branches/PHP_5_4/ext/standard/tests/file/tempnam_variation7.phpt
U
php/php-src/branches/PHP_5_4/ext/standard/tests/general_functions/getservbyname_variation10.phpt
U
php/php-src/branches/PHP_5_4/ext/standard/tests/general_functions/getservbyname_variation9.phpt
U
php/php-src/branches/PHP_5_4/ext/standard/tests/general_functions/parse_ini_basic.data
U
php/php-src/branches/PHP_5_4/ext/standard/tests/general_functions/parse_ini_basic.phpt
U
php/php-src/branches/PHP_5_4/ext/standard/tests/general_functions/parse_ini_booleans.phpt
U
php/php-src/branches/PHP_5_4/ext/standard/tests/general_functions/phpinfo.phpt
U
php/php-src/branches/PHP_5_4/ext/standard/tests/general_functions/proc_nice_basic.phpt
U
php/php-src/branches/PHP_5_4/ext/standard/tests/general_functions/proc_nice_error.phpt
U
php/php-src/branches/PHP_5_4/ext/standard/tests/general_functions/set_magic_quotes_runtime_basic.phpt
U php/php-src/branches/PHP_5_4/ext/standard/tests/mail/mail_basic2.phpt
U
php/php-src/branches/PHP_5_4/ext/standard/tests/mail/mail_variation2.phpt
U
php/php-src/branches/PHP_5_4/ext/standard/tests/serialize/serialization_miscTypes_001.phpt
U php/php-src/branches/PHP_5_4/ext/standard/tests/streams/bug54623.phpt
U
php/php-src/branches/PHP_5_4/ext/standard/tests/strings/htmlentities04.phpt
U php/php-src/trunk/ext/posix/tests/posix_times_basic.phpt
U php/php-src/trunk/ext/session/tests/rfc1867_invalid_settings.phpt
U php/php-src/trunk/ext/session/tests/rfc1867_invalid_settings_2.phpt
U php/php-src/trunk/ext/session/tests/session_encode_basic.phpt
U php/php-src/trunk/ext/standard/tests/file/copy_variation4.phpt
U php/php-src/trunk/ext/standard/tests/file/parse_ini_file_variation3.phpt
U php/php-src/trunk/ext/standard/tests/file/stream_rfc2397_006.phpt
U php/php-src/trunk/ext/standard/tests/file/tempnam_variation7.phpt
U
php/php-src/trunk/ext/standard/tests/general_functions/getservbyname_variation10.phpt
U
php/php-src/trunk/ext/standard/tests/general_functions/getservbyname_variation9.phpt
U
php/php-src/trunk/ext/standard/tests/general_functions/parse_ini_basic.data
U
php/php-src/trunk/ext/standard/tests/general_functions/parse_ini_basic.phpt
U
php/php-src/trunk/ext/standard/tests/general_functions/parse_ini_booleans.phpt
U php/php-src/trunk/ext/standard/tests/general_functions/phpinfo.phpt
U
php/php-src/trunk/ext/standard/tests/general_functions/proc_nice_basic.phpt
U
php/php-src/trunk/ext/standard/tests/general_functions/proc_nice_error.phpt
U
php/php-src/trunk/ext/standard/tests/general_functions/set_magic_quotes_runtime_basic.phpt
U php/php-src/trunk/ext/standard/tests/mail/mail_basic2.phpt
U php/php-src/trunk/ext/standard/tests/mail/mail_variation2.phpt
U
php/php-src/trunk/ext/standard/tests/serialize/serialization_miscTypes_001.phpt
U php/php-src/trunk/ext/standard/tests/streams/bug54623.phpt
U php/php-src/trunk/ext/standard/tests/strings/htmlentities04.phpt
Modified: php/php-src/branches/PHP_5_4/ext/posix/tests/posix_times_basic.phpt
===================================================================
--- php/php-src/branches/PHP_5_4/ext/posix/tests/posix_times_basic.phpt 2011-08-01 01:00:57 UTC (rev 314004)
+++ php/php-src/branches/PHP_5_4/ext/posix/tests/posix_times_basic.phpt 2011-08-01 03:42:02 UTC (rev 314005)
@@ -24,14 +24,14 @@
Basic test of POSIX times function
array(5) {
["ticks"]=>
- int(%d)
+ int(%i)
["utime"]=>
- int(%d)
+ int(%i)
["stime"]=>
- int(%d)
+ int(%i)
["cutime"]=>
- int(%d)
+ int(%i)
["cstime"]=>
- int(%d)
+ int(%i)
}
===DONE====
Modified: php/php-src/branches/PHP_5_4/ext/session/tests/rfc1867_invalid_settings.phpt
===================================================================
--- php/php-src/branches/PHP_5_4/ext/session/tests/rfc1867_invalid_settings.phpt 2011-08-01 01:00:57 UTC (rev 314004)
+++ php/php-src/branches/PHP_5_4/ext/session/tests/rfc1867_invalid_settings.phpt 2011-08-01 03:42:02 UTC (rev 314005)
@@ -9,7 +9,5 @@
var_dump(ini_get("session.upload_progress.freq"));
?>
--EXPECTF--
-PHP Warning: PHP Startup: session.upload_progress.freq must be greater than or equal to zero in %s
-
Warning: PHP Startup: session.upload_progress.freq must be greater than or equal to zero in %s
-%unicode|string%(%d) "1%"
+string(%d) "1%"
Modified: php/php-src/branches/PHP_5_4/ext/session/tests/rfc1867_invalid_settings_2.phpt
===================================================================
--- php/php-src/branches/PHP_5_4/ext/session/tests/rfc1867_invalid_settings_2.phpt 2011-08-01 01:00:57 UTC (rev 314004)
+++ php/php-src/branches/PHP_5_4/ext/session/tests/rfc1867_invalid_settings_2.phpt 2011-08-01 03:42:02 UTC (rev 314005)
@@ -9,7 +9,5 @@
var_dump(ini_get("session.upload_progress.freq"));
?>
--EXPECTF--
-PHP Warning: PHP Startup: session.upload_progress.freq cannot be over 100% in %s
-
Warning: PHP Startup: session.upload_progress.freq cannot be over 100% in %s
-%unicode|string%(%d) "1%"
+string(%d) "1%"
Modified: php/php-src/branches/PHP_5_4/ext/session/tests/session_encode_basic.phpt
===================================================================
--- php/php-src/branches/PHP_5_4/ext/session/tests/session_encode_basic.phpt 2011-08-01 01:00:57 UTC (rev 314004)
+++ php/php-src/branches/PHP_5_4/ext/session/tests/session_encode_basic.phpt 2011-08-01 03:42:02 UTC (rev 314005)
@@ -1,5 +1,7 @@
--TEST--
Test session_encode() function : basic functionality
+--INI--
+serialize_precision=100
--SKIPIF--
<?php include('skipif.inc'); ?>
--FILE--
@@ -120,7 +122,7 @@
string(20) "data|d:123456789000;"
-- Iteration 8 --
-string(29) "data|d:1.2345678899999999E-9;"
+string(%d) "data|d:1.2345678899999999145113427164344339914681114578343112953007221221923828125E-9;"
-- Iteration 9 --
string(11) "data|d:0.5;"
Modified: php/php-src/branches/PHP_5_4/ext/standard/tests/file/copy_variation4.phpt
===================================================================
--- php/php-src/branches/PHP_5_4/ext/standard/tests/file/copy_variation4.phpt 2011-08-01 01:00:57 UTC (rev 314004)
+++ php/php-src/branches/PHP_5_4/ext/standard/tests/file/copy_variation4.phpt 2011-08-01 03:42:02 UTC (rev 314005)
@@ -114,16 +114,22 @@
Warning: unlink(%s): %s
-- Iteration 3 --
-Existence of destination file before copy => bool(true)
+Existence of destination file before copy =>
+Warning: file_exists() expects parameter 1 to be a valid path, string given in %s on line %d
+NULL
Copy operation =>
-Warning: copy(): The second argument to copy() function cannot be a directory in %s on line %d
-bool(false)
-Existence of destination file => bool(true)
+Warning: copy() expects parameter 2 to be a valid path, string given in %s on line %d
+NULL
+Existence of destination file =>
+Warning: file_exists() expects parameter 1 to be a valid path, string given in %s on line %d
+NULL
Destination file name => %s/
Size of source file => int(1500)
-Size of destination file => int(%d)
+Size of destination file =>
+Warning: filesize() expects parameter 1 to be a valid path, string given in %s on line %d
+NULL
-Warning: unlink(%s): %s
+Warning: unlink() expects parameter 1 to be a valid path, string given in %s on line %d
-- Iteration 4 --
Existence of destination file before copy => bool(true)
Modified: php/php-src/branches/PHP_5_4/ext/standard/tests/file/parse_ini_file_variation3.phpt
===================================================================
--- php/php-src/branches/PHP_5_4/ext/standard/tests/file/parse_ini_file_variation3.phpt 2011-08-01 01:00:57 UTC (rev 314004)
+++ php/php-src/branches/PHP_5_4/ext/standard/tests/file/parse_ini_file_variation3.phpt 2011-08-01 03:42:02 UTC (rev 314005)
@@ -79,7 +79,7 @@
New include path is : %sparse_ini_file_variation3.dir1%sparse_ini_file_variation3.dir2%sparse_ini_file_variation3.dir3%S
array(11) {
["error_reporting"]=>
- string(5) "30719"
+ string(5) "32767"
["display_errors"]=>
string(1) "1"
["display_startup_errors"]=>
@@ -101,4 +101,4 @@
["docref_ext"]=>
string(5) ".html"
}
-===Done===
\ No newline at end of file
+===Done===
Modified: php/php-src/branches/PHP_5_4/ext/standard/tests/file/stream_rfc2397_006.phpt
===================================================================
--- php/php-src/branches/PHP_5_4/ext/standard/tests/file/stream_rfc2397_006.phpt 2011-08-01 01:00:57 UTC (rev 314004)
+++ php/php-src/branches/PHP_5_4/ext/standard/tests/file/stream_rfc2397_006.phpt 2011-08-01 03:42:02 UTC (rev 314005)
@@ -21,8 +21,11 @@
===DONE===
<?php exit(0); ?>
--EXPECTF--
-string(0) ""
-string(6) "foobar"
+Warning: file_get_contents() expects parameter 1 to be a valid path, string given in %s line %d
+NULL
+
+Warning: file_get_contents() expects parameter 1 to be a valid path, string given in %s line %d
+NULL
string(13) "foobar foobar"
Warning: file_get_contents(data:;base64,#Zm9vYmFyIGZvb2Jhc=): failed to open stream: rfc2397: unable to decode in %sstream_rfc2397_006.php on line %d
Modified: php/php-src/branches/PHP_5_4/ext/standard/tests/file/tempnam_variation7.phpt
===================================================================
--- php/php-src/branches/PHP_5_4/ext/standard/tests/file/tempnam_variation7.phpt 2011-08-01 01:00:57 UTC (rev 314004)
+++ php/php-src/branches/PHP_5_4/ext/standard/tests/file/tempnam_variation7.phpt 2011-08-01 03:42:02 UTC (rev 314005)
@@ -98,19 +98,19 @@
Warning: tempnam() expects parameter 1 to be a valid path, string given in %s on line %d
-- File is not created --
-Warning: unlink(): Invalid argument in %s on line %d
+Warning: unlink(): No such file or directory in %s on line %d
-- Iteration 7 --
Warning: tempnam() expects parameter 1 to be a valid path, array given in %s on line %d
-- File is not created --
-Warning: unlink(): Invalid argument in %s on line %d
+Warning: unlink(): No such file or directory in %s on line %d
-- Iteration 8 --
-File name is => /tmp/tempnam_variation3.tmp%s
+File name is => %s/tempnam_variation3.tmp%s
File permissions are => 100600
File created in => temp dir
-- Iteration 9 --
-File name is => /tmp/tempnam_variation3.tmp%s
+File name is => %s/tempnam_variation3.tmp%s
File permissions are => 100600
File created in => temp dir
Modified: php/php-src/branches/PHP_5_4/ext/standard/tests/general_functions/getservbyname_variation10.phpt
===================================================================
--- php/php-src/branches/PHP_5_4/ext/standard/tests/general_functions/getservbyname_variation10.phpt 2011-08-01 01:00:57 UTC (rev 314004)
+++ php/php-src/branches/PHP_5_4/ext/standard/tests/general_functions/getservbyname_variation10.phpt 2011-08-01 03:42:02 UTC (rev 314005)
@@ -1,5 +1,11 @@
--TEST--
Test function getservbyname() by substituting argument 2 with emptyUnsetUndefNull values.
+--SKIPIF--
+<?php
+if(PHP_OS == 'Darwin') {
+ die("skip.. Mac OS X is fine with NULLs in getservbyname");
+}
+?>
--FILE--
<?php
Modified: php/php-src/branches/PHP_5_4/ext/standard/tests/general_functions/getservbyname_variation9.phpt
===================================================================
--- php/php-src/branches/PHP_5_4/ext/standard/tests/general_functions/getservbyname_variation9.phpt 2011-08-01 01:00:57 UTC (rev 314004)
+++ php/php-src/branches/PHP_5_4/ext/standard/tests/general_functions/getservbyname_variation9.phpt 2011-08-01 03:42:02 UTC (rev 314005)
@@ -1,5 +1,11 @@
--TEST--
Test function getservbyname() by substituting argument 2 with boolean values.
+--SKIPIF--
+<?php
+if(PHP_OS == 'Darwin') {
+ die("skip.. Mac OS X is fine with NULLs in getservbyname");
+}
+?>
--FILE--
<?php
Modified: php/php-src/branches/PHP_5_4/ext/standard/tests/general_functions/parse_ini_basic.data
===================================================================
--- php/php-src/branches/PHP_5_4/ext/standard/tests/general_functions/parse_ini_basic.data 2011-08-01 01:00:57 UTC (rev 314004)
+++ php/php-src/branches/PHP_5_4/ext/standard/tests/general_functions/parse_ini_basic.data 2011-08-01 03:42:02 UTC (rev 314005)
@@ -12,7 +12,7 @@
string = asdadfsdjkslkj ¡@£$$ { }[ ]/%#¤
sqstring = 'adsasdadasdasd'
dqstring = "asdadfsdjkslkj ¡@£$$ { } !^~|¥¥{[()/)&/% ¤ # #"
-php_constant = E_ALL
+php_constant = E_WARNING
user_constant = TEST_CONSTANT
[basic with whitespace]
@@ -28,7 +28,7 @@
boolno = no
sqstring = 'adsasdadasdasd'
dqstring = "asdadfsdjkslkj ¡@£$$€¥¥{[()/)&/%#¤"
-php_constant = E_ALL
+php_constant = E_WARNING
[comments]
; some comment
Modified: php/php-src/branches/PHP_5_4/ext/standard/tests/general_functions/parse_ini_basic.phpt
===================================================================
--- php/php-src/branches/PHP_5_4/ext/standard/tests/general_functions/parse_ini_basic.phpt 2011-08-01 01:00:57 UTC (rev 314004)
+++ php/php-src/branches/PHP_5_4/ext/standard/tests/general_functions/parse_ini_basic.phpt 2011-08-01 03:42:02 UTC (rev 314005)
@@ -45,7 +45,7 @@
["dqstring"]=>
string(51) "asdadfsdjkslkj ¡@£$$ { } !^~|¥¥{[()/)&/% ¤ # #"
["php_constant"]=>
- string(5) "30719"
+ string(1) "2"
["user_constant"]=>
string(21) "this_is_test_constant"
}
@@ -76,7 +76,7 @@
["dqstring"]=>
string(41) "asdadfsdjkslkj ¡@£$$€¥¥{[()/)&/%#¤"
["php_constant"]=>
- string(5) "30719"
+ string(1) "2"
}
["comments"]=>
array(1) {
Modified: php/php-src/branches/PHP_5_4/ext/standard/tests/general_functions/parse_ini_booleans.phpt
===================================================================
--- php/php-src/branches/PHP_5_4/ext/standard/tests/general_functions/parse_ini_booleans.phpt 2011-08-01 01:00:57 UTC (rev 314004)
+++ php/php-src/branches/PHP_5_4/ext/standard/tests/general_functions/parse_ini_booleans.phpt 2011-08-01 03:42:02 UTC (rev 314005)
@@ -15,15 +15,15 @@
["error_reporting values"]=>
array(6) {
["foo"]=>
- string(7) "30719 8"
+ string(7) "32767 8"
["error_reporting"]=>
- string(5) "30719"
+ string(5) "32767"
["error_reporting1"]=>
string(4) "4177"
["error_reporting2"]=>
- string(5) "30711"
+ string(5) "32759"
["error_reporting3"]=>
- string(5) "30711"
+ string(5) "32759"
["error_reporting4"]=>
string(5) "32759"
}
Modified: php/php-src/branches/PHP_5_4/ext/standard/tests/general_functions/phpinfo.phpt
===================================================================
--- php/php-src/branches/PHP_5_4/ext/standard/tests/general_functions/phpinfo.phpt 2011-08-01 01:00:57 UTC (rev 314004)
+++ php/php-src/branches/PHP_5_4/ext/standard/tests/general_functions/phpinfo.phpt 2011-08-01 03:42:02 UTC (rev 314005)
@@ -36,7 +36,6 @@
Thread Safety => %s
Zend Signal Handling => %s
Zend Memory Manager => %s
-Zend Signal Handling => %s
Zend Multibyte Support => %s
IPv6 Support => %s
DTrace Support => %s
Modified: php/php-src/branches/PHP_5_4/ext/standard/tests/general_functions/proc_nice_basic.phpt
===================================================================
--- php/php-src/branches/PHP_5_4/ext/standard/tests/general_functions/proc_nice_basic.phpt 2011-08-01 01:00:57 UTC (rev 314004)
+++ php/php-src/branches/PHP_5_4/ext/standard/tests/general_functions/proc_nice_basic.phpt 2011-08-01 03:42:02 UTC (rev 314005)
@@ -13,7 +13,7 @@
<?php
function getNice($id)
{
- $res = shell_exec('ps -p ' . $id .' -o "%p %n"');
+ $res = shell_exec('ps -p ' . $id .' -o "pid,nice"');
preg_match('/^\s*\w+\s+\w+\s*(\d+)\s+(\d+)/m', $res, $matches);
if (count($matches) > 2)
return $matches[2];
Modified: php/php-src/branches/PHP_5_4/ext/standard/tests/general_functions/proc_nice_error.phpt
===================================================================
--- php/php-src/branches/PHP_5_4/ext/standard/tests/general_functions/proc_nice_error.phpt 2011-08-01 01:00:57 UTC (rev 314004)
+++ php/php-src/branches/PHP_5_4/ext/standard/tests/general_functions/proc_nice_error.phpt 2011-08-01 03:42:02 UTC (rev 314005)
@@ -6,20 +6,23 @@
?>
--FILE--
<?php
+echo "*** Test by calling method or function with incorrect numbers of arguments ***\n";
+$priority = 1;
-echo "*** Test by calling method or function with incorrect numbers of arguments ***\n"
+$extra_arg = 1;
-$priority =
+var_dump(proc_nice( $priority, $extra_arg) );
-
-$extra_arg =
-
-var_dump(proc_nice( $priority, $extra_arg ) );
-
var_dump(proc_nice( ) );
?>
--EXPECTF--
-Parse error: syntax error, unexpected T_VARIABLE, expecting ',' or ';' in %s on line %d
+*** Test by calling method or function with incorrect numbers of arguments ***
+
+Warning: proc_nice() expects exactly 1 parameter, 2 given in %s line %d
+bool(false)
+
+Warning: proc_nice() expects exactly 1 parameter, 0 given in %s line %d
+bool(false)
Modified: php/php-src/branches/PHP_5_4/ext/standard/tests/general_functions/set_magic_quotes_runtime_basic.phpt
===================================================================
--- php/php-src/branches/PHP_5_4/ext/standard/tests/general_functions/set_magic_quotes_runtime_basic.phpt 2011-08-01 01:00:57 UTC (rev 314004)
+++ php/php-src/branches/PHP_5_4/ext/standard/tests/general_functions/set_magic_quotes_runtime_basic.phpt 2011-08-01 03:42:02 UTC (rev 314005)
@@ -13,11 +13,6 @@
$g = get_magic_quotes_runtime();
echo "\n-- magic quotes runtime set in INI file: " . $g . "--\n";
-echo "\n-- Set magic quotes runtime to 1: --\n";
-var_dump(set_magic_quotes_runtime(1));
-$g = get_magic_quotes_runtime();
-echo "\n-- magic quotes runtime after set: " . $g . " --\n";
-
echo "\n-- Set magic quotes runtime to 0: --\n";
var_dump(set_magic_quotes_runtime(0));
$g = get_magic_quotes_runtime();
@@ -33,26 +28,23 @@
--EXPECTF--
Simple testcase for set_magic_quotes_runtime() function - basic test
--- magic quotes runtime set in INI file: 0--
+Deprecated: Function get_magic_quotes_runtime() is deprecated in %s on line %d
--- Set magic quotes runtime to 1: --
+-- magic quotes runtime set in INI file: --
-Deprecated: Function set_magic_quotes_runtime() is deprecated in %s on line %d
-bool(true)
-
--- magic quotes runtime after set: 1 --
-
-- Set magic quotes runtime to 0: --
Deprecated: Function set_magic_quotes_runtime() is deprecated in %s on line %d
-bool(true)
+bool(false)
--- magic quotes runtime after set: 0 --
+Deprecated: Function get_magic_quotes_runtime() is deprecated in %s on line %d
+-- magic quotes runtime after set: --
+
-- Set magic quotes runtime to 1: --
Deprecated: Function set_magic_quotes_runtime() is deprecated in %s on line %d
-bool(true)
--- magic quotes runtime after set: 1 --
-===DONE===
\ No newline at end of file
+Fatal error: set_magic_quotes_runtime(): magic_quotes_runtime is not supported anymore in Unknown on line 0
+
+
Modified: php/php-src/branches/PHP_5_4/ext/standard/tests/mail/mail_basic2.phpt
===================================================================
--- php/php-src/branches/PHP_5_4/ext/standard/tests/mail/mail_basic2.phpt 2011-08-01 01:00:57 UTC (rev 314004)
+++ php/php-src/branches/PHP_5_4/ext/standard/tests/mail/mail_basic2.phpt 2011-08-01 03:42:02 UTC (rev 314005)
@@ -6,7 +6,7 @@
die("skip Won't run on Windows");
?>
--INI--
-sendmail_path="sed > /tmp/php_test_mailBasic2.out"
+sendmail_path="cat > /tmp/php_test_mailBasic2.out"
mail.add_x_header = Off
--FILE--
<?php
@@ -24,7 +24,7 @@
$subject = 'Test Subject';
$message = 'A Message';
$additional_headers = 'KHeaders';
-$additional_parameters = "-e '5 a--- Extras'";
+$additional_parameters = "-n";
$outFile = "/tmp/php_test_mailBasic2.out";
@unlink($outFile);
@@ -36,14 +36,13 @@
unlink($outFile);
?>
===DONE===
---EXPECT--
+--EXPECTF--
*** Testing mail() : basic functionality ***
-- extra parameters --
bool(true)
-To: [email protected]
-Subject: Test Subject
-KHeaders
-
-A Message
---- Extras
+%w1%wTo: [email protected]
+%w2%wSubject: Test Subject
+%w3%wKHeaders
+%w4%w
+%w5%wA Message
===DONE===
Modified: php/php-src/branches/PHP_5_4/ext/standard/tests/mail/mail_variation2.phpt
===================================================================
--- php/php-src/branches/PHP_5_4/ext/standard/tests/mail/mail_variation2.phpt 2011-08-01 01:00:57 UTC (rev 314004)
+++ php/php-src/branches/PHP_5_4/ext/standard/tests/mail/mail_variation2.phpt 2011-08-01 03:42:02 UTC (rev 314005)
@@ -1,8 +1,8 @@
--TEST--
Test mail() function : variation force extra parameters
--INI--
-sendmail_path="sed > /tmp/php_test_mailVariation2.out"
-mail.force_extra_parameters="-e4a---forced-params"
+sendmail_path="cat > /tmp/php_test_mailVariation2.out"
+mail.force_extra_parameters="-n"
mail.add_x_header = Off
--SKIPIF--
<?php
@@ -33,12 +33,11 @@
?>
===DONE===
---EXPECT--
+--EXPECTF--
*** Testing mail() : basic functionality ***
bool(true)
-To: [email protected]
-Subject: Test Subject
-
-A Message
----forced-params
+%w1%wTo: [email protected]
+%w2%wSubject: Test Subject
+%w3%w
+%w4%wA Message
===DONE===
Modified: php/php-src/branches/PHP_5_4/ext/standard/tests/serialize/serialization_miscTypes_001.phpt
===================================================================
--- php/php-src/branches/PHP_5_4/ext/standard/tests/serialize/serialization_miscTypes_001.phpt 2011-08-01 01:00:57 UTC (rev 314004)
+++ php/php-src/branches/PHP_5_4/ext/standard/tests/serialize/serialization_miscTypes_001.phpt 2011-08-01 03:42:02 UTC (rev 314005)
@@ -1,5 +1,7 @@
--TEST--
Test serialize() & unserialize() functions: many types
+--INI--
+serialize_precision=17
--SKIPIF--
<?php
if (PHP_INT_SIZE != 4) {
@@ -223,7 +225,7 @@
}
-- Iteration 15 --
-after serialization => string(96) "a:7:{i:0;i:0;i:1;i:1;i:2;i:-2;i:3;d:3.3333330000000001;i:4;s:1:"a";i:5;a:0:{}i:6;a:1:{i:0;N;}}"
+after serialization => string(94) "a:7:{i:0;i:0;i:1;i:1;i:2;i:-2;i:3;d:3.3333330000000001;i:4;s:1:"a";i:5;a:0:{}i:6;a:1:{i:0;N;}}"
after unserialization => array(7) {
[0]=>
int(0)
Modified: php/php-src/branches/PHP_5_4/ext/standard/tests/streams/bug54623.phpt
===================================================================
--- php/php-src/branches/PHP_5_4/ext/standard/tests/streams/bug54623.phpt 2011-08-01 01:00:57 UTC (rev 314004)
+++ php/php-src/branches/PHP_5_4/ext/standard/tests/streams/bug54623.phpt 2011-08-01 03:42:02 UTC (rev 314005)
@@ -14,4 +14,6 @@
int(%d)
int(%d)
+Notice: fwrite(): send of 1 bytes failed with errno=61 Connection refused in %s on line %d
+
Warning: fwrite(): %d is not a valid stream resource in %s on line %d
Modified: php/php-src/branches/PHP_5_4/ext/standard/tests/strings/htmlentities04.phpt
===================================================================
--- php/php-src/branches/PHP_5_4/ext/standard/tests/strings/htmlentities04.phpt 2011-08-01 01:00:57 UTC (rev 314004)
+++ php/php-src/branches/PHP_5_4/ext/standard/tests/strings/htmlentities04.phpt 2011-08-01 03:42:02 UTC (rev 314005)
@@ -16,5 +16,6 @@
setlocale( LC_CTYPE, "ja_JP.EUC-JP", "ja_JP.eucJP" );
var_dump(htmlentities("\xa1\xa2\xa1\xa3\xa1\xa4", ENT_QUOTES, ''));
?>
---EXPECT--
+--EXPECTF--
+Strict Standards: htmlentities(): Only basic entities substitution is supported for multi-byte encodings other than UTF-8; functionality is equivalent to htmlspecialchars in %s line %d
string(6) "������"
Modified: php/php-src/trunk/ext/posix/tests/posix_times_basic.phpt
===================================================================
--- php/php-src/trunk/ext/posix/tests/posix_times_basic.phpt 2011-08-01 01:00:57 UTC (rev 314004)
+++ php/php-src/trunk/ext/posix/tests/posix_times_basic.phpt 2011-08-01 03:42:02 UTC (rev 314005)
@@ -24,14 +24,14 @@
Basic test of POSIX times function
array(5) {
["ticks"]=>
- int(%d)
+ int(%i)
["utime"]=>
- int(%d)
+ int(%i)
["stime"]=>
- int(%d)
+ int(%i)
["cutime"]=>
- int(%d)
+ int(%i)
["cstime"]=>
- int(%d)
+ int(%i)
}
===DONE====
Modified: php/php-src/trunk/ext/session/tests/rfc1867_invalid_settings.phpt
===================================================================
--- php/php-src/trunk/ext/session/tests/rfc1867_invalid_settings.phpt 2011-08-01 01:00:57 UTC (rev 314004)
+++ php/php-src/trunk/ext/session/tests/rfc1867_invalid_settings.phpt 2011-08-01 03:42:02 UTC (rev 314005)
@@ -9,7 +9,5 @@
var_dump(ini_get("session.upload_progress.freq"));
?>
--EXPECTF--
-PHP Warning: PHP Startup: session.upload_progress.freq must be greater than or equal to zero in %s
-
Warning: PHP Startup: session.upload_progress.freq must be greater than or equal to zero in %s
-%unicode|string%(%d) "1%"
+string(%d) "1%"
Modified: php/php-src/trunk/ext/session/tests/rfc1867_invalid_settings_2.phpt
===================================================================
--- php/php-src/trunk/ext/session/tests/rfc1867_invalid_settings_2.phpt 2011-08-01 01:00:57 UTC (rev 314004)
+++ php/php-src/trunk/ext/session/tests/rfc1867_invalid_settings_2.phpt 2011-08-01 03:42:02 UTC (rev 314005)
@@ -9,7 +9,5 @@
var_dump(ini_get("session.upload_progress.freq"));
?>
--EXPECTF--
-PHP Warning: PHP Startup: session.upload_progress.freq cannot be over 100% in %s
-
Warning: PHP Startup: session.upload_progress.freq cannot be over 100% in %s
-%unicode|string%(%d) "1%"
+string(%d) "1%"
Modified: php/php-src/trunk/ext/session/tests/session_encode_basic.phpt
===================================================================
--- php/php-src/trunk/ext/session/tests/session_encode_basic.phpt 2011-08-01 01:00:57 UTC (rev 314004)
+++ php/php-src/trunk/ext/session/tests/session_encode_basic.phpt 2011-08-01 03:42:02 UTC (rev 314005)
@@ -1,5 +1,7 @@
--TEST--
Test session_encode() function : basic functionality
+--INI--
+serialize_precision=100
--SKIPIF--
<?php include('skipif.inc'); ?>
--FILE--
@@ -120,7 +122,7 @@
string(20) "data|d:123456789000;"
-- Iteration 8 --
-string(29) "data|d:1.2345678899999999E-9;"
+string(%d) "data|d:1.2345678899999999145113427164344339914681114578343112953007221221923828125E-9;"
-- Iteration 9 --
string(11) "data|d:0.5;"
Modified: php/php-src/trunk/ext/standard/tests/file/copy_variation4.phpt
===================================================================
--- php/php-src/trunk/ext/standard/tests/file/copy_variation4.phpt 2011-08-01 01:00:57 UTC (rev 314004)
+++ php/php-src/trunk/ext/standard/tests/file/copy_variation4.phpt 2011-08-01 03:42:02 UTC (rev 314005)
@@ -114,16 +114,22 @@
Warning: unlink(%s): %s
-- Iteration 3 --
-Existence of destination file before copy => bool(true)
+Existence of destination file before copy =>
+Warning: file_exists() expects parameter 1 to be a valid path, string given in %s on line %d
+NULL
Copy operation =>
-Warning: copy(): The second argument to copy() function cannot be a directory in %s on line %d
-bool(false)
-Existence of destination file => bool(true)
+Warning: copy() expects parameter 2 to be a valid path, string given in %s on line %d
+NULL
+Existence of destination file =>
+Warning: file_exists() expects parameter 1 to be a valid path, string given in %s on line %d
+NULL
Destination file name => %s/
Size of source file => int(1500)
-Size of destination file => int(%d)
+Size of destination file =>
+Warning: filesize() expects parameter 1 to be a valid path, string given in %s on line %d
+NULL
-Warning: unlink(%s): %s
+Warning: unlink() expects parameter 1 to be a valid path, string given in %s on line %d
-- Iteration 4 --
Existence of destination file before copy => bool(true)
Modified: php/php-src/trunk/ext/standard/tests/file/parse_ini_file_variation3.phpt
===================================================================
--- php/php-src/trunk/ext/standard/tests/file/parse_ini_file_variation3.phpt 2011-08-01 01:00:57 UTC (rev 314004)
+++ php/php-src/trunk/ext/standard/tests/file/parse_ini_file_variation3.phpt 2011-08-01 03:42:02 UTC (rev 314005)
@@ -79,7 +79,7 @@
New include path is : %sparse_ini_file_variation3.dir1%sparse_ini_file_variation3.dir2%sparse_ini_file_variation3.dir3%S
array(11) {
["error_reporting"]=>
- string(5) "30719"
+ string(5) "32767"
["display_errors"]=>
string(1) "1"
["display_startup_errors"]=>
@@ -101,4 +101,4 @@
["docref_ext"]=>
string(5) ".html"
}
-===Done===
\ No newline at end of file
+===Done===
Modified: php/php-src/trunk/ext/standard/tests/file/stream_rfc2397_006.phpt
===================================================================
--- php/php-src/trunk/ext/standard/tests/file/stream_rfc2397_006.phpt 2011-08-01 01:00:57 UTC (rev 314004)
+++ php/php-src/trunk/ext/standard/tests/file/stream_rfc2397_006.phpt 2011-08-01 03:42:02 UTC (rev 314005)
@@ -21,8 +21,11 @@
===DONE===
<?php exit(0); ?>
--EXPECTF--
-string(0) ""
-string(6) "foobar"
+Warning: file_get_contents() expects parameter 1 to be a valid path, string given in %s line %d
+NULL
+
+Warning: file_get_contents() expects parameter 1 to be a valid path, string given in %s line %d
+NULL
string(13) "foobar foobar"
Warning: file_get_contents(data:;base64,#Zm9vYmFyIGZvb2Jhc=): failed to open stream: rfc2397: unable to decode in %sstream_rfc2397_006.php on line %d
Modified: php/php-src/trunk/ext/standard/tests/file/tempnam_variation7.phpt
===================================================================
--- php/php-src/trunk/ext/standard/tests/file/tempnam_variation7.phpt 2011-08-01 01:00:57 UTC (rev 314004)
+++ php/php-src/trunk/ext/standard/tests/file/tempnam_variation7.phpt 2011-08-01 03:42:02 UTC (rev 314005)
@@ -98,19 +98,19 @@
Warning: tempnam() expects parameter 1 to be a valid path, string given in %s on line %d
-- File is not created --
-Warning: unlink(): Invalid argument in %s on line %d
+Warning: unlink(): No such file or directory in %s on line %d
-- Iteration 7 --
Warning: tempnam() expects parameter 1 to be a valid path, array given in %s on line %d
-- File is not created --
-Warning: unlink(): Invalid argument in %s on line %d
+Warning: unlink(): No such file or directory in %s on line %d
-- Iteration 8 --
-File name is => /tmp/tempnam_variation3.tmp%s
+File name is => %s/tempnam_variation3.tmp%s
File permissions are => 100600
File created in => temp dir
-- Iteration 9 --
-File name is => /tmp/tempnam_variation3.tmp%s
+File name is => %s/tempnam_variation3.tmp%s
File permissions are => 100600
File created in => temp dir
Modified: php/php-src/trunk/ext/standard/tests/general_functions/getservbyname_variation10.phpt
===================================================================
--- php/php-src/trunk/ext/standard/tests/general_functions/getservbyname_variation10.phpt 2011-08-01 01:00:57 UTC (rev 314004)
+++ php/php-src/trunk/ext/standard/tests/general_functions/getservbyname_variation10.phpt 2011-08-01 03:42:02 UTC (rev 314005)
@@ -1,5 +1,11 @@
--TEST--
Test function getservbyname() by substituting argument 2 with emptyUnsetUndefNull values.
+--SKIPIF--
+<?php
+if(PHP_OS == 'Darwin') {
+ die("skip.. Mac OS X is fine with NULLs in getservbyname");
+}
+?>
--FILE--
<?php
Modified: php/php-src/trunk/ext/standard/tests/general_functions/getservbyname_variation9.phpt
===================================================================
--- php/php-src/trunk/ext/standard/tests/general_functions/getservbyname_variation9.phpt 2011-08-01 01:00:57 UTC (rev 314004)
+++ php/php-src/trunk/ext/standard/tests/general_functions/getservbyname_variation9.phpt 2011-08-01 03:42:02 UTC (rev 314005)
@@ -1,5 +1,11 @@
--TEST--
Test function getservbyname() by substituting argument 2 with boolean values.
+--SKIPIF--
+<?php
+if(PHP_OS == 'Darwin') {
+ die("skip.. Mac OS X is fine with NULLs in getservbyname");
+}
+?>
--FILE--
<?php
Modified: php/php-src/trunk/ext/standard/tests/general_functions/parse_ini_basic.data
===================================================================
--- php/php-src/trunk/ext/standard/tests/general_functions/parse_ini_basic.data 2011-08-01 01:00:57 UTC (rev 314004)
+++ php/php-src/trunk/ext/standard/tests/general_functions/parse_ini_basic.data 2011-08-01 03:42:02 UTC (rev 314005)
@@ -12,7 +12,7 @@
string = asdadfsdjkslkj ¡@£$$ { }[ ]/%#¤
sqstring = 'adsasdadasdasd'
dqstring = "asdadfsdjkslkj ¡@£$$ { } !^~|¥¥{[()/)&/% ¤ # #"
-php_constant = E_ALL
+php_constant = E_WARNING
user_constant = TEST_CONSTANT
[basic with whitespace]
@@ -28,7 +28,7 @@
boolno = no
sqstring = 'adsasdadasdasd'
dqstring = "asdadfsdjkslkj ¡@£$$€¥¥{[()/)&/%#¤"
-php_constant = E_ALL
+php_constant = E_WARNING
[comments]
; some comment
Modified: php/php-src/trunk/ext/standard/tests/general_functions/parse_ini_basic.phpt
===================================================================
--- php/php-src/trunk/ext/standard/tests/general_functions/parse_ini_basic.phpt 2011-08-01 01:00:57 UTC (rev 314004)
+++ php/php-src/trunk/ext/standard/tests/general_functions/parse_ini_basic.phpt 2011-08-01 03:42:02 UTC (rev 314005)
@@ -45,7 +45,7 @@
["dqstring"]=>
string(51) "asdadfsdjkslkj ¡@£$$ { } !^~|¥¥{[()/)&/% ¤ # #"
["php_constant"]=>
- string(5) "30719"
+ string(1) "2"
["user_constant"]=>
string(21) "this_is_test_constant"
}
@@ -76,7 +76,7 @@
["dqstring"]=>
string(41) "asdadfsdjkslkj ¡@£$$€¥¥{[()/)&/%#¤"
["php_constant"]=>
- string(5) "30719"
+ string(1) "2"
}
["comments"]=>
array(1) {
Modified: php/php-src/trunk/ext/standard/tests/general_functions/parse_ini_booleans.phpt
===================================================================
--- php/php-src/trunk/ext/standard/tests/general_functions/parse_ini_booleans.phpt 2011-08-01 01:00:57 UTC (rev 314004)
+++ php/php-src/trunk/ext/standard/tests/general_functions/parse_ini_booleans.phpt 2011-08-01 03:42:02 UTC (rev 314005)
@@ -15,15 +15,15 @@
["error_reporting values"]=>
array(6) {
["foo"]=>
- string(7) "30719 8"
+ string(7) "32767 8"
["error_reporting"]=>
- string(5) "30719"
+ string(5) "32767"
["error_reporting1"]=>
string(4) "4177"
["error_reporting2"]=>
- string(5) "30711"
+ string(5) "32759"
["error_reporting3"]=>
- string(5) "30711"
+ string(5) "32759"
["error_reporting4"]=>
string(5) "32759"
}
Modified: php/php-src/trunk/ext/standard/tests/general_functions/phpinfo.phpt
===================================================================
--- php/php-src/trunk/ext/standard/tests/general_functions/phpinfo.phpt 2011-08-01 01:00:57 UTC (rev 314004)
+++ php/php-src/trunk/ext/standard/tests/general_functions/phpinfo.phpt 2011-08-01 03:42:02 UTC (rev 314005)
@@ -36,7 +36,6 @@
Thread Safety => %s
Zend Signal Handling => %s
Zend Memory Manager => %s
-Zend Signal Handling => %s
Zend Multibyte Support => %s
IPv6 Support => %s
DTrace Support => %s
Modified: php/php-src/trunk/ext/standard/tests/general_functions/proc_nice_basic.phpt
===================================================================
--- php/php-src/trunk/ext/standard/tests/general_functions/proc_nice_basic.phpt 2011-08-01 01:00:57 UTC (rev 314004)
+++ php/php-src/trunk/ext/standard/tests/general_functions/proc_nice_basic.phpt 2011-08-01 03:42:02 UTC (rev 314005)
@@ -13,7 +13,7 @@
<?php
function getNice($id)
{
- $res = shell_exec('ps -p ' . $id .' -o "%p %n"');
+ $res = shell_exec('ps -p ' . $id .' -o "pid,nice"');
preg_match('/^\s*\w+\s+\w+\s*(\d+)\s+(\d+)/m', $res, $matches);
if (count($matches) > 2)
return $matches[2];
Modified: php/php-src/trunk/ext/standard/tests/general_functions/proc_nice_error.phpt
===================================================================
--- php/php-src/trunk/ext/standard/tests/general_functions/proc_nice_error.phpt 2011-08-01 01:00:57 UTC (rev 314004)
+++ php/php-src/trunk/ext/standard/tests/general_functions/proc_nice_error.phpt 2011-08-01 03:42:02 UTC (rev 314005)
@@ -6,20 +6,23 @@
?>
--FILE--
<?php
+echo "*** Test by calling method or function with incorrect numbers of arguments ***\n";
+$priority = 1;
-echo "*** Test by calling method or function with incorrect numbers of arguments ***\n"
+$extra_arg = 1;
-$priority =
+var_dump(proc_nice( $priority, $extra_arg) );
-
-$extra_arg =
-
-var_dump(proc_nice( $priority, $extra_arg ) );
-
var_dump(proc_nice( ) );
?>
--EXPECTF--
-Parse error: syntax error, unexpected T_VARIABLE, expecting ',' or ';' in %s on line %d
+*** Test by calling method or function with incorrect numbers of arguments ***
+
+Warning: proc_nice() expects exactly 1 parameter, 2 given in %s line %d
+bool(false)
+
+Warning: proc_nice() expects exactly 1 parameter, 0 given in %s line %d
+bool(false)
Modified: php/php-src/trunk/ext/standard/tests/general_functions/set_magic_quotes_runtime_basic.phpt
===================================================================
--- php/php-src/trunk/ext/standard/tests/general_functions/set_magic_quotes_runtime_basic.phpt 2011-08-01 01:00:57 UTC (rev 314004)
+++ php/php-src/trunk/ext/standard/tests/general_functions/set_magic_quotes_runtime_basic.phpt 2011-08-01 03:42:02 UTC (rev 314005)
@@ -13,11 +13,6 @@
$g = get_magic_quotes_runtime();
echo "\n-- magic quotes runtime set in INI file: " . $g . "--\n";
-echo "\n-- Set magic quotes runtime to 1: --\n";
-var_dump(set_magic_quotes_runtime(1));
-$g = get_magic_quotes_runtime();
-echo "\n-- magic quotes runtime after set: " . $g . " --\n";
-
echo "\n-- Set magic quotes runtime to 0: --\n";
var_dump(set_magic_quotes_runtime(0));
$g = get_magic_quotes_runtime();
@@ -33,26 +28,23 @@
--EXPECTF--
Simple testcase for set_magic_quotes_runtime() function - basic test
--- magic quotes runtime set in INI file: 0--
+Deprecated: Function get_magic_quotes_runtime() is deprecated in %s on line %d
--- Set magic quotes runtime to 1: --
+-- magic quotes runtime set in INI file: --
-Deprecated: Function set_magic_quotes_runtime() is deprecated in %s on line %d
-bool(true)
-
--- magic quotes runtime after set: 1 --
-
-- Set magic quotes runtime to 0: --
Deprecated: Function set_magic_quotes_runtime() is deprecated in %s on line %d
-bool(true)
+bool(false)
--- magic quotes runtime after set: 0 --
+Deprecated: Function get_magic_quotes_runtime() is deprecated in %s on line %d
+-- magic quotes runtime after set: --
+
-- Set magic quotes runtime to 1: --
Deprecated: Function set_magic_quotes_runtime() is deprecated in %s on line %d
-bool(true)
--- magic quotes runtime after set: 1 --
-===DONE===
\ No newline at end of file
+Fatal error: set_magic_quotes_runtime(): magic_quotes_runtime is not supported anymore in Unknown on line 0
+
+
Modified: php/php-src/trunk/ext/standard/tests/mail/mail_basic2.phpt
===================================================================
--- php/php-src/trunk/ext/standard/tests/mail/mail_basic2.phpt 2011-08-01 01:00:57 UTC (rev 314004)
+++ php/php-src/trunk/ext/standard/tests/mail/mail_basic2.phpt 2011-08-01 03:42:02 UTC (rev 314005)
@@ -6,7 +6,7 @@
die("skip Won't run on Windows");
?>
--INI--
-sendmail_path="sed > /tmp/php_test_mailBasic2.out"
+sendmail_path="cat > /tmp/php_test_mailBasic2.out"
mail.add_x_header = Off
--FILE--
<?php
@@ -24,7 +24,7 @@
$subject = 'Test Subject';
$message = 'A Message';
$additional_headers = 'KHeaders';
-$additional_parameters = "-e '5 a--- Extras'";
+$additional_parameters = "-n";
$outFile = "/tmp/php_test_mailBasic2.out";
@unlink($outFile);
@@ -36,14 +36,13 @@
unlink($outFile);
?>
===DONE===
---EXPECT--
+--EXPECTF--
*** Testing mail() : basic functionality ***
-- extra parameters --
bool(true)
-To: [email protected]
-Subject: Test Subject
-KHeaders
-
-A Message
---- Extras
+%w1%wTo: [email protected]
+%w2%wSubject: Test Subject
+%w3%wKHeaders
+%w4%w
+%w5%wA Message
===DONE===
Modified: php/php-src/trunk/ext/standard/tests/mail/mail_variation2.phpt
===================================================================
--- php/php-src/trunk/ext/standard/tests/mail/mail_variation2.phpt 2011-08-01 01:00:57 UTC (rev 314004)
+++ php/php-src/trunk/ext/standard/tests/mail/mail_variation2.phpt 2011-08-01 03:42:02 UTC (rev 314005)
@@ -1,8 +1,8 @@
--TEST--
Test mail() function : variation force extra parameters
--INI--
-sendmail_path="sed > /tmp/php_test_mailVariation2.out"
-mail.force_extra_parameters="-e4a---forced-params"
+sendmail_path="cat > /tmp/php_test_mailVariation2.out"
+mail.force_extra_parameters="-n"
mail.add_x_header = Off
--SKIPIF--
<?php
@@ -33,12 +33,11 @@
?>
===DONE===
---EXPECT--
+--EXPECTF--
*** Testing mail() : basic functionality ***
bool(true)
-To: [email protected]
-Subject: Test Subject
-
-A Message
----forced-params
+%w1%wTo: [email protected]
+%w2%wSubject: Test Subject
+%w3%w
+%w4%wA Message
===DONE===
Modified: php/php-src/trunk/ext/standard/tests/serialize/serialization_miscTypes_001.phpt
===================================================================
--- php/php-src/trunk/ext/standard/tests/serialize/serialization_miscTypes_001.phpt 2011-08-01 01:00:57 UTC (rev 314004)
+++ php/php-src/trunk/ext/standard/tests/serialize/serialization_miscTypes_001.phpt 2011-08-01 03:42:02 UTC (rev 314005)
@@ -1,5 +1,7 @@
--TEST--
Test serialize() & unserialize() functions: many types
+--INI--
+serialize_precision=17
--SKIPIF--
<?php
if (PHP_INT_SIZE != 4) {
@@ -223,7 +225,7 @@
}
-- Iteration 15 --
-after serialization => string(96) "a:7:{i:0;i:0;i:1;i:1;i:2;i:-2;i:3;d:3.3333330000000001;i:4;s:1:"a";i:5;a:0:{}i:6;a:1:{i:0;N;}}"
+after serialization => string(94) "a:7:{i:0;i:0;i:1;i:1;i:2;i:-2;i:3;d:3.3333330000000001;i:4;s:1:"a";i:5;a:0:{}i:6;a:1:{i:0;N;}}"
after unserialization => array(7) {
[0]=>
int(0)
Modified: php/php-src/trunk/ext/standard/tests/streams/bug54623.phpt
===================================================================
--- php/php-src/trunk/ext/standard/tests/streams/bug54623.phpt 2011-08-01 01:00:57 UTC (rev 314004)
+++ php/php-src/trunk/ext/standard/tests/streams/bug54623.phpt 2011-08-01 03:42:02 UTC (rev 314005)
@@ -14,4 +14,6 @@
int(%d)
int(%d)
+Notice: fwrite(): send of 1 bytes failed with errno=61 Connection refused in %s on line %d
+
Warning: fwrite(): %d is not a valid stream resource in %s on line %d
Modified: php/php-src/trunk/ext/standard/tests/strings/htmlentities04.phpt
===================================================================
--- php/php-src/trunk/ext/standard/tests/strings/htmlentities04.phpt 2011-08-01 01:00:57 UTC (rev 314004)
+++ php/php-src/trunk/ext/standard/tests/strings/htmlentities04.phpt 2011-08-01 03:42:02 UTC (rev 314005)
@@ -16,5 +16,6 @@
setlocale( LC_CTYPE, "ja_JP.EUC-JP", "ja_JP.eucJP" );
var_dump(htmlentities("\xa1\xa2\xa1\xa3\xa1\xa4", ENT_QUOTES, ''));
?>
---EXPECT--
+--EXPECTF--
+Strict Standards: htmlentities(): Only basic entities substitution is supported for multi-byte encodings other than UTF-8; functionality is equivalent to htmlspecialchars in %s line %d
string(6) "������"
--
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php
