Browse Source

fix tests

migration/RELEASE_1_0_0
Antony Dovgal 20 years ago
parent
commit
37797ff7bf
  1. 2
      Zend/tests/bug21478.phpt
  2. 4
      Zend/tests/bug31720.phpt
  3. 11
      Zend/tests/bug32290.phpt
  4. 29
      Zend/tests/bug36214.phpt

2
Zend/tests/bug21478.phpt

@ -24,7 +24,7 @@ $fp = fopen(dirname(__FILE__)."/test.txt","w");
stream_filter_append($fp, "myfilter"); stream_filter_append($fp, "myfilter");
stream_filter_append($fp, "myfilter"); 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"; print "Done.\n";
fclose($fp); fclose($fp);
// Uncommenting the following 'print' line causes the segfault to stop occuring // Uncommenting the following 'print' line causes the segfault to stop occuring

4
Zend/tests/bug31720.phpt

@ -10,7 +10,5 @@ array_walk($array, array($nonesuchvar,'show'));
--EXPECTF-- --EXPECTF--
Notice: Undefined variable: nonesuchvar in %s on line %d 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=== ===DONE===

11
Zend/tests/bug32290.phpt

@ -93,14 +93,12 @@ var_dump($x->doSomethingStatic(1));
?> ?>
===DONE=== ===DONE===
<?php exit(0); ?>
--EXPECTF-- --EXPECTF--
===A=== ===A===
TestB::doSomething(1) 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=== ===B===
TestB::doSomethingThis(1) TestB::doSomethingThis(1)
@ -110,9 +108,8 @@ int(1)
===C=== ===C===
TestB::doSomethingParent(1) 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=== ===D===
TestB::doSomethingParentThis(1) TestB::doSomethingParentThis(1)

29
Zend/tests/bug36214.phpt

@ -33,7 +33,7 @@ $ctx->comment_preview[0] = 1;
$ctx->comment_preview[1] = 2; $ctx->comment_preview[1] = 2;
var_dump($ctx->comment_preview); var_dump($ctx->comment_preview);
?> ?>
--EXPECT--
--EXPECTF--
array(2) { array(2) {
[0]=> [0]=>
int(1) int(1)
@ -46,9 +46,34 @@ array(2) {
[1]=> [1]=>
int(2) 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]=> [0]=>
int(1) int(1)
[1]=> [1]=>
int(2) 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)
}
}
Loading…
Cancel
Save