Fix failing tests.

You can't use finfo on files that don't exist.
cakephp · Dec 19, 2011 · 2d68e7d · 2d68e7d
1 parent f959fce
commit 2d68e7d
Show file tree

Hide file tree

Showing 2 changed files with 9 additions and 2 deletions.
diff --git a/lib/Cake/Test/Case/Utility/FileTest.php b/lib/Cake/Test/Case/Utility/FileTest.php
@@ -73,8 +73,12 @@ public function testBasic() {
 
 		$result = $this->File->info();
 		$expecting = array(
-			'dirname' => dirname(__FILE__), 'basename' => basename(__FILE__),
-			'extension' => 'php', 'filename' =>'FileTest', 'filesize' => filesize($file)
+			'dirname' => dirname(__FILE__),
+			'basename' => basename(__FILE__),
+			'extension' => 'php',
+			'filename' =>'FileTest',
+			'filesize' => filesize($file),
+			'mime' => 'text/x-php'
 		);
 		$this->assertEquals($expecting, $result);
 

diff --git a/lib/Cake/Utility/File.php b/lib/Cake/Utility/File.php
@@ -554,6 +554,9 @@ public function copy($dest, $overwrite = true) {
  * @return false|string The mimetype of the file, or false if reading fails.
  */
 	public function mime() {
+		if (!$this->exists()) {
+			return false;
+		}
 		if (function_exists('finfo_open')) {
 			$finfo = finfo_open(FILEINFO_MIME);
 			list($type, $charset) = explode(';', finfo_file($finfo, $this->pwd()));