diff --git a/src/MessageBus/HandlerCollectionFactory.php b/src/MessageBus/HandlerCollectionFactory.php index bcbfa40..2b718e7 100644 --- a/src/MessageBus/HandlerCollectionFactory.php +++ b/src/MessageBus/HandlerCollectionFactory.php @@ -31,7 +31,7 @@ private function mapHandlersToInternalObjects(): array { return array_map( fn (object|string $h): Handler => $this->createHandler($h), - $this->settings->handlers(), + $this->settings->handlers, ); } @@ -39,7 +39,7 @@ private function createHandler(object|string $actualHandler): Handler { return match (is_object($actualHandler)) { true => new SimpleHandler($actualHandler), - false => new LazyHandler($this->settings->psrContainer(), $actualHandler), + false => new LazyHandler($this->settings->psrContainer, $actualHandler), }; } } diff --git a/src/MessageBusSettings.php b/src/MessageBusSettings.php index 0c4516b..3f7c594 100644 --- a/src/MessageBusSettings.php +++ b/src/MessageBusSettings.php @@ -7,8 +7,8 @@ class MessageBusSettings { private function __construct( - private ?PsrContainer $container, - /** @var string[]|object[] */ private array $handlers, + public readonly ?PsrContainer $psrContainer, + /** @var string[]|object[] */ public readonly array $handlers, ) { } @@ -17,26 +17,13 @@ public static function new(): self return new self(null, []); } - public function withPsrContainer(PsrContainer $container): self + public function withPsrContainer(PsrContainer $psrContainer): self { - return new self($container, $this->handlers); + return new self($psrContainer, $this->handlers); } public function withHandlers(string|object ...$handlers): self { - return new self($this->container, $handlers); - } - - public function psrContainer(): PsrContainer - { - return $this->container; - } - - /** - * @return string[]|object[] - */ - public function handlers(): array - { - return $this->handlers; + return new self($this->psrContainer, $handlers); } }