Skip to content

Commit b4eefe3

Browse files
committed
Merge branch '2.5' into 2.6
* 2.5: [Form] Remove a redundant test. use value of DIRECTORY_SEPARATOR to detect Windows Conflicts: src/Symfony/Component/Process/Process.php
2 parents a5083ab + a97b5ad commit b4eefe3

File tree

1 file changed

+1
-1
lines changed

1 file changed

+1
-1
lines changed

Tests/KernelTest.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -271,7 +271,7 @@ public function doStuff()
271271

272272
// Heredocs are preserved, making the output mixing Unix and Windows line
273273
// endings, switching to "\n" everywhere on Windows to avoid failure.
274-
if (defined('PHP_WINDOWS_VERSION_MAJOR')) {
274+
if ('\\' === DIRECTORY_SEPARATOR) {
275275
$expected = str_replace("\r\n", "\n", $expected);
276276
$output = str_replace("\r\n", "\n", $output);
277277
}

0 commit comments

Comments
 (0)