PhpdocScalarFixer - fix for comment with Windows line endings

nutshellcrm · Jun 27, 2020 · 213c93e · 213c93e
1 parent c0d6a34
commit 213c93e
Show file tree

Hide file tree

Showing 3 changed files with 245 additions and 318 deletions.
diff --git a/src/DocBlock/Annotation.php b/src/DocBlock/Annotation.php
@@ -302,7 +302,7 @@ private function getTypesContent()
             }
 
             $matchingResult = Preg::match(
-                '{^(?:\s*\*|/\*\*)\s*@'.$name.'\s+'.self::REGEX_TYPES.'(?:[*\h].*)?$}sx',
+                '{^(?:\s*\*|/\*\*)\s*@'.$name.'\s+'.self::REGEX_TYPES.'(?:[*\h\v].*)?$}sx',
                 $this->lines[0]->getContent(),
                 $matches
             );

diff --git a/tests/DocBlock/AnnotationTest.php b/tests/DocBlock/AnnotationTest.php
@@ -361,6 +361,14 @@ public function provideTypeParsingCases()
                 '/** @var array<string|int, string>',
                 ['array<string|int, string>'],
             ],
+            [
+                " * @return int\n",
+                ['int'],
+            ],
+            [
+                " * @return int\r\n",
+                ['int'],
+            ],
         ];
     }