Merge branch '2.7' into 2.8

* 2.7: use PHP_OS instead of php_uname('s')
2015-10-02 16:08:20 +02:00 · 2015-10-02 16:08:20 +02:00 · 1805649181
commit 1805649181
parent 112c66c944 fdce6ac104
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;
    }

    /**