diff --git a/SymfonyCustom/Sniffs/NamingConventions/ValidScalarTypeNameSniff.php b/SymfonyCustom/Sniffs/NamingConventions/ValidScalarTypeNameSniff.php index c236ebd..338f999 100644 --- a/SymfonyCustom/Sniffs/NamingConventions/ValidScalarTypeNameSniff.php +++ b/SymfonyCustom/Sniffs/NamingConventions/ValidScalarTypeNameSniff.php @@ -92,6 +92,10 @@ private function getValidTypeName(string $typeName): string $validType = ''; for ($i = 0; $i < $partsNumber; $i += 2) { $validType .= $this->suggestType($parts[$i]).$parts[$i + 1]; + + if (in_array($parts[$i + 1], [',', ':'])) { + $validType .= ' '; + } } if ('' !== $parts[$partsNumber]) { diff --git a/SymfonyCustom/Tests/NamingConventions/ValidScalarTypeNameUnitTest.inc b/SymfonyCustom/Tests/NamingConventions/ValidScalarTypeNameUnitTest.inc index 3aeeac3..ee000ab 100644 --- a/SymfonyCustom/Tests/NamingConventions/ValidScalarTypeNameUnitTest.inc +++ b/SymfonyCustom/Tests/NamingConventions/ValidScalarTypeNameUnitTest.inc @@ -45,3 +45,4 @@ echo ( float ) $a; /** @method integer|string */ /** @method array|integer[]|array truc */ /** @method array| integer[] |string|(integer|boolean)[] truc */ +/** @method array{scheme:string,host:string} truc */ diff --git a/SymfonyCustom/Tests/NamingConventions/ValidScalarTypeNameUnitTest.inc.fixed b/SymfonyCustom/Tests/NamingConventions/ValidScalarTypeNameUnitTest.inc.fixed index abe84d1..e17011e 100644 --- a/SymfonyCustom/Tests/NamingConventions/ValidScalarTypeNameUnitTest.inc.fixed +++ b/SymfonyCustom/Tests/NamingConventions/ValidScalarTypeNameUnitTest.inc.fixed @@ -43,5 +43,6 @@ echo ( float ) $a; /** @var float $c */ /** @method int|string */ -/** @method array|int[]|array truc */ -/** @method array|int[]|string|(int|bool)[] truc */ +/** @method array|int[]|array truc */ +/** @method array|int[]|string|(int|bool)[] truc */ +/** @method array{scheme: string, host: string} truc */ diff --git a/SymfonyCustom/Tests/NamingConventions/ValidScalarTypeNameUnitTest.php b/SymfonyCustom/Tests/NamingConventions/ValidScalarTypeNameUnitTest.php index cb57f5d..fcc7fea 100644 --- a/SymfonyCustom/Tests/NamingConventions/ValidScalarTypeNameUnitTest.php +++ b/SymfonyCustom/Tests/NamingConventions/ValidScalarTypeNameUnitTest.php @@ -37,6 +37,7 @@ protected function getErrorList(): array 45 => 1, 46 => 1, 47 => 1, + 48 => 1, ]; }