mattwil Thu May 29 07:33:03 2008 UTC
Modified files: (Branch: PHP_5_2)
/ZendEngine2/tests bug41919.phpt
/php-src/ext/standard/tests/array bug43495.phpt
Log:
Fixed tests on Windows
http://cvs.php.net/viewvc.cgi/ZendEngine2/tests/bug41919.phpt?r1=1.1.2.4&r2=1.1.2.5&diff_format=u
Index: ZendEngine2/tests/bug41919.phpt
diff -u ZendEngine2/tests/bug41919.phpt:1.1.2.4
ZendEngine2/tests/bug41919.phpt:1.1.2.5
--- ZendEngine2/tests/bug41919.phpt:1.1.2.4 Thu Jan 24 08:51:04 2008
+++ ZendEngine2/tests/bug41919.phpt Thu May 29 07:33:03 2008
@@ -8,4 +8,4 @@
echo "ok\n";
?>
--EXPECTF--
-Fatal error: Cannot use string offset as an object in %s/bug41919.php on line
%d
+Fatal error: Cannot use string offset as an object in %sbug41919.php on line %d
http://cvs.php.net/viewvc.cgi/php-src/ext/standard/tests/array/bug43495.phpt?r1=1.2.2.3&r2=1.2.2.4&diff_format=u
Index: php-src/ext/standard/tests/array/bug43495.phpt
diff -u php-src/ext/standard/tests/array/bug43495.phpt:1.2.2.3
php-src/ext/standard/tests/array/bug43495.phpt:1.2.2.4
--- php-src/ext/standard/tests/array/bug43495.phpt:1.2.2.3 Thu Dec 13
07:57:24 2007
+++ php-src/ext/standard/tests/array/bug43495.phpt Thu May 29 07:33:03 2008
@@ -17,5 +17,5 @@
echo "Done.\n";
?>
--EXPECTF--
-Warning: array_merge_recursive(): recursion detected in %s/bug43495.php on
line %d
+Warning: array_merge_recursive(): recursion detected in %sbug43495.php on line
%d
Done.
--
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php
