Skip to content

Conversation

jdoubleu
Copy link

@jdoubleu jdoubleu commented Jun 28, 2019

@weltling
Copy link
Contributor

@jdoubleu looks good, thanks for the PR! Usually ext/fileinfo/tests/magic* should be updated as well, the text version for the tests, but probably that's not required in this case as the test doesn't use it. Does the test pass with upper PHP branches? The test only, as no data update should be needed there. I'll need to check that before merging.

Thanks.

Due to a bug in the underlying libmagic 5.31, .tga images returned mime type "image/x-tgaimage/x-tga".
@jdoubleu
Copy link
Author

Yes, I totally agree. For the sake of completeness, I updated the ext/fileinfo/tests/magic* files. However, they did not match the text version of all magicdata in FILE5_31 after the magicdata.patch was applied. So I only added changes for this PR to them.

When merging into PHP7.3 or later the magicdata.patch patch can be removed, because PHP7.3 uses FILE5_33, which already includes this fix. However the tests can still be kept.

@weltling
Copy link
Contributor

Merged as 855bbc8. The test magic update was not really necessary, but thanks in any case!

@weltling weltling closed this Jun 29, 2019
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

2 participants