minor #34211 [Messenger] remove legacy code in SendersLocator (Tobion)
This PR was merged into the 5.0-dev branch. Discussion ---------- [Messenger] remove legacy code in SendersLocator | Q | A | ------------- | --- | Branch? | master | Bug fix? | no | New feature? | no <!-- please update src/**/CHANGELOG.md files --> | Deprecations? | no <!-- please update UPGRADE-*.md and src/**/CHANGELOG.md files --> | Tickets | | License | MIT | Doc PR | Remove some leftover code forgotten in39622488bb
Commits -------127f5da1fd
[Messenger] remove legacy code in SendersLocator
This commit is contained in:
commit
4d92e64ef4
@ -25,7 +25,6 @@ class SendersLocator implements SendersLocatorInterface
|
|||||||
{
|
{
|
||||||
private $sendersMap;
|
private $sendersMap;
|
||||||
private $sendersLocator;
|
private $sendersLocator;
|
||||||
private $useLegacyLookup = false;
|
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* @param string[][] $sendersMap An array, keyed by "type", set to an array of sender aliases
|
* @param string[][] $sendersMap An array, keyed by "type", set to an array of sender aliases
|
||||||
@ -45,17 +44,6 @@ class SendersLocator implements SendersLocatorInterface
|
|||||||
$seen = [];
|
$seen = [];
|
||||||
|
|
||||||
foreach (HandlersLocator::listTypes($envelope) as $type) {
|
foreach (HandlersLocator::listTypes($envelope) as $type) {
|
||||||
// the old way of looking up senders
|
|
||||||
if ($this->useLegacyLookup) {
|
|
||||||
foreach ($this->sendersMap[$type] ?? [] as $alias => $sender) {
|
|
||||||
if (!\in_array($sender, $seen, true)) {
|
|
||||||
yield $alias => $seen[] = $sender;
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
continue;
|
|
||||||
}
|
|
||||||
|
|
||||||
foreach ($this->sendersMap[$type] ?? [] as $senderAlias) {
|
foreach ($this->sendersMap[$type] ?? [] as $senderAlias) {
|
||||||
if (!\in_array($senderAlias, $seen, true)) {
|
if (!\in_array($senderAlias, $seen, true)) {
|
||||||
if (!$this->sendersLocator->has($senderAlias)) {
|
if (!$this->sendersLocator->has($senderAlias)) {
|
||||||
|
Reference in New Issue
Block a user