Skip to content

Commit 2d68e7d

Browse files
committed
Fix failing tests.
You can't use finfo on files that don't exist.
1 parent f959fce commit 2d68e7d

File tree

2 files changed

+9
-2
lines changed

2 files changed

+9
-2
lines changed

lib/Cake/Test/Case/Utility/FileTest.php

Lines changed: 6 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -73,8 +73,12 @@ public function testBasic() {
7373

7474
$result = $this->File->info();
7575
$expecting = array(
76-
'dirname' => dirname(__FILE__), 'basename' => basename(__FILE__),
77-
'extension' => 'php', 'filename' =>'FileTest', 'filesize' => filesize($file)
76+
'dirname' => dirname(__FILE__),
77+
'basename' => basename(__FILE__),
78+
'extension' => 'php',
79+
'filename' =>'FileTest',
80+
'filesize' => filesize($file),
81+
'mime' => 'text/x-php'
7882
);
7983
$this->assertEquals($expecting, $result);
8084

lib/Cake/Utility/File.php

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -554,6 +554,9 @@ public function copy($dest, $overwrite = true) {
554554
* @return false|string The mimetype of the file, or false if reading fails.
555555
*/
556556
public function mime() {
557+
if (!$this->exists()) {
558+
return false;
559+
}
557560
if (function_exists('finfo_open')) {
558561
$finfo = finfo_open(FILEINFO_MIME);
559562
list($type, $charset) = explode(';', finfo_file($finfo, $this->pwd()));

0 commit comments

Comments
 (0)