also check deleteAfterReject property when doing setup

Steveb-p · Steveb-p · commit d9beed8089d1 · 2020-06-22T19:10:07.000+02:00
diff --git a/src/Symfony/Component/Messenger/Bridge/Redis/Transport/Connection.php b/src/Symfony/Component/Messenger/Bridge/Redis/Transport/Connection.php
@@ -433,15 +433,15 @@ public function setup(): void
             $this->connection->clearLastError();
         }
 
-        if ($this->deleteAfterAck) {
+        if ($this->deleteAfterAck || $this->deleteAfterReject) {
             $groups = $this->connection->xinfo('GROUPS', $this->stream);
             if (
                 // support for Redis extension version 5+
                 (\is_array($groups) && 1 < \count($groups))
                 // support for Redis extension version 4.x
                 || (\is_string($groups) && substr_count($groups, '"name"'))
             ) {
-                throw new LogicException(sprintf('More than one group exists for stream "%s", delete_after_ack can not be enabled as it risks deleting messages before all groups could consume them.', $this->stream));
+                throw new LogicException(sprintf('More than one group exists for stream "%s", delete_after_ack and delete_after_reject can not be enabled as it risks deleting messages before all groups could consume them.', $this->stream));
             }
         }
 

Original file line number	Diff line number	Diff line change
`@@ -433,15 +433,15 @@ public function setup(): void`
`433`	`433`	`$this->connection->clearLastError();`
`434`	`434`	`}`
`435`	`435`
`436`		`- if ($this->deleteAfterAck) {`
	`436`	`+ if ($this->deleteAfterAck \|\| $this->deleteAfterReject) {`
`437`	`437`	`$groups = $this->connection->xinfo('GROUPS', $this->stream);`
`438`	`438`	`if (`
`439`	`439`	`// support for Redis extension version 5+`
`440`	`440`	`(\is_array($groups) && 1 < \count($groups))`
`441`	`441`	`// support for Redis extension version 4.x`
`442`	`442`	`\|\| (\is_string($groups) && substr_count($groups, '"name"'))`
`443`	`443`	`) {`
`444`		`- throw new LogicException(sprintf('More than one group exists for stream "%s", delete_after_ack can not be enabled as it risks deleting messages before all groups could consume them.', $this->stream));`
	`444`	`+ throw new LogicException(sprintf('More than one group exists for stream "%s", delete_after_ack and delete_after_reject can not be enabled as it risks deleting messages before all groups could consume them.', $this->stream));`
`445`	`445`	`}`
`446`	`446`	`}`
`447`	`447`