Improve AT constraint indication when dumping type to string

Author: Girgias

Zend/tests/type_declarations/associated/associated_type_with_constraint_failed.phpt

@@ -14,4 +14,4 @@ class C implements I {
 
 ?>
 --EXPECTF--
-Fatal error: Declaration of C::foo(float $param): float must be compatible with I::foo(T<string|int> $param): T<string|int> in %s on line %d
+Fatal error: Declaration of C::foo(float $param): float must be compatible with I::foo(<T : string|int> $param): <T : string|int> in %s on line %d

Zend/tests/type_declarations/associated/big_example.phpt

@@ -99,4 +99,4 @@ final class StringTable
 
 ?>
 --EXPECTF--
-Fatal error: Declaration of Sequence\StringTableSequence::next(): ?Sequence\StringTablePair must be compatible with Sequence\Sequence::next(): Item<object|array|string|int|float|bool>|null in %s on line %d
+Fatal error: Declaration of Sequence\StringTableSequence::next(): ?Sequence\StringTablePair must be compatible with Sequence\Sequence::next(): <Item : object|array|string|int|float|bool>|null in %s on line %d

Zend/tests/type_declarations/associated/extended_interface_new_associated_types.phpt

@@ -19,8 +19,8 @@ class C implements I2 {
 }
 
 // TODO: Ideally error message would be:
-//Fatal error: Declaration of C::bar(float $o, string $param): float must be compatible with I2::bar(T2<stdClass|float|bool> $o, T<(Traversable&Countable)|int|string> $param): T2<stdClass|float|bool> in %s on line %d
+//Fatal error: Declaration of C::bar(float $o, string $param): float must be compatible with I2::bar(<T2 : stdClass|float|bool> $o, <T : (Traversable&Countable)|int|string> $param): <T2 : stdClass|float|bool> in %s on line %d
 //Improve zend_append_type_hint()?
 ?>
 --EXPECTF--
-Fatal error: Declaration of C::bar(float $o, string $param): float must be compatible with I2::bar(T2<stdClass|float|bool> $o, T $param): T2<stdClass|float|bool> in %s on line %d
+Fatal error: Declaration of C::bar(float $o, string $param): float must be compatible with I2::bar(<T2 : stdClass|float|bool> $o, T $param): <T2 : stdClass|float|bool> in %s on line %d

Zend/zend_compile.c

@@ -1448,12 +1448,15 @@ static zend_string *add_associated_type(zend_string *associated_type, zend_class
 
 	zend_string *constraint_type_str = zend_type_to_string_resolved(*constraint, scope);
 
-	size_t len = ZSTR_LEN(associated_type) + ZSTR_LEN(constraint_type_str) + strlen("<>");
+	size_t len = ZSTR_LEN(associated_type) + ZSTR_LEN(constraint_type_str) + strlen("< : >");
 	zend_string *result = zend_string_alloc(len, 0);
 
-	memcpy(ZSTR_VAL(result), ZSTR_VAL(associated_type), ZSTR_LEN(associated_type));
-	ZSTR_VAL(result)[ZSTR_LEN(associated_type)] = '<';
-	memcpy(ZSTR_VAL(result) + ZSTR_LEN(associated_type) + 1, ZSTR_VAL(constraint_type_str), ZSTR_LEN(constraint_type_str));
+	ZSTR_VAL(result)[0] = '<';
+	memcpy(ZSTR_VAL(result) + strlen("<"), ZSTR_VAL(associated_type), ZSTR_LEN(associated_type));
+	ZSTR_VAL(result)[ZSTR_LEN(associated_type) + 1] = ' ';
+	ZSTR_VAL(result)[ZSTR_LEN(associated_type) + 2] = ':';
+	ZSTR_VAL(result)[ZSTR_LEN(associated_type) + 3] = ' ';
+	memcpy(ZSTR_VAL(result) + ZSTR_LEN(associated_type) + strlen("< : "), ZSTR_VAL(constraint_type_str), ZSTR_LEN(constraint_type_str));
 	ZSTR_VAL(result)[len-1] = '>';
 	ZSTR_VAL(result)[len] = '\0';