Skip to content

Commit bfe5b2f

Browse files
committed
Fix php-curl-class#161: Replace deprecated mime_content_type() with finfo_file() when available
1 parent 343252c commit bfe5b2f

File tree

2 files changed

+18
-2
lines changed

2 files changed

+18
-2
lines changed

tests/PHPCurlClass/Helper.php

+16
Original file line numberDiff line numberDiff line change
@@ -56,3 +56,19 @@ function get_png()
5656
file_put_contents($tmp_filename, create_png());
5757
return $tmp_filename;
5858
}
59+
60+
if (function_exists('finfo_open')) {
61+
function mime_type($file_path)
62+
{
63+
$finfo = finfo_open(FILEINFO_MIME_TYPE);
64+
$mime_type = finfo_file($finfo, $file_path);
65+
finfo_close($finfo);
66+
return $mime_type;
67+
}
68+
} else {
69+
function mime_type($file_path)
70+
{
71+
$mime_type = mime_content_type($file_path);
72+
return $mime_type;
73+
}
74+
}

tests/PHPCurlClass/server.php

+2-2
Original file line numberDiff line numberDiff line change
@@ -105,12 +105,12 @@
105105
echo $http_raw_post_data;
106106
exit;
107107
} elseif ($test === 'post_file_path_upload') {
108-
echo mime_content_type($_FILES[$key]['tmp_name']);
108+
echo Helper\mime_type($_FILES[$key]['tmp_name']);
109109
exit;
110110
} elseif ($test === 'put_file_handle') {
111111
$tmp_filename = tempnam('/tmp', 'php-curl-class.');
112112
file_put_contents($tmp_filename, $http_raw_post_data);
113-
echo mime_content_type($tmp_filename);
113+
echo Helper\mime_type($tmp_filename);
114114
unlink($tmp_filename);
115115
exit;
116116
} elseif ($test === 'request_method') {

0 commit comments

Comments
 (0)