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

Fix #2953 - ignore carriage returns when when parsing docblocks

Browse Source
This commit is contained in:
Brown 2020-03-10 13:28:42 -04:00
parent f25a0c60d0
commit 3cf562125e
1 changed files with 7 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
src/Psalm/DocComment.php
View File

@ -195,9 +195,10 @@ class DocComment
$last = false;
foreach ($lines as $k => $line) {
if (preg_match('/^[ \t]*\*?\s?@\w/i', $line)) {
$last = $k;
} elseif (preg_match('/^\s*$/', $line)) {
} elseif (preg_match('/^\s*\r?$/', $line)) {
$last = false;
} elseif ($last !== false) {
$old_last_line = $lines[$last];
@ -210,6 +211,10 @@ class DocComment
$line_offset = 0;
foreach ($lines as $line) {
$original_line_length = strlen($line);
$line = str_replace("\r", '', $line);
if (preg_match('/^[ \t]*\*?\s?@([\w\-:]+)[\t ]*(.*)$/sm', $line, $matches, PREG_OFFSET_CAPTURE)) {
/** @var array<int, array{string, int}> $matches */
list($full_match_info, $type_info, $data_info) = $matches;
@ -233,7 +238,7 @@ class DocComment
$special[$type][$data_offset + 3] = $data;
}
$line_offset += strlen($line) + 1;
$line_offset += $original_line_length + 1;
}
$docblock = str_replace("\t", ' ', $docblock);