Fixing file deletion issue in windows

where unlink() cannot delete files that have open file handles. Fixes #376
cakephp · Aug 29, 2011 · f91c755 · f91c755
1 parent 0064317
commit f91c755
Show file tree

Hide file tree

Showing 2 changed files with 26 additions and 3 deletions.
diff --git a/cake/libs/file.php b/cake/libs/file.php
@@ -278,6 +278,10 @@ function close() {
  */
 	function delete() {
 		clearstatcache();
+		if (is_resource($this->handle)) {
+			fclose($this->handle);
+			$this->handle = null;
+		}
 		if ($this->exists()) {
 			return unlink($this->path);
 		}
@@ -495,4 +499,4 @@ function &Folder() {
 		return $this->Folder;
 	}
 }
-?>
+?>
diff --git a/cake/tests/cases/libs/file.test.php b/cake/tests/cases/libs/file.test.php
@@ -380,7 +380,7 @@ function testAppend() {
 	function testDelete() {
 		if (!$tmpFile = $this->_getTmpFile()) {
 			return false;
-		};
+		}
 
 		if (!file_exists($tmpFile)) {
 			touch($tmpFile);
@@ -395,6 +395,25 @@ function testDelete() {
 		$result = $TmpFile->delete();
 		$this->assertFalse($result);
 	}
+
+/**
+ * Windows has issues unlinking files if there are
+ * active filehandles open.
+ *
+ * @return void
+ */
+	function testDeleteAfterRead() {
+		if (!$tmpFile = $this->_getTmpFile()) {
+			return false;
+		}
+		if (!file_exists($tmpFile)) {
+			touch($tmpFile);
+		}
+		$file =& new File($tmpFile);
+		$file->read();
+		$this->assertTrue($file->delete());
+	}
+
 /**
  * getTmpFile method
  *
@@ -425,4 +444,4 @@ function _getTmpFile($paintSkip = true) {
 		return false;
 	}
 }
-?>
+?>