diff options
| author | Dmitry Stogov <dmitry@zend.com> | 2013-06-10 12:54:54 +0400 |
|---|---|---|
| committer | Dmitry Stogov <dmitry@zend.com> | 2013-06-10 12:54:54 +0400 |
| commit | f68b8a5e7481686be1cdabf20f737f52dcb4299c (patch) | |
| tree | 50ee34bdbba553a3f74ce9cc20b92f38ea2650ba | |
| parent | 336a8e1943af85bb49cb5986d897d967ba73dcc0 (diff) | |
| parent | f5f64042601606089d2e1b3c3eac1754203e12a7 (diff) | |
| download | php-git-f68b8a5e7481686be1cdabf20f737f52dcb4299c.tar.gz | |
Merge branch 'PHP-5.3' into PHP-5.4
* PHP-5.3:
Fixed test script
| -rw-r--r-- | Zend/tests/bug64966.phpt | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/Zend/tests/bug64966.phpt b/Zend/tests/bug64966.phpt index 27fec3b72a..c1cdbbf812 100644 --- a/Zend/tests/bug64966.phpt +++ b/Zend/tests/bug64966.phpt @@ -22,7 +22,7 @@ $a->b(); --EXPECTF-- Fatal error: Uncaught exception 'Exception' in %sbug64966.php:3 Stack trace: -#0 [internal function]: {closure}(4096, 'Argument 1 pass...', '/home/huixinche...', 6, Array) +#0 [internal function]: {closure}(4096, 'Argument 1 pass...', '%s', 6, Array) #1 %sbug64966.php(6): iterator_apply('') #2 %sbug64966.php(12): test('iterator_apply') #3 %sbug64966.php(17): A->b() |