From f9de6e62a9b2db15ce1f044e9dc160ed646d26d1 Mon Sep 17 00:00:00 2001
From: Zoe Slattery <zoe@php.net>
Date: Mon, 19 Jan 2009 16:16:48 +0000
Subject: [PATCH] fixing the test to expect PHP6 and PHP53 behaviour

---
 .../file/file_put_contents_variation5.phpt    | 44 +++++++------------
 1 file changed, 17 insertions(+), 27 deletions(-)

diff --git a/ext/standard/tests/file/file_put_contents_variation5.phpt b/ext/standard/tests/file/file_put_contents_variation5.phpt
index 4fc8ead5a3..bc6bf6afbd 100644
--- a/ext/standard/tests/file/file_put_contents_variation5.phpt
+++ b/ext/standard/tests/file/file_put_contents_variation5.phpt
@@ -2,28 +2,14 @@
 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]])
- * Description: Write/Create a file with contents data and return the number of bytes written 
- * Source code: ext/standard/file.c
- * 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 = "fileGetContentsVar7.dir";
+$thisTestDir = basename(__FILE__, ".php") . ".dir";
 mkdir($thisTestDir);
 chdir($thisTestDir);
 
-$filename = "readFileVar7.tmp";
+$filename = basename(__FILE__, ".php") . ".tmp"; 
 $scriptLocFile = dirname(__FILE__)."/".$filename;
 
 $newpath = "rubbish";
@@ -36,25 +22,29 @@ set_include_path(null);
 runtest();
 set_include_path(";;  ; ;c:\\rubbish");
 runtest();
-chdir("..");
+
+chdir(dirname(__FILE__));
 rmdir($thisTestDir);
 
 
 function runtest() {
    global $scriptLocFile, $filename;
-   file_put_contents($filename, "File in script location", FILE_USE_INCLUDE_PATH);
-   $line = file_get_contents($scriptLocFile);
-   echo "$line\n";
-   unlink($scriptLocFile);     
+   file_put_contents($filename, (binary) "File written in working directory", FILE_USE_INCLUDE_PATH);
+   if(file_exists($scriptLocFile)) {
+      echo "Fail - this is PHP52 behaviour\n";
+      unlink($scriptLocFile);
+   }else {
+      $line = file_get_contents($filename); 
+      echo "$line\n";
+      unlink($filename);     
+   }
 }
-
 ?>
 ===DONE===
 --EXPECT--
-*** Testing file_put_contents() : variation ***
-File in script location
-File in script location
-File in script location
-File in script location
+File written in working directory
+File written in working directory
+File written in working directory
+File written in working directory
 ===DONE===
 
-- 
2.50.1