summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMichael Wallner <mike@php.net>2015-02-18 14:06:39 +0100
committerMichael Wallner <mike@php.net>2015-02-18 14:06:39 +0100
commitec7ba48e678e3463a2344bf89ce340dfb836add6 (patch)
tree888e4123d529ab7d3d7707b3c431b9047121e475
parent23e4af185adcb6d116ee0897002c09c6603634ae (diff)
parent83dda66aac10e7307f2e2f4e73a769b125a88451 (diff)
downloadphp-git-ec7ba48e678e3463a2344bf89ce340dfb836add6.tar.gz
Merge branch 'PHP-5.5' into PHP-5.6
* PHP-5.5: fix test
-rw-r--r--tests/output/bug65593.phpt2
1 files changed, 1 insertions, 1 deletions
diff --git a/tests/output/bug65593.phpt b/tests/output/bug65593.phpt
index 44a2f5bf5e..0a59554967 100644
--- a/tests/output/bug65593.phpt
+++ b/tests/output/bug65593.phpt
@@ -7,7 +7,7 @@ echo "Test\n";
ob_start(function(){ob_start();});
?>
===DONE===
---EXPECT--
+--EXPECTF--
Test
Fatal error: Cannot destroy active lambda function in %sbug65593.php on line %d