Merge branch '2.6' into 2.7

fabpot · fabpot · commit 1ee2f61926ea · 2014-12-30T14:34:24.000+01:00
* 2.6:
  [Form] Remove a redundant test.
  use value of DIRECTORY_SEPARATOR to detect Windows
diff --git a/Tests/KernelTest.php b/Tests/KernelTest.php
@@ -271,7 +271,7 @@ public function doStuff()
 
         // Heredocs are preserved, making the output mixing Unix and Windows line
         // endings, switching to "\n" everywhere on Windows to avoid failure.
-        if (defined('PHP_WINDOWS_VERSION_MAJOR')) {
+        if ('\\' === DIRECTORY_SEPARATOR) {
             $expected = str_replace("\r\n", "\n", $expected);
             $output = str_replace("\r\n", "\n", $output);
         }

Original file line number	Diff line number	Diff line change
`@@ -271,7 +271,7 @@ public function doStuff()`
`271`	`271`
`272`	`272`	`// Heredocs are preserved, making the output mixing Unix and Windows line`
`273`	`273`	`// endings, switching to "\n" everywhere on Windows to avoid failure.`
`274`		`- if (defined('PHP_WINDOWS_VERSION_MAJOR')) {`
	`274`	`+ if ('\\' === DIRECTORY_SEPARATOR) {`
`275`	`275`	`$expected = str_replace("\r\n", "\n", $expected);`
`276`	`276`	`$output = str_replace("\r\n", "\n", $output);`
`277`	`277`	`}`