Skip to content
Browse files

BUGFIX: normalise the config file, PCRE does not handle Windows/Mac l…

…inebreaks (os7133)
  • Loading branch information...
1 parent e99ada4 commit b34be8190edbca1882b5abfcb823bb997dd40193 @mateusz mateusz committed
Showing with 4 additions and 1 deletion.
  1. +4 −1 core/manifest/ConfigManifest.php
5 core/manifest/ConfigManifest.php
@@ -187,9 +187,12 @@ public function addYAMLConfigFile($basename, $pathname, $depth) {
'file' => basename(basename($basename, '.yml'), '.yaml')
+ // Make sure the linefeeds are all converted to \n, PCRE '$' will not match anything else.
+ $fileContents = str_replace(array("\r\n", "\r"), "\n", file_get_contents($pathname));
// YAML parsers really should handle this properly themselves, but neither spyc nor symfony-yaml do. So we
// follow in their vein and just do what we need, not what the spec says
- $parts = preg_split('/^---$/m', file_get_contents($pathname), -1, PREG_SPLIT_NO_EMPTY);
+ $parts = preg_split('/^---$/m', $fileContents, -1, PREG_SPLIT_NO_EMPTY);
// If only one document, it's a headerless fragment. So just add it with an anonymous name
if (count($parts) == 1) {

0 comments on commit b34be81

Please sign in to comment.
Something went wrong with that request. Please try again.