added PHP version check, fixed #19925 (#19936)

* added PHP version check, fixed #19925 * added CHANGELOG line * fixed typo * fixed typo --------- Co-authored-by: Alexander Makarov <[email protected]> Co-authored-by: Bizley <[email protected]>
yiisoft · Sep 4, 2023 · e8c4a7e · e8c4a7e
1 parent 671fbef
commit e8c4a7e
Show file tree

Hide file tree

Showing 4 changed files with 7 additions and 3 deletions.
diff --git a/framework/CHANGELOG.md b/framework/CHANGELOG.md
@@ -4,6 +4,7 @@ Yii Framework 2 Change Log
 2.0.50 under development
 ------------------------
 
+- Bug #19925: Improved PHP version check when handling MIME types (schmunk42)
 - Bug #19940: File Log writer without newline (terabytesoftw)
 
 

diff --git a/framework/helpers/mimeTypes.php b/framework/helpers/mimeTypes.php
@@ -1003,7 +1003,8 @@
     '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'));
 }
 

diff --git a/tests/framework/helpers/MimeTest.php b/tests/framework/helpers/MimeTest.php
@@ -1031,7 +1031,8 @@ public function testMimeTypes()
                 '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)) {
             $coreMimeTypes = array_replace($coreMimeTypes, array('xz' => 'application/octet-stream'));
         }
 

diff --git a/tests/framework/validators/FileValidatorTest.php b/tests/framework/validators/FileValidatorTest.php
@@ -546,7 +546,8 @@ public function validMimeTypes()
             ['test.tar.xz', 'application/x-xz', 'tar.xz'],
         ]);
 
-        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)) {
             $v81_zx = ['test.tar.xz', 'application/octet-stream', 'tar.xz'];
             array_pop($validMimeTypes);
             $validMimeTypes[] = $v81_zx;