cvs: ZendEngine2 /tests bug21478.phpt bug31720.phpt bug32290.phpt bug36214.phpt

tony2001                Tue Mar  6 19:25:47 2007 UTC

  Modified files:              
    /ZendEngine2/tests  bug21478.phpt bug31720.phpt bug32290.phpt 
                        bug36214.phpt 
  Log:
  fix tests
  
  
http://cvs.php.net/viewvc.cgi/ZendEngine2/tests/bug21478.phpt?r1=1.4&r2=1.5&diff_format=u
Index: ZendEngine2/tests/bug21478.phpt
diff -u ZendEngine2/tests/bug21478.phpt:1.4 ZendEngine2/tests/bug21478.phpt:1.5
--- ZendEngine2/tests/bug21478.phpt:1.4 Thu Aug  7 19:36:13 2003
+++ ZendEngine2/tests/bug21478.phpt     Tue Mar  6 19:25:46 2007
@@ -24,7 +24,7 @@
 stream_filter_append($fp, "myfilter");
 stream_filter_append($fp, "myfilter");
 stream_filter_append($fp, "myfilter");
-fwrite($fp, "This is a test.\n");
+fwrite($fp, b"This is a test.\n");
 print "Done.\n";
 fclose($fp);
 // Uncommenting the following 'print' line causes the segfault to stop occuring
http://cvs.php.net/viewvc.cgi/ZendEngine2/tests/bug31720.phpt?r1=1.3&r2=1.4&diff_format=u
Index: ZendEngine2/tests/bug31720.phpt
diff -u ZendEngine2/tests/bug31720.phpt:1.3 ZendEngine2/tests/bug31720.phpt:1.4
--- ZendEngine2/tests/bug31720.phpt:1.3 Fri Jun 17 16:40:05 2005
+++ ZendEngine2/tests/bug31720.phpt     Tue Mar  6 19:25:46 2007
@@ -10,7 +10,5 @@
 --EXPECTF--
 Notice: Undefined variable: nonesuchvar in %s on line %d
 
-Notice: Non-callable array passed to zend_call_function() in %s on line %d
-
-Warning: array_walk(): Unable to call Array() - function does not exist in %s 
on line %d
+Warning: array_walk() expects parameter 2 to be valid callback, array given in 
%s on line %d
 ===DONE===
http://cvs.php.net/viewvc.cgi/ZendEngine2/tests/bug32290.phpt?r1=1.6&r2=1.7&diff_format=u
Index: ZendEngine2/tests/bug32290.phpt
diff -u ZendEngine2/tests/bug32290.phpt:1.6 ZendEngine2/tests/bug32290.phpt:1.7
--- ZendEngine2/tests/bug32290.phpt:1.6 Thu Jan 19 21:27:15 2006
+++ ZendEngine2/tests/bug32290.phpt     Tue Mar  6 19:25:46 2007
@@ -93,14 +93,12 @@
 
 ?>
 ===DONE===
-<?php exit(0); ?>
 --EXPECTF--
 ===A===
 TestB::doSomething(1)
 
-Strict Standards: Non-static method TestA::doSomething() cannot be called 
statically in %s on line %d
-TestA::doSomething(2)
-int(1)
+Warning: call_user_func_array() expects parameter 1 to be valid callback, 
array given in %s on line %d
+NULL
 
 ===B===
 TestB::doSomethingThis(1)
@@ -110,9 +108,8 @@
 ===C===
 TestB::doSomethingParent(1)
 
-Strict Standards: Non-static method TestA::doSomethingParent() cannot be 
called statically in %s on line %d
-TestA::doSomethingParent(2)
-int(1)
+Warning: call_user_func_array() expects parameter 1 to be valid callback, 
array given in %s on line %d
+NULL
 
 ===D===
 TestB::doSomethingParentThis(1)
http://cvs.php.net/viewvc.cgi/ZendEngine2/tests/bug36214.phpt?r1=1.3&r2=1.4&diff_format=u
Index: ZendEngine2/tests/bug36214.phpt
diff -u ZendEngine2/tests/bug36214.phpt:1.3 ZendEngine2/tests/bug36214.phpt:1.4
--- ZendEngine2/tests/bug36214.phpt:1.3 Mon Jan 15 10:31:04 2007
+++ ZendEngine2/tests/bug36214.phpt     Tue Mar  6 19:25:46 2007
@@ -33,7 +33,7 @@
 $ctx->comment_preview[1] = 2;
 var_dump($ctx->comment_preview);
 ?>
---EXPECT--
+--EXPECTF--
 array(2) {
   [0]=>
   int(1)
@@ -46,9 +46,34 @@
   [1]=>
   int(2)
 }
-object(ArrayObject)#2 (2) {
+object(ArrayObject)#%d (1) {
+  ["storage":"ArrayObject":private]=>
+  array(2) {
+    [0]=>
+    int(1)
+    [1]=>
+    int(2)
+  }
+}
+--UEXPECTF--
+array(2) {
   [0]=>
   int(1)
   [1]=>
   int(2)
 }
+array(2) {
+  [0]=>
+  int(1)
+  [1]=>
+  int(2)
+}
+object(ArrayObject)#%d (1) {
+  [u"storage":u"ArrayObject":private]=>
+  array(2) {
+    [0]=>
+    int(1)
+    [1]=>
+    int(2)
+  }
+}

-- 
Zend Engine CVS Mailing List (http://cvs.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php