PhpNamespace::simplifyType() supports generics like Foo<A, B>

Author: dg

src/PhpGenerator/PhpNamespace.php

@@ -141,7 +141,7 @@ public function unresolveName(string $name): string
 
 	public function simplifyType(string $type): string
 	{
-		return preg_replace_callback('~[^|&?]+~', function ($m) { return $this->simplifyName($m[0]); }, $type);
+		return preg_replace_callback('~[\w\x7f-\xff\\\\]+~', function ($m) { return $this->simplifyName($m[0]); }, $type);
 	}
 
 

tests/PhpGenerator/PhpNamespace.phpt

@@ -52,6 +52,8 @@ Assert::same('\Bar', $namespace->simplifyName('Bar'));
 Assert::same('C', $namespace->simplifyName('\bar\C'));
 Assert::same('C', $namespace->simplifyName('bar\C'));
 Assert::same('C\D', $namespace->simplifyName('Bar\C\D'));
+Assert::same('A<C, C\D>', $namespace->simplifyType('foo\A<\bar\C, Bar\C\D>'));
+Assert::same('žluťoučký', $namespace->simplifyType('foo\žluťoučký'));
 
 foreach (['String', 'string', 'int', 'float', 'bool', 'array', 'callable', 'self', 'parent', ''] as $type) {
 	Assert::same($type, $namespace->simplifyName($type));