diff options
| author | Michael Wallner <mike@php.net> | 2015-02-18 14:05:02 +0100 |
|---|---|---|
| committer | Michael Wallner <mike@php.net> | 2015-02-18 14:05:02 +0100 |
| commit | 23e4af185adcb6d116ee0897002c09c6603634ae (patch) | |
| tree | 0d0594bfe1f9b13950c8abf5e34311c6365b7dc3 | |
| parent | 0d2a2b98c9e88e63e6a3496d6dbf2cc479684427 (diff) | |
| parent | 8b6919c77ccbfbf52dd97067e313c55dd39abbf5 (diff) | |
| download | php-git-23e4af185adcb6d116ee0897002c09c6603634ae.tar.gz | |
Merge branch 'PHP-5.5' into PHP-5.6
* PHP-5.5:
fix test
| -rw-r--r-- | tests/output/bug65593.phpt | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/tests/output/bug65593.phpt b/tests/output/bug65593.phpt index 336c73e03d..44a2f5bf5e 100644 --- a/tests/output/bug65593.phpt +++ b/tests/output/bug65593.phpt @@ -10,4 +10,4 @@ ob_start(function(){ob_start();}); --EXPECT-- Test -Fatal error: Cannot destroy active lambda function in /home/mike/src/php-5.5/tests/output/bug65593.php on line 4 +Fatal error: Cannot destroy active lambda function in %sbug65593.php on line %d |