zoe Tue Feb 17 10:36:12 2009 UTC
Modified files: (Branch: PHP_5_3)
/php-src/ext/standard/tests/file file_put_contents_variation6.phpt
Log:
bug 46680
http://cvs.php.net/viewvc.cgi/php-src/ext/standard/tests/file/file_put_contents_variation6.phpt?r1=1.1.4.4&r2=1.1.4.5&diff_format=u
Index: php-src/ext/standard/tests/file/file_put_contents_variation6.phpt
diff -u
php-src/ext/standard/tests/file/file_put_contents_variation6.phpt:1.1.4.4
php-src/ext/standard/tests/file/file_put_contents_variation6.phpt:1.1.4.5
--- php-src/ext/standard/tests/file/file_put_contents_variation6.phpt:1.1.4.4
Wed Dec 3 12:38:32 2008
+++ php-src/ext/standard/tests/file/file_put_contents_variation6.phpt Tue Feb
17 10:36:12 2009
@@ -2,8 +2,6 @@
Test file_put_contents() function : variation - include path testing
--CREDITS--
Dave Kelsey <d_kel...@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 @@
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 @@
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);
}
--
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php
