danog/psalm
1
0
Fork 0
mirror of https://github.com/danog/psalm.git synced 2024-11-27 04:45:20 +01:00
Code Issues Projects Releases Wiki Activity

PHP_EOL is sometimes the wrong EOL under windows

Browse Source
This commit is contained in:
SignpostMarv 2019-02-06 19:21:12 +00:00 committed by Matthew Brown
parent e587a80181
commit 96ef708965
1 changed files with 25 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

31
tests/ConfigFileTest.php
View File

@ -57,15 +57,15 @@ class ConfigFileTest extends TestCase
$config_file = new ConfigFile((string)getcwd(), $this->file_path); $config_file = new ConfigFile((string)getcwd(), $this->file_path);
$config_file->addPlugin('a\b\c'); $config_file->addPlugin('a\b\c');
$this->assertSame( $this->assertTrue(static::compareContentWithTemplateAndTrailingLineEnding(
'<?xml version="1.0" encoding="UTF-8"?> '<?xml version="1.0" encoding="UTF-8"?>
<psalm <psalm
name="bar" name="bar"
> >
<plugins><pluginClass xmlns="' . ConfigFile::NS . '" class="a\b\c"/></plugins> <plugins><pluginClass xmlns="' . ConfigFile::NS . '" class="a\b\c"/></plugins>
</psalm>' . PHP_EOL, </psalm>',
file_get_contents($this->file_path) file_get_contents($this->file_path)
); ));
} }
/** /**
@ -83,11 +83,11 @@ class ConfigFileTest extends TestCase
$config_file = new ConfigFile((string)getcwd(), $this->file_path); $config_file = new ConfigFile((string)getcwd(), $this->file_path);
$config_file->addPlugin('a\b\c'); $config_file->addPlugin('a\b\c');
$this->assertSame( $this->assertTrue(static::compareContentWithTemplateAndTrailingLineEnding(
'<?xml version="1.0"?> '<?xml version="1.0"?>
<psalm><plugins><pluginClass xmlns="' . ConfigFile::NS . '" class="a\b\c"/></plugins></psalm>' . PHP_EOL, <psalm><plugins><pluginClass xmlns="' . ConfigFile::NS . '" class="a\b\c"/></plugins></psalm>',
file_get_contents($this->file_path) file_get_contents($this->file_path)
); ));
} }
/** /**
@ -201,4 +201,23 @@ class ConfigFileTest extends TestCase
file_get_contents($this->file_path) file_get_contents($this->file_path)
); );
} }
/**
* @param string $expected_template
* @param string $contents
*
* @return bool
*/
protected static function compareContentWithTemplateAndTrailingLineEnding($expected_template, $contents)
{
$passed = false;
foreach ([PHP_EOL, "\n", "\r", "\r\n"] as $eol) {
if (! $passed && $contents === ($expected_template . $eol)) {
$passed = true;
}
}
return $passed;
}
} }