Skip to content

Commit fc64be7

Browse files
committed
Merge branch 'master' into 3.2-merge
# Conflicts: # .github/workflows/test.yml # src/command/composer.json # src/serializer/src/Contract/CacheableSupportsMethodInterface.php # src/validation/src/ValidationRuleParser.php
2 parents a2367d5 + 35d3172 commit fc64be7

2 files changed

Lines changed: 2 additions & 1 deletion

File tree

.gitattributes

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,2 +1,3 @@
11
/tests export-ignore
22
/.github export-ignore
3+
/types export-ignore

src/Annotation/Consumer.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,7 @@ class Consumer extends AbstractAnnotation
2222
* @param string|string[] $topic
2323
*/
2424
public function __construct(
25-
public string $pool = 'default',
25+
public string $pool = '',
2626
public array|string $topic = '',
2727
public ?string $groupId = null,
2828
public ?string $memberId = null,

0 commit comments

Comments
 (0)