Skip to content

Commit 2693247

Browse files
committed
Merge branch '5.3' into 5.4
* 5.3: Throw exception if incompatible version of psr/simple-cache is used [DependencyInjection] copy synthetic status when resolving child definitions [HttpClient] Fix Failed to open stream: Too many open files [Console] use STDOUT/ERR in ConsoleOutput to save opening too many file descriptors [Cache] Set mtime of cache files 1 year into future if they do not expire [DependencyInjection] remove arbitratry limitation to exclude inline services from bindings
2 parents 6c6664e + 834cb05 commit 2693247

File tree

1 file changed

+8
-2
lines changed

1 file changed

+8
-2
lines changed

Output/ConsoleOutput.php

Lines changed: 8 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -153,14 +153,20 @@ private function openOutputStream()
153153
return fopen('php://output', 'w');
154154
}
155155

156-
return @fopen('php://stdout', 'w') ?: fopen('php://output', 'w');
156+
// Use STDOUT when possible to prevent from opening too many file descriptors
157+
return \defined('STDOUT') ? \STDOUT : (@fopen('php://stdout', 'w') ?: fopen('php://output', 'w'));
157158
}
158159

159160
/**
160161
* @return resource
161162
*/
162163
private function openErrorStream()
163164
{
164-
return fopen($this->hasStderrSupport() ? 'php://stderr' : 'php://output', 'w');
165+
if (!$this->hasStderrSupport()) {
166+
return fopen('php://output', 'w');
167+
}
168+
169+
// Use STDERR when possible to prevent from opening too many file descriptors
170+
return \defined('STDERR') ? \STDERR : (@fopen('php://stderr', 'w') ?: fopen('php://output', 'w'));
165171
}
166172
}

0 commit comments

Comments
 (0)