Merge pull request laravel#558 from ProgerXP/patch-locks-dev

taylorotwell · taylorotwell · commit 3670423da6e7 · 2012-04-19T06:23:42.000-07:00
Fixing "Cannot remove ...: Permission denied" in File and bundle:: task
diff --git a/laravel/cli/tasks/bundle/providers/provider.php b/laravel/cli/tasks/bundle/providers/provider.php
@@ -54,6 +54,7 @@ protected function zipball($url, $bundle, $path)
 
 		File::rmdir($work.'zip');
 
+		$zip->close();
 		@unlink($target);
 	}
 
diff --git a/laravel/file.php b/laravel/file.php
@@ -94,7 +94,7 @@ public static function copy($path, $target)
 
 	/**
 	 * Extract the file extension from a file path.
-	 * 
+	 *
 	 * @param  string  $path
 	 * @return string
 	 */
@@ -273,8 +273,9 @@ public static function cpdir($source, $destination, $delete = false, $options =
 			}
 		}
 
-		if ($delete) rmdir($source);
-		
+		unset($items);
+		if ($delete) @rmdir($source);
+
 		return true;
 	}
 
@@ -306,6 +307,7 @@ public static function rmdir($directory, $preserve = false)
 			}
 		}
 
+		unset($items);
 		if ( ! $preserve) @rmdir($directory);
 	}
 

Original file line number	Diff line number	Diff line change
`@@ -54,6 +54,7 @@ protected function zipball($url, $bundle, $path)`
`54`	`54`
`55`	`55`	`File::rmdir($work.'zip');`
`56`	`56`
	`57`	`+ $zip->close();`
`57`	`58`	`@unlink($target);`
`58`	`59`	`}`
`59`	`60`
Original file line number	Diff line number	Diff line change
`@@ -94,7 +94,7 @@ public static function copy($path, $target)`
`94`	`94`
`95`	`95`	`/**`
`96`	`96`	`* Extract the file extension from a file path.`
`97`		`- *`
	`97`	`+ *`
`98`	`98`	`* @param string $path`
`99`	`99`	`* @return string`
`100`	`100`	`*/`
`@@ -273,8 +273,9 @@ public static function cpdir($source, $destination, $delete = false, $options =`
`273`	`273`	`}`
`274`	`274`	`}`
`275`	`275`
`276`		`- if ($delete) rmdir($source);`
`277`		`-`
	`276`	`+ unset($items);`
	`277`	`+ if ($delete) @rmdir($source);`
	`278`	`+`
`278`	`279`	`return true;`
`279`	`280`	`}`
`280`	`281`
`@@ -306,6 +307,7 @@ public static function rmdir($directory, $preserve = false)`
`306`	`307`	`}`
`307`	`308`	`}`
`308`	`309`
	`310`	`+ unset($items);`
`309`	`311`	`if ( ! $preserve) @rmdir($directory);`
`310`	`312`	`}`
`311`	`313`