10000 Merge branch '2.7' into 2.8 · symfony/symfony@1805649 · GitHub
[go: up one dir, main page]

Skip to content

Commit 1805649

Browse files
committed
Merge branch '2.7' into 2.8
* 2.7: use PHP_OS instead of php_uname('s')
2 parents 112c66c + fdce6ac commit 1805649

File tree

1 file changed

+1
-1
lines changed

1 file changed

+1
-1
lines changed

src/Symfony/Component/Console/Output/ConsoleOutput.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -125,7 +125,7 @@ protected function hasStderrSupport()
125125
*/
126126
private function isRunningOS400()
127127
{
128-
return 'OS400' === php_uname('s');
128+
return 'OS400' === PHP_OS;
129129
}
130130

131131
/**

0 commit comments

Comments
 (0)
0