Merge branch '2.3' into 2.7

* 2.3:
  use PHP_OS instead of php_uname('s')
This commit is contained in:
Fabien Potencier 2015-10-02 15:59:42 +02:00
commit fdce6ac104

View File

@ -125,7 +125,7 @@ class ConsoleOutput extends StreamOutput implements ConsoleOutputInterface
*/ */
private function isRunningOS400() private function isRunningOS400()
{ {
return 'OS400' === php_uname('s'); return 'OS400' === PHP_OS;
} }
/** /**