summaryrefslogtreecommitdiff
path: root/tests
diff options
context:
space:
mode:
authorOndřej Surý <ondrej@sury.org>2012-05-28 16:52:15 +0200
committerOndřej Surý <ondrej@sury.org>2012-05-28 16:52:15 +0200
commit01c525f668ecff08bea21c4ff22745b8f77e8c3a (patch)
tree07ebb675549d7a8ceb905676e4894151122321ac /tests
parentd4d61a2bcb9975c8aeddbc6603211064174087a9 (diff)
downloadphp-01c525f668ecff08bea21c4ff22745b8f77e8c3a.tar.gz
Imported Upstream version 5.4.4~rc1upstream/5.4.4_rc1
Diffstat (limited to 'tests')
-rw-r--r--tests/basic/021.phpt1
-rw-r--r--tests/basic/bug20539.phpt3
-rwxr-xr-xtests/classes/ctor_in_interface_02.phpt1
-rw-r--r--tests/output/ob_013.phpt4
4 files changed, 5 insertions, 4 deletions
diff --git a/tests/basic/021.phpt b/tests/basic/021.phpt
index e79ac7dc2..eeaf58869 100644
--- a/tests/basic/021.phpt
+++ b/tests/basic/021.phpt
@@ -2,6 +2,7 @@
Bug #37276 (problems witch $_POST array)
--INI--
file_uploads=1
+upload_tmp_dir=.
--POST_RAW--
Content-Type: multipart/form-data; boundary=---------------------------20896060251896012921717172737
-----------------------------20896060251896012921717172737
diff --git a/tests/basic/bug20539.phpt b/tests/basic/bug20539.phpt
index 67cef3a4f..1406ce088 100644
--- a/tests/basic/bug20539.phpt
+++ b/tests/basic/bug20539.phpt
@@ -11,7 +11,8 @@ session.save_path=./tests/basic/
<?php
print "good :)\n";
$filename = __DIR__ . '/sess_' . session_id();
- var_dump(unlink($filename));
+ var_dump(file_exists($filename));
+ @unlink($filename);
?>
--EXPECT--
good :)
diff --git a/tests/classes/ctor_in_interface_02.phpt b/tests/classes/ctor_in_interface_02.phpt
index 0c7931ed5..08e6f36e0 100755
--- a/tests/classes/ctor_in_interface_02.phpt
+++ b/tests/classes/ctor_in_interface_02.phpt
@@ -29,7 +29,6 @@ class implem13 implements constr1, constr3
{
}
}
-
?>
--EXPECTF--
Fatal error: Declaration of implem13::__construct() must be compatible with constr3::__construct($a) in %s on line %d
diff --git a/tests/output/ob_013.phpt b/tests/output/ob_013.phpt
index e96de46a4..ad2e36d47 100644
--- a/tests/output/ob_013.phpt
+++ b/tests/output/ob_013.phpt
@@ -39,7 +39,7 @@ Array
(
[name] => d
[type] => 1
- [flags] => 4209
+ [flags] => 20593
[level] => 4
[chunk_size] => %d
[buffer_size] => 16384
@@ -95,7 +95,7 @@ Array
(
[name] => d
[type] => 1
- [flags] => 4209
+ [flags] => 20593
[level] => 4
[chunk_size] => %d
[buffer_size] => 16384