fixup! fixup! Tests for retry strategy extension

contributte · Jul 19, 2023 · e6bd30b · e6bd30b
1 parent 57e81db
commit e6bd30b
Show file tree

Hide file tree

Showing 2 changed files with 11 additions and 11 deletions.
diff --git a/src/DI/Pass/EventPass.php b/src/DI/Pass/EventPass.php
@@ -16,13 +16,13 @@
 
 class EventPass extends AbstractPass
 {
+
  /**
  * Register services
  */
  public function loadPassConfiguration(): void
  {
  $builder = $this->getContainerBuilder();
- $config = $this->getConfig();
 
  // Register container for failure transports
  $builder->addDefinition($this->prefix('failure_transport.container'))
@@ -83,7 +83,7 @@ private function getSubscribers(): array
  new Statement(
  SendFailedMessageForRetryListener::class,
  [
- $this->prefix('@transport.container'),
+ $this->prefix('@transport.container'),
  $this->prefix('@retry_strategy.container'),
  $this->prefix('@logger.logger'),
  ]
@@ -97,13 +97,14 @@ private function getSubscribers(): array
  ),
  ];
 
- // For symfony/messenger >= 6.3
- if (class_exists(StopWorkerOnSignalsListener::class)) {
- $subscribers[] = new Statement(StopWorkerOnSignalsListener::class);
- } else {
- $subscribers[] = new Statement(StopWorkerOnSigtermSignalListener::class); // @phpstan-ignore-line
- }
+ // Backward compatibility
+ $subscribers[] = new Statement(
+ class_exists(StopWorkerOnSignalsListener::class)
+  ? StopWorkerOnSignalsListener::class
+  : StopWorkerOnSigtermSignalListener::class // @phpstan-ignore-line
+  );
 
  return $subscribers;
  }
+
 }
diff --git a/src/DI/Utils/BuilderMan.php b/src/DI/Utils/BuilderMan.php
@@ -6,7 +6,6 @@
 use Contributte\Messenger\DI\Pass\AbstractPass;
 use Contributte\Messenger\Exception\LogicalException;
 use Nette\DI\Definitions\Definition;
-use Symfony\Component\Messenger\Transport\TransportInterface;
 
 final class BuilderMan
 {
@@ -111,19 +110,19 @@ public function getServiceNames(string $tag): array
  */
  public function getRetryStrategies(): array
  {
- $builder = $this->pass->getContainerBuilder();
  $definitions = $this->getServiceDefinitions(MessengerExtension::TRANSPORT_TAG);
 
  $strategies = [];
  foreach ($definitions as $transport) {
  $transportName = $transport->getTag(MessengerExtension::TRANSPORT_TAG);
  $retryService = $transport->getTag(MessengerExtension::RETRY_STRATEGY_TAG);
 
- if ($retryService !== null) {
+ if (is_string($transportName) && is_string($retryService)) {
  $strategies[$transportName] = $retryService;
  }
  }
 
  return $strategies;
  }
+
 }