Try to get Windows CI to agree on line offsets

sebastianbergmann · Jan 11, 2019 · 35dfa54 · 35dfa54
1 parent 9a8f8a3
commit 35dfa54
Show file tree

Hide file tree

Showing 2 changed files with 1 addition and 2 deletions.
diff --git a/src/Runner/PhptTestCase.php b/src/Runner/PhptTestCase.php
@@ -655,7 +655,7 @@ private function getLocationHint(string $needle, array $sections, ?string $secti
             $sectionOffset = $sections[$section . '_offset'] ?? 0;
             $offset        = $sectionOffset + 1;
 
-            $lines = \explode(\PHP_EOL, $sections[$section]);
+            $lines = \preg_split('/\r\n|\r|\n/', $sections[$section]);
 
             foreach ($lines as $line) {
                 if (\strpos($line, $needle) !== false) {

diff --git a/tests/end-to-end/_files/phpt-skipif-location-hint-example.phpt b/tests/end-to-end/_files/phpt-skipif-location-hint-example.phpt
@@ -6,7 +6,6 @@ print "Nothing to see here, move along";
 ?>
 --SKIPIF--
 <?php
-// Force skip by writing 'skip:' to STDOUT at the start a line
 print "skip: something terrible happened\n";
 ?>
 --EXPECT--