merged branch bamarni/windows-test (PR #7858)
This PR was merged into the master branch.
Discussion
----------
fixed a test on windows
Commits
-------
6f7e35e
fixed a test on windows
This commit is contained in:
commit
3c90abf2a2
@ -332,7 +332,16 @@ class TestClass
|
||||
}
|
||||
EOF;
|
||||
|
||||
$this->assertEquals($expected, Kernel::stripComments($source));
|
||||
$output = Kernel::stripComments($source);
|
||||
|
||||
// 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')) {
|
||||
$expected = str_replace("\r\n", "\n", $expected);
|
||||
$output = str_replace("\r\n", "\n", $output);
|
||||
}
|
||||
|
||||
$this->assertEquals($expected, $output);
|
||||
}
|
||||
|
||||
public function testIsClassInActiveBundleFalse()
|
||||
|
Reference in New Issue
Block a user