Remove unused binary_pipes option

Option binary_pipes was added in PHP 6 which was then refactored
and this option was removed.

diff --git a/ext/standard/tests/file/bug60120.phpt b/ext/standard/tests/file/bug60120.phpt
index ec5f7b3cedb17cb94d6ae4bf90bb5233bd0895be..150333aa6265cbe3dd71ac968b0fa1b0937ab28e 100644 (file)
--- a/ext/standard/tests/file/bug60120.phpt
+++ b/ext/standard/tests/file/bug60120.phpt
@@ -24,7 +24,7 @@ $descriptors = array(array('pipe', 'r'), array('pipe', 'w'), array('pipe', 'w'))
 $stdin = str_repeat('*', 1024 * 16) . '!';
 $stdin = str_repeat('*', 2049 );
 
-$options = array_merge(array('suppress_errors' => true, 'binary_pipes' => true, 'bypass_shell' => false));
+$options = array_merge(array('suppress_errors' => true, 'bypass_shell' => false));
 $process = proc_open($cmd, $descriptors, $pipes, getcwd(), array(), $options);
 
 foreach ($pipes as $pipe) {

diff --git a/ext/standard/tests/file/proc_open01.phpt b/ext/standard/tests/file/proc_open01.phpt
index 4e619a3286d57ea266baeb3577f8e03c57c6fb32..28e68a24779f33d97f3b5ea49a82e2bc074a1faf 100644 (file)
--- a/ext/standard/tests/file/proc_open01.phpt
+++ b/ext/standard/tests/file/proc_open01.phpt
@@ -11,7 +11,7 @@ if ($php === false) {
 $proc = proc_open(
        "$php -n",
        array(0 => array('pipe', 'r'), 1 => array('pipe', 'w')),
-       $pipes, getcwd(), array(), array('binary_pipes' => true)
+       $pipes, getcwd(), array(), array()
 );
 if ($proc === false) {
        print "something went wrong.\n";

diff --git a/ext/standard/tests/streams/bug46024.phpt b/ext/standard/tests/streams/bug46024.phpt
index fdfd03ee2ef977bcc3f85b4dbede9d718347df96..8aae912809dd4071643dff3f1776f9b1e910b5ee 100644 (file)
--- a/ext/standard/tests/streams/bug46024.phpt
+++ b/ext/standard/tests/streams/bug46024.phpt
@@ -9,7 +9,7 @@ $pipes = array();
 $proc = proc_open(
        "$php -n -i"
        ,array(0 => array('pipe', 'r'), 1 => array('pipe', 'w'))
-       ,$pipes, dirname(__FILE__), array(), array('binary_pipes' => true)
+       ,$pipes, dirname(__FILE__), array(), array()
 );
 var_dump($proc);
 if (!$proc) {

diff --git a/ext/standard/tests/streams/bug64770.phpt b/ext/standard/tests/streams/bug64770.phpt
index 785c4237a13d51c873152f70ec05615626a58835..24817e620fd3ac9141db3977b5ed0e352d4de4dd 100644 (file)
--- a/ext/standard/tests/streams/bug64770.phpt
+++ b/ext/standard/tests/streams/bug64770.phpt
@@ -9,7 +9,7 @@ $descs = array(
        2 => array('pipe', 'w'), // strerr
 );
 
-$other_opts = array('suppress_errors' => false, 'binary_pipes' => true);
+$other_opts = array('suppress_errors' => false);
 
 $cmd = (substr(PHP_OS, 0, 3) == 'WIN') ? 'dir' : 'ls';
 $p = proc_open($cmd, $descs, $pipes, '.', NULL, $other_opts);

diff --git a/ext/standard/tests/streams/proc_open_bug60120.phpt b/ext/standard/tests/streams/proc_open_bug60120.phpt
index 4587f0718e34cde5f430b20d2542d8a7381e8bb9..08cc7a2147a8a184585cc372eac2f4b308335378 100644 (file)
--- a/ext/standard/tests/streams/proc_open_bug60120.phpt
+++ b/ext/standard/tests/streams/proc_open_bug60120.phpt
@@ -13,7 +13,7 @@ $descriptors = array(array('pipe', 'r'), array('pipe', 'w'), array('pipe', 'w'))
 $stdin = str_repeat('*', 1024 * 16) . '!';
 $stdin = str_repeat('*', 2049 );
 
-$options = array_merge(array('suppress_errors' => true, 'binary_pipes' => true, 'bypass_shell' => false));
+$options = array_merge(array('suppress_errors' => true, 'bypass_shell' => false));
 $process = proc_open($cmd, $descriptors, $pipes, getcwd(), array(), $options);
 
 foreach ($pipes as $pipe) {

diff --git a/ext/standard/tests/streams/proc_open_bug64438.phpt b/ext/standard/tests/streams/proc_open_bug64438.phpt
index 747f1171f329f87e8dcf356cc05da63300ea8b63..ac7c72036d95b4ed29d6559095aa2c6d357932ee 100644 (file)
--- a/ext/standard/tests/streams/proc_open_bug64438.phpt
+++ b/ext/standard/tests/streams/proc_open_bug64438.phpt
@@ -13,7 +13,7 @@ if (substr(PHP_OS, 0, 3) == 'WIN') {
 $descriptors = array(array('pipe', 'r'), array('pipe', 'w'), array('pipe', 'w'));
 $stdin = str_repeat('*', 4097);
 
-$options = array_merge(array('suppress_errors' => true, 'binary_pipes' => true, 'bypass_shell' => false));
+$options = array_merge(array('suppress_errors' => true, 'bypass_shell' => false));
 $process = proc_open($cmd, $descriptors, $pipes, getcwd(), array(), $options);
 
 foreach ($pipes as $pipe) {

diff --git a/run-tests.php b/run-tests.php
index 82918c002fd8e57043bae5c10c4d6466399de6f2..59f878dc39fa8884576ba652bbf4cd4feee1e262 100644 (file)
--- a/run-tests.php
+++ b/run-tests.php
@@ -1120,7 +1120,7 @@ function system_with_timeout($commandline, $env = null, $stdin = null, $captureS
        if ($captureStdErr) {
                $descriptorspec[2] = array('pipe', 'w');
        }
-       $proc = proc_open($commandline, $descriptorspec, $pipes, TEST_PHP_SRCDIR, $bin_env, array('suppress_errors' => true, 'binary_pipes' => true));
+       $proc = proc_open($commandline, $descriptorspec, $pipes, TEST_PHP_SRCDIR, $bin_env, array('suppress_errors' => true));
 
        if (!$proc) {
                return false;