Merge branch '2.7' into 2.8

fabpot · fabpot · commit 18056491819c · 2015-10-02T16:08:20.000+02:00
* 2.7:
  use PHP_OS instead of php_uname('s')
diff --git a/src/Symfony/Component/Console/Output/ConsoleOutput.php b/src/Symfony/Component/Console/Output/ConsoleOutput.php
@@ -125,7 +125,7 @@ protected function hasStderrSupport()
      */
     private function isRunningOS400()
     {
-        return 'OS400' === php_uname('s');
+        return 'OS400' === PHP_OS;
     }
 
     /**

Original file line number	Diff line number	Diff line change
`@@ -125,7 +125,7 @@ protected function hasStderrSupport()`
`125`	`125`	`*/`
`126`	`126`	`private function isRunningOS400()`
`127`	`127`	`{`
`128`		`- return 'OS400' === php_uname('s');`
	`128`	`+ return 'OS400' === PHP_OS;`
`129`	`129`	`}`
`130`	`130`
`131`	`131`	`/**`