Remove services from Entity constructor

Author: TomHAnderson

src/Type/Entity/Entity.php

@@ -5,11 +5,9 @@
 namespace ApiSkeletons\Doctrine\ORM\GraphQL\Type\Entity;
 
 use ApiSkeletons\Doctrine\ORM\GraphQL\Config;
-use ApiSkeletons\Doctrine\ORM\GraphQL\Container;
 use ApiSkeletons\Doctrine\ORM\GraphQL\Event\EntityDefinition;
 use ApiSkeletons\Doctrine\ORM\GraphQL\Filter\FilterFactory;
 use ApiSkeletons\Doctrine\ORM\GraphQL\Hydrator\HydratorContainer;
-use ApiSkeletons\Doctrine\ORM\GraphQL\Metadata;
 use ApiSkeletons\Doctrine\ORM\GraphQL\Resolve\FieldResolver;
 use ApiSkeletons\Doctrine\ORM\GraphQL\Resolve\ResolveCollectionFactory;
 use ApiSkeletons\Doctrine\ORM\GraphQL\Type\Connection;
@@ -36,36 +34,24 @@
  */
 class Entity
 {
-    /** @var mixed[]  */
-    protected array $metadata;
     /** @var array<string, string> */
     protected array $extractionMap        = [];
     protected ObjectType|null $objectType = null;
-    protected readonly Config $config;
-    protected readonly EntityManager $entityManager;
-    protected readonly EntityTypeContainer $entityTypeContainer;
-    protected readonly EventDispatcher $eventDispatcher;
-    protected readonly FieldResolver $fieldResolver;
-    protected readonly FilterFactory $filterFactory;
-    protected readonly HydratorContainer $hydratorContainer;
-    protected readonly ResolveCollectionFactory $resolveCollectionFactory;
-    protected readonly TypeContainer $typeContainer;
 
+    /** @param array<string, mixed> $metadata */
     public function __construct(
-        Container $container,
-        string $typeName,
-        private string|null $eventName = null,
+        private string|null $eventName,
+        protected readonly Config $config,
+        protected readonly EntityManager $entityManager,
+        protected readonly EntityTypeContainer $entityTypeContainer,
+        protected readonly EventDispatcher $eventDispatcher,
+        protected readonly FieldResolver $fieldResolver,
+        protected readonly FilterFactory $filterFactory,
+        protected readonly HydratorContainer $hydratorContainer,
+        protected readonly ResolveCollectionFactory $resolveCollectionFactory,
+        protected readonly TypeContainer $typeContainer,
+        protected readonly array $metadata,
     ) {
-        $this->config                   = $container->get(Config::class);
-        $this->entityManager            = $container->get(EntityManager::class);
-        $this->entityTypeContainer      = $container->get(EntityTypeContainer::class);
-        $this->eventDispatcher          = $container->get(EventDispatcher::class);
-        $this->fieldResolver            = $container->get(FieldResolver::class);
-        $this->filterFactory            = $container->get(FilterFactory::class);
-        $this->hydratorContainer        = $container->get(HydratorContainer::class);
-        $this->resolveCollectionFactory = $container->get(ResolveCollectionFactory::class);
-        $this->typeContainer            = $container->get(TypeContainer::class);
-        $this->metadata                 = $container->get(Metadata::class)[$typeName];
     }
 
     public function getHydrator(): HydratorInterface

src/Type/Entity/EntityTypeContainer.php

@@ -4,9 +4,17 @@
 
 namespace ApiSkeletons\Doctrine\ORM\GraphQL\Type\Entity;
 
+use ApiSkeletons\Doctrine\ORM\GraphQL\Config;
 use ApiSkeletons\Doctrine\ORM\GraphQL\Container;
+use ApiSkeletons\Doctrine\ORM\GraphQL\Filter\FilterFactory;
+use ApiSkeletons\Doctrine\ORM\GraphQL\Hydrator\HydratorContainer;
 use ApiSkeletons\Doctrine\ORM\GraphQL\Metadata;
+use ApiSkeletons\Doctrine\ORM\GraphQL\Resolve\FieldResolver;
+use ApiSkeletons\Doctrine\ORM\GraphQL\Resolve\ResolveCollectionFactory;
+use ApiSkeletons\Doctrine\ORM\GraphQL\Type\TypeContainer;
+use Doctrine\ORM\EntityManager;
 use GraphQL\Error\Error;
+use League\Event\EventDispatcher;
 use Override;
 use ReflectionClass;
 
@@ -59,9 +67,17 @@ public function get(string $id, string|null $eventName = null): mixed
             (new ReflectionClass(Entity::class))
                 ->newLazyGhost(static function (Entity $object) use ($container, $id, $eventName): void {
                     $object->__construct(
-                        $container,
-                        $id,
                         $eventName,
+                        $container->get(Config::class),
+                        $container->get(EntityManager::class),
+                        $container->get(EntityTypeContainer::class),
+                        $container->get(EventDispatcher::class),
+                        $container->get(FieldResolver::class),
+                        $container->get(FilterFactory::class),
+                        $container->get(HydratorContainer::class),
+                        $container->get(ResolveCollectionFactory::class),
+                        $container->get(TypeContainer::class),
+                        $container->get(Metadata::class)[$id],
                     );
                 }),
         );