Fix self reference factory

Author: coisa

src/ServiceProvider/FrameworkServiceProvider.php

@@ -33,13 +33,8 @@
  * This class SHALL implement the ServiceProviderInterface and MUST delegate
  * its service discovery responsibilities to an internal AggregateServiceProvider.
  */
-final class FrameworkServiceProvider implements ServiceProviderInterface
+final class FrameworkServiceProvider extends AggregateServiceProvider
 {
-    /**
-     * @var ServiceProviderInterface the aggregate container for framework service providers
-     */
-    private ServiceProviderInterface $serviceProvider;
-
     /**
      * Constructs the FrameworkServiceProvider.
      *
@@ -48,43 +43,8 @@ final class FrameworkServiceProvider implements ServiceProviderInterface
      */
     public function __construct()
     {
-        $this->serviceProvider = new AggregateServiceProvider(
+        parent::__construct(
             new HttpServiceProvider(),
-            // ErrorHandlerServiceProvider,
-            // EventDispatcherServiceProvider,
-            // LoggerServiceProvider,
-            // CacheServiceProvider,
-            // ConsoleServiceProvider,
-            // TemplateRendererServiceProvider,
-            // SecurityServiceProvider,
-            // SessionServiceProvider,
-            // ...
         );
     }
-
-    /**
-     * Returns an array of service factory callables.
-     *
-     * This method MUST delegate to the internal AggregateServiceProvider and
-     * return all service factories required for container instantiation.
-     *
-     * @return array<string, callable> an associative array of factory callables indexed by service IDs
-     */
-    public function getFactories(): array
-    {
-        return $this->serviceProvider->getFactories();
-    }
-
-    /**
-     * Returns an array of service extension callables.
-     *
-     * This method MUST delegate to the internal AggregateServiceProvider and
-     * return all service extensions used to decorate existing services.
-     *
-     * @return array<string, callable> an associative array of extension callables indexed by service IDs
-     */
-    public function getExtensions(): array
-    {
-        return $this->serviceProvider->getExtensions();
-    }
 }

tests/ServiceProvider/FrameworkServiceProviderTest.php

@@ -4,7 +4,9 @@
 
 namespace FastForward\Framework\Tests\ServiceProvider;
 
+use FastForward\Container\Factory\ServiceFactory;
 use FastForward\Framework\ServiceProvider\FrameworkServiceProvider;
+use FastForward\Http\ServiceProvider\HttpServiceProvider;
 use PHPUnit\Framework\Attributes\CoversClass;
 use PHPUnit\Framework\TestCase;
 use Prophecy\PhpUnit\ProphecyTrait;
@@ -23,22 +25,34 @@ protected function setUp(): void
 
     public function testGetFactoriesWillReturnHttpServiceProviderFactories(): void
     {
-        $factories = $this->provider->getFactories();
+        $expectedFactories = array_merge(
+            (new HttpServiceProvider())->getFactories(),
+            [FrameworkServiceProvider::class => new ServiceFactory($this->provider)]
+        );
 
-        self::assertIsArray($factories);
-        self::assertNotEmpty($factories);
-        foreach ($factories as $factory) {
-            self::assertIsCallable($factory);
+        $actualFactories = $this->provider->getFactories();
+
+        foreach ($expectedFactories as $id => $factory) {
+            self::assertArrayHasKey($id, $actualFactories);
+            self::assertIsCallable($actualFactories[$id]);
         }
+
+        self::assertSameSize($expectedFactories, $actualFactories);
     }
 
     public function testGetExtensionsWillReturnHttpServiceProviderExtensions(): void
     {
-        $extensions = $this->provider->getExtensions();
+        $expectedExtensions = array_merge(
+            (new HttpServiceProvider())->getExtensions(),
+        );
 
-        self::assertIsArray($extensions);
-        foreach ($extensions as $extension) {
-            self::assertIsCallable($extension);
+        $actualExtensions = $this->provider->getExtensions();
+
+        foreach ($expectedExtensions as $id => $extension) {
+            self::assertArrayHasKey($id, $actualExtensions);
+            self::assertIsCallable($actualExtensions[$id]);
         }
+
+        self::assertSameSize($expectedExtensions, $actualExtensions);
     }
 }