diff options
| -rw-r--r-- | modules/gallery/helpers/system.php | 17 | ||||
| -rw-r--r-- | modules/gallery/tests/System_Helper_Test.php | 30 |
2 files changed, 0 insertions, 47 deletions
diff --git a/modules/gallery/helpers/system.php b/modules/gallery/helpers/system.php index d2e9c125..4110b4ed 100644 --- a/modules/gallery/helpers/system.php +++ b/modules/gallery/helpers/system.php @@ -47,22 +47,6 @@ class system_Core { * It allows the caller to specify a prefix and an extension. * It always places the file in TMPPATH. */ -<<<<<<< HEAD - static function temp_filename($prefix = "", $extension = "") { - return self::_tempnam(TMPPATH, $prefix, ".$extension", "tempnam"); - } - - /** - * This helper provides a dependency-injected implementation of tempnam. - */ - static function _tempnam($dir, $prefix, $postfix, $builtin) { - do { - $basename = call_user_func($builtin, $dir, $prefix); - if (!$basename) { - return false; - } - $filename = $basename . $postfix; -======= static function temp_filename($prefix="", $extension="") { do { $basename = tempnam(TMPPATH, $prefix); @@ -70,7 +54,6 @@ class system_Core { return false; } $filename = "$basename.$extension"; ->>>>>>> db734130c5fe10408040b2326b28b102f3131271 $success = !file_exists($filename) && @rename($basename, $filename); if (!$success) { @unlink($basename); diff --git a/modules/gallery/tests/System_Helper_Test.php b/modules/gallery/tests/System_Helper_Test.php index 4b395799..3d56c516 100644 --- a/modules/gallery/tests/System_Helper_Test.php +++ b/modules/gallery/tests/System_Helper_Test.php @@ -18,40 +18,10 @@ * Foundation, Inc., 51 Franklin Street - Fifth Floor, Boston, MA 02110-1301, USA. */ class System_Helper_Test extends Gallery_Unit_Test_Case { -<<<<<<< HEAD - public function temp_filename_random_test() { -======= public function temp_filename_test() { ->>>>>>> db734130c5fe10408040b2326b28b102f3131271 $filename = system::temp_filename("file", "ext"); $this->assert_true(file_exists($filename), "File not created"); unlink($filename); $this->assert_pattern($filename, "|/file.*\\.ext$|"); } -<<<<<<< HEAD - - public function tempnam_collision_test() { - require_once('Mock_Built_In.php'); - $existing = TMPPATH . "/file1.ext"; - $available = TMPPATH . "/file2.ext"; - touch($existing); - $filename = system::_tempnam(TMPPATH, "file", ".ext", - array(new Mock_Built_In("1", "2"), "_tempnam")); - unlink($existing); - $this->assert_true(file_exists($filename), "File not created"); - unlink($filename); - $this->assert_equal($available, $filename, "Incorrect filename created"); - } - - public function tempnam_abort_test() { - require_once('Mock_Built_In.php'); - $filename = system::_tempnam(TMPPATH, "file", ".ext", - array(new Mock_Built_In(), "_tempnam")); - if ($filename) { - @unlink($filename); - } - $this->assert_false($filename, "Operation not aborted"); - } -======= ->>>>>>> db734130c5fe10408040b2326b28b102f3131271 } |