From bfe5b2fed455d691a23a3095abdb3be22fe8343c Mon Sep 17 00:00:00 2001 From: Zach Borboa Date: Wed, 1 Apr 2015 16:41:50 -0700 Subject: [PATCH] Fix #161: Replace deprecated mime_content_type() with finfo_file() when available --- tests/PHPCurlClass/Helper.php | 16 ++++++++++++++++ tests/PHPCurlClass/server.php | 4 ++-- 2 files changed, 18 insertions(+), 2 deletions(-) diff --git a/tests/PHPCurlClass/Helper.php b/tests/PHPCurlClass/Helper.php index bd8905c..ab38069 100644 --- a/tests/PHPCurlClass/Helper.php +++ b/tests/PHPCurlClass/Helper.php @@ -56,3 +56,19 @@ function get_png() file_put_contents($tmp_filename, create_png()); return $tmp_filename; } + +if (function_exists('finfo_open')) { + function mime_type($file_path) + { + $finfo = finfo_open(FILEINFO_MIME_TYPE); + $mime_type = finfo_file($finfo, $file_path); + finfo_close($finfo); + return $mime_type; + } +} else { + function mime_type($file_path) + { + $mime_type = mime_content_type($file_path); + return $mime_type; + } +} diff --git a/tests/PHPCurlClass/server.php b/tests/PHPCurlClass/server.php index 56efabe..b6572e6 100644 --- a/tests/PHPCurlClass/server.php +++ b/tests/PHPCurlClass/server.php @@ -105,12 +105,12 @@ if ($test == 'http_basic_auth') { echo $http_raw_post_data; exit; } elseif ($test === 'post_file_path_upload') { - echo mime_content_type($_FILES[$key]['tmp_name']); + echo Helper\mime_type($_FILES[$key]['tmp_name']); exit; } elseif ($test === 'put_file_handle') { $tmp_filename = tempnam('/tmp', 'php-curl-class.'); file_put_contents($tmp_filename, $http_raw_post_data); - echo mime_content_type($tmp_filename); + echo Helper\mime_type($tmp_filename); unlink($tmp_filename); exit; } elseif ($test === 'request_method') {