php/archived-php-src
1
0
Fork 0
mirror of https://github.com/php/php-src.git synced 2026-04-28 02:33:17 +02:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'PHP-5.3' into PHP-5.4

Browse Source 
* PHP-5.3:
  Fix bug #61460 popen_close_error-win32 expected output is wrong

Conflicts:
	ext/standard/tests/file/popen_pclose_error-win32.phpt
This commit is contained in:
Anatoliy Belsky
2012-04-03 14:22:59 +02:00
parent 2a8866ba5e 438536e45e
commit 827c446b62
1 changed files with 3 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files
ext/standard/tests/file/popen_pclose_error-win32.phpt
+3 -2
View File
@@ -17,7 +17,7 @@ if (PHP_DEBUG) die("skip Not Valid for debug builds");
* Description: Closes process file pointer.
*/
$file_path = dirname(__FILE__);
echo "*** Testing for error conditions ***\n";
echo "*** Testing for error conditions ***" . PHP_EOL;
var_dump( popen() ); // Zero Arguments
var_dump( popen("abc.txt") ); // Single Argument
var_dump( popen("abc.txt", "rw") ); // Invalid mode Argument
@@ -26,7 +26,7 @@ $file_handle = fopen($file_path."/popen.tmp", "w");
var_dump( pclose($file_handle, $file_handle) );
pclose($file_handle);
var_dump( pclose(1) );
echo "\n--- Done ---";
echo PHP_EOL . PHP_EOL . "--- Done ---";
?>
--CLEAN--
<?php
@@ -54,5 +54,6 @@ bool(false)
Warning: pclose() expects parameter 1 to be resource, integer given in %s on line %d
bool(false)
--- Done ---'abc.txt' is not recognized as an internal or external command,
operable program or batch file.