BUG: Refs #212. Improved error handling in recursiveRemoveDirectory, and tests

Author: Michael Grauer

library/KWUtils.php

@@ -284,6 +284,10 @@ public static function formatAppName($app_name)
    */
   public static function recursiveRemoveDirectory($directorypath)
     {
+    if(empty($directorypath) || !is_dir($directorypath))
+      {
+      return false;
+      }
     // if the path has a slash at the end, remove it here
     $directorypath = rtrim($directorypath, '/');
     // open the directory
@@ -324,5 +328,4 @@ public static function recursiveRemoveDirectory($directorypath)
     return true;
     }
 
-
 }

tests/library/KWUtilsTest.php

@@ -156,6 +156,10 @@ public function testPrepareExecCommand()
   /** tests recursiveRemoveDirectory function */
   public function testRecursiveRemoveDirectory()
     {
+    // test some basic exception handling
+    $this->assertFalse(KWUtils::recursiveRemoveDirectory(''));
+    $this->assertFalse(KWUtils::recursiveRemoveDirectory('thisstringisunlikelytobeadirectory'));
+
     // create a two-level directory
     $testParentDir = $this->getTempDirectory() . '/KWUtilsParentDir';
     mkdir($testParentDir);