Merge branch '2.3' into 2.7

* 2.3: use PHP_OS instead of php_uname('s')
2015-10-02 15:59:42 +02:00 · 2015-10-02 15:59:42 +02:00 · fdce6ac104
commit fdce6ac104
parent 34c8a7c51c 8879a5fa9a
1 changed files with 1 additions and 1 deletions
--- a/src/Symfony/Component/Console/Output/ConsoleOutput.php
+++ b/src/Symfony/Component/Console/Output/ConsoleOutput.php
@ -125,7 +125,7 @@ class ConsoleOutput extends StreamOutput implements ConsoleOutputInterface
     */
    private function isRunningOS400()
    {
-        return 'OS400' === php_uname('s');
+        return 'OS400' === PHP_OS;
    }

    /**