Rename file::unlink() to dir::unlink(). This creates an API that is

clearer about its actions, otherwise we may accidentally blow away an
entire hierarchy when we think we're deleting a single file (there's a
reason why rm won't let you delete dirs that aren't empty!)

Name it "dir" instead of "directory" because apparently "directory" is
already reserved.

Move the delete call out of Items_Controller and into the model.  The
model is responsible for keeping state integrity, not the controller.

1 files changed, 2 insertions, 10 deletions

diff --git a/core/tests/File_Helper_Test.php b/core/tests/Dir_Helper_Test.php
index dd71aabb..69d891db 100644
--- a/core/tests/File_Helper_Test.php
+++ b/core/tests/Dir_Helper_Test.php
@@ -17,15 +17,7 @@
  * along with this program; if not, write to the Free Software
  * Foundation, Inc., 51 Franklin Street - Fifth Floor, Boston, MA  02110-1301, USA.
  */
-class File_Helper_Test extends Unit_Test_Case {
-  public function remove_file_test() {
-    $filename = tempnam(VARPATH . "albums", "file");
-    touch($filename);
-
-    file::unlink($filename);
-    $this->assert_boolean(!file_exists($filename), "File not deleted");
-  }
-
+class Directory_Helper_Test extends Unit_Test_Case {
   public function remove_album_test() {
     $dirname = (VARPATH . "albums/testdir");
     mkdir($dirname, 0777, true);
@@ -33,7 +25,7 @@ class File_Helper_Test extends Unit_Test_Case {
     $filename = tempnam($dirname, "file");
     touch($filename);
 
-    file::unlink($dirname);
+    dir::unlink($dirname);
     $this->assert_boolean(!file_exists($filename), "File not deleted");
     $this->assert_boolean(!file_exists($dirname), "Directory not deleted");
   }