Refactor: rework ServiceProviderContainer

Author: f3l1x

src/Container/ServiceProviderContainer.php

@@ -0,0 +1,46 @@
+<?php declare(strict_types = 1);
+
+namespace Contributte\Messenger\Container;
+
+use Nette\DI\Container;
+use Symfony\Contracts\Service\ServiceProviderInterface;
+
+/**
+ * @implements ServiceProviderInterface<object>
+ */
+class ServiceProviderContainer implements ServiceProviderInterface
+{
+
+	/** @var array<string, string> */
+	private array $map;
+
+	private NetteContainer $container;
+
+	/**
+	 * @param array<string, string> $map
+	 */
+	public function __construct(array $map, Container $context)
+	{
+		$this->map = $map;
+		$this->container = new NetteContainer($map, $context);
+	}
+
+	public function get(string $id): object
+	{
+		return $this->container->get($id);
+	}
+
+	public function has(string $id): bool
+	{
+		return $this->container->has($id);
+	}
+
+	/**
+	 * @return array<string, string>
+	 */
+	public function getProvidedServices(): array
+	{
+		return $this->map;
+	}
+
+}

src/DI/Pass/TransportPass.php

@@ -3,9 +3,9 @@
 namespace Contributte\Messenger\DI\Pass;
 
 use Contributte\Messenger\Container\NetteContainer;
+use Contributte\Messenger\Container\ServiceProviderContainer;
 use Contributte\Messenger\DI\MessengerExtension;
 use Contributte\Messenger\DI\Utils\BuilderMan;
-use Contributte\Messenger\Transport\FailureTransportServiceProvider;
 use Nette\DI\Definitions\ServiceDefinition;
 use Symfony\Component\Messenger\Retry\MultiplierRetryStrategy;
 
@@ -61,7 +61,7 @@ public function loadPassConfiguration(): void
 			->setAutowired(false);
 
 		$builder->addDefinition($this->prefix('failureTransport.serviceProvider'))
-			->setFactory(FailureTransportServiceProvider::class)
+			->setFactory(ServiceProviderContainer::class)
 			->setAutowired(false);
 	}
 

src/Transport/FailureTransportServiceProvider.php

@@ -0,0 +1,26 @@
+<?php declare(strict_types = 1);
+
+namespace Tests\Cases\Container;
+
+use Contributte\Messenger\Container\ServiceProviderContainer;
+use Contributte\Messenger\Exception\Logical\ContainerException;
+use Contributte\Tester\Toolkit;
+use Nette\DI\Container;
+use Tester\Assert;
+
+require_once __DIR__ . '/../../bootstrap.php';
+
+// Service container
+Toolkit::test(function (): void {
+	$map = ['test' => 'foo'];
+	$context = new Container();
+	$container = new ServiceProviderContainer($map, $context);
+
+	Assert::true($container->has('test'));
+	Assert::exception(
+		fn () => $container->get('test'),
+		ContainerException::class,
+		"Service 'test' not found"
+	);
+	Assert::equal($map, $container->getProvidedServices());
+});

tests/Cases/Container/ServiceProviderContainer.phpt

@@ -2,9 +2,9 @@
 
 namespace Tests\Cases\DI;
 
+use Contributte\Messenger\Container\ServiceProviderContainer;
 use Contributte\Messenger\DI\MessengerExtension;
 use Contributte\Messenger\Exception\LogicalException;
-use Contributte\Messenger\Transport\FailureTransportServiceProvider;
 use Contributte\Tester\Toolkit;
 use Nette\DI\Compiler;
 use Tester\Assert;
@@ -38,9 +38,9 @@ Toolkit::test(function (): void {
 		'messenger.transport.transport2' => 'transport1',
 	], $services);
 
-	/** @var FailureTransportServiceProvider $serviceProvider */
+	/** @var ServiceProviderContainer $serviceProvider */
 	$serviceProvider = $container->getService('messenger.failureTransport.serviceProvider');
-	Assert::type(FailureTransportServiceProvider::class, $serviceProvider);
+	Assert::type(ServiceProviderContainer::class, $serviceProvider);
 	Assert::same([
 		'transport1' => 'messenger.transport.transport1',
 	], $serviceProvider->getProvidedServices());
@@ -126,9 +126,9 @@ Toolkit::test(static function (): void {
 		'messenger.transport.transport3' => 'transport1',
 	], $services);
 
-	/** @var FailureTransportServiceProvider $serviceProvider */
+	/** @var ServiceProviderContainer $serviceProvider */
 	$serviceProvider = $container->getService('messenger.failureTransport.serviceProvider');
-	Assert::type(FailureTransportServiceProvider::class, $serviceProvider);
+	Assert::type(ServiceProviderContainer::class, $serviceProvider);
 	Assert::same([
 		'transport1' => 'messenger.transport.transport1',
 		'transport3' => 'messenger.transport.transport3',