From 20b20bbdb32a872b25eab67b7f474d3724ebc054 Mon Sep 17 00:00:00 2001
From: Zoe Slattery <zoe@php.net>
Date: Thu, 22 Jan 2009 20:52:33 +0000
Subject: fixed test

---
 .../tests/file/file_put_contents_variation4.phpt   | 23 +++++++++-------------
 1 file changed, 9 insertions(+), 14 deletions(-)

(limited to 'ext')

diff --git a/ext/standard/tests/file/file_put_contents_variation4.phpt b/ext/standard/tests/file/file_put_contents_variation4.phpt
index dbf392105e..d919c4a08f 100644
--- a/ext/standard/tests/file/file_put_contents_variation4.phpt
+++ b/ext/standard/tests/file/file_put_contents_variation4.phpt
@@ -2,8 +2,6 @@
 Test file_put_contents() function : variation - include path testing
 --CREDITS--
 Dave Kelsey <d_kelsey@uk.ibm.com>
---XFAIL--
-Bug #46680
 --FILE--
 <?php
 /* Prototype  : int file_put_contents(string file, mixed data [, int flags [, resource context]])
@@ -12,26 +10,23 @@ Bug #46680
  * Alias to functions: 
  */
 
-echo "*** Testing file_put_contents() : variation ***\n";
 
 require_once('fopen_include_path.inc');
 
-// this doesn't create the include dirs in this directory
-// we change to this to ensure we are not part of the
-// include paths.
-$thisTestDir = "filePutContentsVar4.dir";
+$thisTestDir = basename(__FILE__, ".php") . ".dir"; 
 mkdir($thisTestDir);
 chdir($thisTestDir);
 
-$filename = "afile.txt";
-$firstFile = $dir1."/".$filename;
+$filename = basename(__FILE__, ".php") . ".tmp";
 
 $newpath = create_include_path();
 set_include_path($newpath);
 runtest();
+
 $newpath = generate_next_path();
 set_include_path($newpath);
 runtest();
+
 teardown_include_path();
 restore_include_path();
 chdir("..");
@@ -39,18 +34,18 @@ rmdir($thisTestDir);
 
 
 function runtest() {
-   global $firstFile, $filename;
-   file_put_contents($filename, "File in include path", FILE_USE_INCLUDE_PATH);
-   $line = file_get_contents($firstFile);
+   global $filename;
+   //correct php53 behaviour is to ingnore the FILE_USE_INCLUDE_PATH unless the file alread exists 
+   // in the include path. In this case it doesn't so the file should be written in the current dir.
+   file_put_contents($filename, (binary) "File in include path", FILE_USE_INCLUDE_PATH);
+   $line = file_get_contents($filename);
    echo "$line\n";
-   unlink($firstFile);
    unlink($filename);
 }
 
 ?>
 ===DONE===
 --EXPECT--
-*** Testing file_put_contents() : variation ***
 File in include path
 File in include path
 ===DONE===
-- 
cgit v1.2.1