TypeHelper: fixed regexp

kukulich · kukulich · commit 4eedbb1607dd · 2018-05-02T22:36:06.000+02:00
diff --git a/SlevomatCodingStandard/Helpers/TypeHelper.php b/SlevomatCodingStandard/Helpers/TypeHelper.php
@@ -15,7 +15,7 @@ class TypeHelper
 	public static function isTypeName(string $typeName): bool
 	{
 		$matches = [];
-		$result = preg_match('~^(\\\?[a-zA-Z_\x7f-\xff][a-zA-Z0-9_\x7f-\xff]*)+$~', $typeName, $matches);
+		$result = preg_match('~^\\\\?([a-zA-Z_\x7f-\xff][a-zA-Z0-9_\x7f-\xff]*)(\\\\[a-zA-Z_\x7f-\xff][a-zA-Z0-9_\x7f-\xff]*)*$~', $typeName, $matches);
 		if ($result === false) {
 			// @codeCoverageIgnoreStart
 			throw new \Exception('PREG error ' . preg_last_error());
diff --git a/tests/Helpers/TypeHelperTest.php b/tests/Helpers/TypeHelperTest.php
@@ -45,6 +45,7 @@ public function dataNotValidTypeNames(): array
 			['Foo\\'],
 			['Foo[]'],
 			['[]'],
+			['\Dogma\Math\Range\RangeSet<T>'],
 		];
 	}
 

Original file line number	Diff line number	Diff line change
`@@ -15,7 +15,7 @@ class TypeHelper`
`15`	`15`	`public static function isTypeName(string $typeName): bool`
`16`	`16`	`{`
`17`	`17`	`$matches = [];`
`18`		`- $result = preg_match('~^(\\\?[a-zA-Z_\x7f-\xff][a-zA-Z0-9_\x7f-\xff]*)+$~', $typeName, $matches);`
	`18`	`+ $result = preg_match('~^\\\\?([a-zA-Z_\x7f-\xff][a-zA-Z0-9_\x7f-\xff])(\\\\[a-zA-Z_\x7f-\xff][a-zA-Z0-9_\x7f-\xff])*$~', $typeName, $matches);`
`19`	`19`	`if ($result === false) {`
`20`	`20`	`// @codeCoverageIgnoreStart`
`21`	`21`	`throw new \Exception('PREG error ' . preg_last_error());`
Original file line number	Diff line number	Diff line change
`@@ -45,6 +45,7 @@ public function dataNotValidTypeNames(): array`
`45`	`45`	`['Foo\\'],`
`46`	`46`	`['Foo[]'],`
`47`	`47`	`['[]'],`
	`48`	`+ ['\Dogma\Math\Range\RangeSet<T>'],`
`48`	`49`	`];`
`49`	`50`	`}`
`50`	`51`