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, 0 insertions, 40 deletions

diff --git a/core/tests/File_Helper_Test.php b/core/tests/File_Helper_Test.php
deleted file mode 100644
index dd71aabb..00000000
--- a/core/tests/File_Helper_Test.php
+++ /dev/null
@@ -1,40 +0,0 @@
-<?php defined("SYSPATH") or die("No direct script access.");
-/**
- * Gallery - a web based photo album viewer and editor
- * Copyright (C) 2000-2008 Bharat Mediratta
- *
- * This program is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; either version 2 of the License, or (at
- * your option) any later version.
- *
- * This program is distributed in the hope that it will be useful, but
- * WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
- * General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * 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");
-  }
-
-  public function remove_album_test() {
-    $dirname = (VARPATH . "albums/testdir");
-    mkdir($dirname, 0777, true);
-
-    $filename = tempnam($dirname, "file");
-    touch($filename);
-
-    file::unlink($dirname);
-    $this->assert_boolean(!file_exists($filename), "File not deleted");
-    $this->assert_boolean(!file_exists($dirname), "Directory not deleted");
-  }
-}