summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorPeter Kokot <peterkokot@gmail.com>2018-05-27 07:40:09 +0200
committerNikita Popov <nikita.ppv@gmail.com>2018-05-28 22:14:37 +0200
commitaf01ef874170900019b5173d443d5ccb9d589f0a (patch)
treeb418332fa6fde08c71c6025936c762ecb7e046b1
parentc70468b8d3c1d6711da0db84cba30d87d2482e5c (diff)
downloadphp-git-af01ef874170900019b5173d443d5ccb9d589f0a.tar.gz
Remove unused binary_pipes option
Option binary_pipes was added in PHP 6 which was then refactored and this option was removed.
-rw-r--r--ext/standard/tests/file/bug60120.phpt2
-rw-r--r--ext/standard/tests/file/proc_open01.phpt2
-rw-r--r--ext/standard/tests/streams/bug46024.phpt2
-rw-r--r--ext/standard/tests/streams/bug64770.phpt2
-rw-r--r--ext/standard/tests/streams/proc_open_bug60120.phpt2
-rw-r--r--ext/standard/tests/streams/proc_open_bug64438.phpt2
-rw-r--r--run-tests.php2
7 files changed, 7 insertions, 7 deletions
diff --git a/ext/standard/tests/file/bug60120.phpt b/ext/standard/tests/file/bug60120.phpt
index ec5f7b3ced..150333aa62 100644
--- 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 4e619a3286..28e68a2477 100644
--- 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 fdfd03ee2e..8aae912809 100644
--- 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 785c4237a1..24817e620f 100644
--- 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 4587f0718e..08cc7a2147 100644
--- 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 747f1171f3..ac7c72036d 100644
--- 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 82918c002f..59f878dc39 100644
--- 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;