From 6d87ab650f5fa130d6f517f433cde8f71e52a8bb Mon Sep 17 00:00:00 2001
From: Zoe Slattery <zoe@php.net>
Date: Tue, 17 Feb 2009 10:36:12 +0000
Subject: [PATCH] bug 46680

---
 .../file/file_put_contents_variation6.phpt    | 25 +++++++++----------
 1 file changed, 12 insertions(+), 13 deletions(-)

diff --git a/ext/standard/tests/file/file_put_contents_variation6.phpt b/ext/standard/tests/file/file_put_contents_variation6.phpt
index 4acd89b35b..aaea612b36 100644
--- a/ext/standard/tests/file/file_put_contents_variation6.phpt
+++ b/ext/standard/tests/file/file_put_contents_variation6.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]])
@@ -16,22 +14,20 @@ 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 = "filePutContentsVar6.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,12 +35,15 @@ rmdir($thisTestDir);
 
 
 function runtest() {
-   global $firstFile, $filename;
-   file_put_contents($filename, "File in include path", FILE_USE_INCLUDE_PATH);
-   file_put_contents($filename, ". This was appended", FILE_USE_INCLUDE_PATH | FILE_APPEND);  
-   $line = file_get_contents($firstFile);
+   global $filename;
+
+   //correct php53 behaviour is to ignore the FILE_USE_INCLUDE_PATH unless the file already 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);
+   file_put_contents($filename, (binary) ". This was appended", FILE_USE_INCLUDE_PATH | FILE_APPEND);  
+   $line = file_get_contents($filename);
    echo "$line\n";
-   unlink($firstFile); 
    unlink($filename); 
 }
 
-- 
2.50.1