Fix self reference factory

Author: coisa

src/ServiceProvider/HttpServiceProvider.php

@@ -18,7 +18,6 @@
 use FastForward\Container\ServiceProvider\AggregateServiceProvider;
 use FastForward\Http\Client\ServiceProvider\HttpClientServiceProvider;
 use FastForward\Http\Message\Factory\ServiceProvider\HttpMessageFactoryServiceProvider;
-use Interop\Container\ServiceProviderInterface;
 
 /**
  * Class HttpServiceProvider
@@ -29,13 +28,8 @@
  * It MUST implement the ServiceProviderInterface and MUST delegate factory and extension
  * retrieval to the internal AggregateServiceProvider instance.
  */
-final class HttpServiceProvider implements ServiceProviderInterface
+final class HttpServiceProvider extends AggregateServiceProvider
 {
-    /**
-     * @var ServiceProviderInterface The aggregate service provider that includes all HTTP service providers.
-     */
-    private ServiceProviderInterface $serviceProvider;
-
     /**
      * Constructs the HttpServiceProvider.
      *
@@ -44,33 +38,9 @@ final class HttpServiceProvider implements ServiceProviderInterface
      */
     public function __construct()
     {
-        $this->serviceProvider = new AggregateServiceProvider(
+        parent::__construct(
             new HttpMessageFactoryServiceProvider(),
             new HttpClientServiceProvider(),
         );
     }
-
-    /**
-     * Returns an array of factory callables provided by the aggregate service provider.
-     *
-     * This method MUST delegate the call to the internal AggregateServiceProvider.
-     *
-     * @return array<string, callable> A map of service identifiers to factory callables.
-     */
-    public function getFactories(): array
-    {
-        return $this->serviceProvider->getFactories();
-    }
-
-    /**
-     * Returns an array of service extension callables provided by the aggregate service provider.
-     *
-     * This method MUST delegate the call to the internal AggregateServiceProvider.
-     *
-     * @return array<string, callable> A map of service identifiers to extension callables.
-     */
-    public function getExtensions(): array
-    {
-        return $this->serviceProvider->getExtensions();
-    }
 }

tests/ServiceProvider/HttpServiceProviderTest.php

@@ -4,7 +4,7 @@
 
 namespace FastForward\Http\Tests\ServiceProvider;
 
-use FastForward\Container\ServiceProvider\AggregateServiceProvider;
+use FastForward\Container\Factory\ServiceFactory;
 use FastForward\Http\Client\ServiceProvider\HttpClientServiceProvider;
 use FastForward\Http\Message\Factory\ServiceProvider\HttpMessageFactoryServiceProvider;
 use FastForward\Http\ServiceProvider\HttpServiceProvider;
@@ -26,7 +26,7 @@ public function testGetFactoriesWillIncludeAllAggregatedFactories(): void
         $expectedFactories = array_merge(
             (new HttpMessageFactoryServiceProvider())->getFactories(),
             (new HttpClientServiceProvider())->getFactories(),
-            [AggregateServiceProvider::class => fn() => null]
+            [HttpServiceProvider::class => new ServiceFactory($this->provider)]
         );
 
         $actualFactories = $this->provider->getFactories();