adulau/cakephp2-php8
1
0
Fork 0
mirror of https://github.com/kamilwylegala/cakephp2-php8.git synced 2024-11-15 03:18:26 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

Fix failing tests.

Browse source 
You can't use finfo on files that don't exist.
This commit is contained in:
mark_story 2011-12-18 23:26:57 -05:00
parent f959fcefc4
commit 2d68e7da1e
2 changed files with 9 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
lib/Cake/Test/Case/Utility/FileTest.php
View file

@ -73,8 +73,12 @@ class FileTest extends CakeTestCase {
$result = $this->File->info(); $result = $this->File->info();
$expecting = array( $expecting = array(
'dirname' => dirname(__FILE__), 'basename' => basename(__FILE__), 'dirname' => dirname(__FILE__),
'extension' => 'php', 'filename' =>'FileTest', 'filesize' => filesize($file) 'basename' => basename(__FILE__),
'extension' => 'php',
'filename' =>'FileTest',
'filesize' => filesize($file),
'mime' => 'text/x-php'
); );
$this->assertEquals($expecting, $result); $this->assertEquals($expecting, $result);

3
lib/Cake/Utility/File.php
View file

@ -554,6 +554,9 @@ class File {
* @return false|string The mimetype of the file, or false if reading fails. * @return false|string The mimetype of the file, or false if reading fails.
*/ */
public function mime() { public function mime() {
if (!$this->exists()) {
return false;
}
if (function_exists('finfo_open')) { if (function_exists('finfo_open')) {
$finfo = finfo_open(FILEINFO_MIME); $finfo = finfo_open(FILEINFO_MIME);
list($type, $charset) = explode(';', finfo_file($finfo, $this->pwd())); list($type, $charset) = explode(';', finfo_file($finfo, $this->pwd()));