Convert getFile function to simpler PHP5 version

Add a unit test for getFile
drewm · Nov 20, 2008 · 51d6010 · 51d6010
1 parent 88694da
commit 51d6010
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 10 deletions.
diff --git a/class.phpmailer.php b/class.phpmailer.php
@@ -1935,18 +1935,10 @@ public function set ( $name, $value = '' ) {
    *
    * @access public
    * @param string $filename Parameter File Name
+   * @return string (or boolean false if it fails to read for any reason)
    */
   public function getFile($filename) {
-    $return = '';
-    if ($fp = fopen($filename, 'rb')) {
-      while (!feof($fp)) {
-        $return .= fread($fp, 1024);
-      }
-      fclose($fp);
-      return $return;
-    } else {
-      return false;
-    }
+      return @file_get_contents($filename);
   }
 
   /**

diff --git a/test/phpmailer_test.php b/test/phpmailer_test.php
@@ -565,6 +565,12 @@ function test_Translations() {
             $this->assert(false, 'No language files found!');
         }
     }
+
+    //Check that getFile works
+    function test_getFile() {
+        $a = $this->Mail->getFile('../class.phpmailer.php'); //Point at any non-empty file
+        $this->assert(($a !== false), 'GetFile failed to read a file.');
+    }
 }
 /**
  * Create and run test instance.