diff options
| author | Anatol Belski <ab@php.net> | 2019-06-29 13:31:22 +0200 |
|---|---|---|
| committer | Anatol Belski <ab@php.net> | 2019-06-29 13:31:22 +0200 |
| commit | 885cb79201130fc8a3f686a641d6a6be531f3219 (patch) | |
| tree | dd8360cd5704f6890fecb265cad1f30070ef9c0e /ext/fileinfo/tests | |
| parent | 82effb3fc7bcab0efcc343b3e03355f5f2f663c9 (diff) | |
| parent | b92669094767e54af3ef833f51072d53a8c788c0 (diff) | |
| download | php-git-885cb79201130fc8a3f686a641d6a6be531f3219.tar.gz | |
Merge branch 'PHP-7.3' into PHP-7.4
* PHP-7.3:
Fix typo
Add tests from fix #78183 from PHP-7.2
Fix #78183: finfo_file shows wrong mime-type for .tga file
Diffstat (limited to 'ext/fileinfo/tests')
| -rw-r--r-- | ext/fileinfo/tests/finfo_file_002.phpt | 2 | ||||
| -rw-r--r-- | ext/fileinfo/tests/resources/test.tga | bin | 0 -> 19 bytes |
2 files changed, 2 insertions, 0 deletions
diff --git a/ext/fileinfo/tests/finfo_file_002.phpt b/ext/fileinfo/tests/finfo_file_002.phpt index fff16b7796..aa870cdfab 100644 --- a/ext/fileinfo/tests/finfo_file_002.phpt +++ b/ext/fileinfo/tests/finfo_file_002.phpt @@ -39,6 +39,8 @@ array(%d) { string(9) "image/png" ["%s/resources/test.ppt"]=> string(29) "application/vnd.ms-powerpoint" + ["%s/resources/test.tga"]=> + string(11) "image/x-tga" ["%s/resources/test.webm"]=> string(10) "video/webm" } diff --git a/ext/fileinfo/tests/resources/test.tga b/ext/fileinfo/tests/resources/test.tga Binary files differnew file mode 100644 index 0000000000..e454f69ccc --- /dev/null +++ b/ext/fileinfo/tests/resources/test.tga |