php/yii2
1
0
Fork 0
mirror of https://github.com/yiisoft/yii2.git synced 2025-11-02 04:37:42 +08:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #19992 from rob006/mimeTypes-revert

Browse Source 
Revert changes in `mimeTypes.php` from 4a1f2c6b9bc90427e91da73f5e8c8fa33d3c53c1
This commit is contained in:
Bizley
2023-10-06 14:34:24 +02:00
committed by GitHub
parent 290e03cddc 9f51fe3b4b
commit 53f16192d2
2 changed files with 3 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
framework/CHANGELOG.md
View File

@ -4,13 +4,12 @@ Yii Framework 2 Change Log
2.0.50 under development 2.0.50 under development
------------------------ ------------------------
- no changes in this release. - Bug #19925: Improved PHP version check when handling MIME types (schmunk42)
2.0.49.1 October 05, 2023 2.0.49.1 October 05, 2023
------------------------- -------------------------
- Bug #19925: Improved PHP version check when handling MIME types (schmunk42)
- Bug #19940: File Log writer without newline (terabytesoftw) - Bug #19940: File Log writer without newline (terabytesoftw)
- Bug #19950: Fix `Query::groupBy(null)` causes error for PHP 8.1: `trim(): Passing null to parameter #1 ($string) of type string is deprecated` (uaoleg) - Bug #19950: Fix `Query::groupBy(null)` causes error for PHP 8.1: `trim(): Passing null to parameter #1 ($string) of type string is deprecated` (uaoleg)
- Bug #19951: Removed unneeded MIME file tests (schmunk42) - Bug #19951: Removed unneeded MIME file tests (schmunk42)

3
framework/helpers/mimeTypes.php
View File

@ -1003,7 +1003,8 @@ $mimeTypes = [
'zmm' => 'application/vnd.handheld-entertainment+xml', 'zmm' => 'application/vnd.handheld-entertainment+xml',
]; ];
if (PHP_VERSION_ID >= 80100) { # fix for bundled libmagic bug, see also https://github.com/yiisoft/yii2/issues/19925
if ((PHP_VERSION_ID >= 80100 && PHP_VERSION_ID < 80122) || (PHP_VERSION_ID >= 80200 && PHP_VERSION_ID < 80209)) {
$mimeTypes = array_replace($mimeTypes, array('xz' => 'application/octet-stream')); $mimeTypes = array_replace($mimeTypes, array('xz' => 'application/octet-stream'));
} }