summaryrefslogtreecommitdiff
path: root/tests
diff options
context:
space:
mode:
authorStanislav Malyshev <stas@php.net>2013-06-13 10:30:18 -0700
committerStanislav Malyshev <stas@php.net>2013-06-13 10:30:18 -0700
commite74776266fae4c9866cc4eb06d0f87405bda8411 (patch)
treebb4c193b5575651230094b1d2cce8d2dc010f03c /tests
parenta0cb61b292ec2cc4f9aff602e122a7f8273900a3 (diff)
parent10b9579395641d96baf267bd880366aee690c1e0 (diff)
downloadphp-git-e74776266fae4c9866cc4eb06d0f87405bda8411.tar.gz
Merge branch 'PHP-5.4' into PHP-5.5
* PHP-5.4: fix test for bug #60322
Diffstat (limited to 'tests')
-rw-r--r--tests/output/bug60322.phpt5
1 files changed, 4 insertions, 1 deletions
diff --git a/tests/output/bug60322.phpt b/tests/output/bug60322.phpt
index c28ab4d617..f4d7139458 100644
--- a/tests/output/bug60322.phpt
+++ b/tests/output/bug60322.phpt
@@ -1,8 +1,11 @@
--TEST--
Bug #60322 (ob_get_clean() now raises an E_NOTICE if no buffers exist)
+--INI--
+output_buffering=128
--FILE--
<?php
-while(ob_get_clean()) ;
+ob_start();
+while(@ob_end_clean());
var_dump(ob_get_clean());
--EXPECT--
bool(false)