danog/psalm
1
0
Fork 0
mirror of https://github.com/danog/psalm.git synced 2024-12-02 17:52:45 +01:00
Code Issues Projects Releases Wiki Activity

Fix for spaces after , in multiline docblock types

Browse Source
This commit is contained in:
robchett 2023-10-26 12:39:02 +01:00 committed by Robert Chettleburgh
parent d05bd5430d
commit 934383e036
2 changed files with 15 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/Psalm/Internal/Analyzer/CommentAnalyzer.php
View File

@ -261,7 +261,7 @@ final class CommentAnalyzer
public static function sanitizeDocblockType(string $docblock_type): string public static function sanitizeDocblockType(string $docblock_type): string
{ {
$docblock_type = (string) preg_replace('@^[ \t]*\*@m', '', $docblock_type); $docblock_type = (string) preg_replace('@^[ \t]*\*@m', '', $docblock_type);
$docblock_type = (string) preg_replace('/,\n\s+}/', '}', $docblock_type); $docblock_type = (string) preg_replace('/,[\n\s]+}/', '}', $docblock_type);
$docblock_type = (string) preg_replace('/[ \t]+/', ' ', $docblock_type); $docblock_type = (string) preg_replace('/[ \t]+/', ' ', $docblock_type);
return trim(str_replace("\n", '', $docblock_type)); return trim(str_replace("\n", '', $docblock_type));

14
tests/TypeAnnotationTest.php
View File

@ -835,6 +835,20 @@ class TypeAnnotationTest extends TestCase
'$output===' => 'array{phone: string}', '$output===' => 'array{phone: string}',
], ],
], ],
'multilineTypeWithExtraSpace' => [
'code' => '<?php
/**
* @psalm-type PhoneType = array{
* phone: string, ' . '
* }
*/
class Foo {
/** @var PhoneType */
public static $phone;
}
$output = Foo::$phone;
',
],
'combineAliasOfArrayAndArrayCorrectly' => [ 'combineAliasOfArrayAndArrayCorrectly' => [
'code' => '<?php 'code' => '<?php