diff options
| author | Anatol Belski <ab@php.net> | 2013-06-11 12:39:28 +0200 |
|---|---|---|
| committer | Anatol Belski <ab@php.net> | 2013-06-11 12:39:28 +0200 |
| commit | 1cc750493f0b7b8514a14d3b99eb41e75c0f039f (patch) | |
| tree | e410fb5198e3abfb73f8190a9b91f810a8ff7ac1 | |
| parent | 251ec84a9774300c2cc77c7a430d5c5547494389 (diff) | |
| parent | eccc05fc44150f6fc135ce7875a34b1467bd0979 (diff) | |
| download | php-git-1cc750493f0b7b8514a14d3b99eb41e75c0f039f.tar.gz | |
Merge branch 'PHP-5.3' into PHP-5.4
* PHP-5.3:
fixed tests
| -rw-r--r-- | ext/date/tests/bug53437_var3.phpt | 4 | ||||
| -rw-r--r-- | ext/date/tests/bug53437_var5.phpt | 4 |
2 files changed, 4 insertions, 4 deletions
diff --git a/ext/date/tests/bug53437_var3.phpt b/ext/date/tests/bug53437_var3.phpt index cd5d913297..82b90f559b 100644 --- a/ext/date/tests/bug53437_var3.phpt +++ b/ext/date/tests/bug53437_var3.phpt @@ -11,8 +11,8 @@ var_dump($di); ?> ==DONE== ---EXPECT-- -object(DateInterval)#1 (15) { +--EXPECTF-- +object(DateInterval)#%d (15) { ["y"]=> int(2) ["m"]=> diff --git a/ext/date/tests/bug53437_var5.phpt b/ext/date/tests/bug53437_var5.phpt index d8ddef7635..e95fcdae96 100644 --- a/ext/date/tests/bug53437_var5.phpt +++ b/ext/date/tests/bug53437_var5.phpt @@ -11,8 +11,8 @@ var_dump($di); ?> ==DONE== ---EXPECT-- -object(DateInterval)#1 (15) { +--EXPECTF-- +object(DateInterval)#%d (15) { ["y"]=> int(2) ["m"]=> |