Services now returns Lazy Ghost objects instead of closures. Metadata moved to its own wrapper class

Author: TomHAnderson

src/Event/EntityDefinition.php

@@ -4,7 +4,7 @@
 
 namespace ApiSkeletons\Doctrine\ORM\GraphQL\Event;
 
-use ArrayObject;
+use ApiSkeletons\Doctrine\ORM\GraphQL\Type\Entity\Definition;
 use League\Event\HasEventName;
 use Override;
 
@@ -14,9 +14,8 @@
 class EntityDefinition implements
     HasEventName
 {
-    /** @param ArrayObject $definition<'description'|'fields'|'name'|'resolveField', mixed> */
     public function __construct(
-        protected readonly ArrayObject $definition,
+        protected readonly Definition $definition,
         protected readonly string $eventName,
     ) {
     }
@@ -27,7 +26,7 @@ public function eventName(): string
         return $this->eventName;
     }
 
-    public function getDefinition(): ArrayObject
+    public function getDefinition(): Definition
     {
         return $this->definition;
     }

src/Event/Metadata.php

@@ -4,7 +4,7 @@
 
 namespace ApiSkeletons\Doctrine\ORM\GraphQL\Event;
 
-use ArrayObject;
+use ApiSkeletons\Doctrine\ORM\GraphQL\Metadata as MetadataObject;
 use League\Event\HasEventName;
 use Override;
 
@@ -15,7 +15,7 @@ class Metadata implements
     HasEventName
 {
     public function __construct(
-        protected readonly ArrayObject $metadata,
+        protected readonly MetadataObject $metadata,
         protected readonly string $eventName,
     ) {
     }
@@ -26,7 +26,7 @@ public function eventName(): string
         return $this->eventName;
     }
 
-    public function getMetadata(): ArrayObject
+    public function getMetadata(): MetadataObject
     {
         return $this->metadata;
     }

src/Metadata.php

@@ -0,0 +1,16 @@
+<?php
+
+declare(strict_types=1);
+
+namespace ApiSkeletons\Doctrine\ORM\GraphQL;
+
+use ArrayObject;
+
+/**
+ * This exists to wrap the metadata information
+ *
+ * @extends ArrayObject<string, mixed>
+ */
+class Metadata extends ArrayObject
+{
+}

src/Metadata/GlobalEnable.php

@@ -5,10 +5,10 @@
 namespace ApiSkeletons\Doctrine\ORM\GraphQL\Metadata;
 
 use ApiSkeletons\Doctrine\ORM\GraphQL\Config;
-use ApiSkeletons\Doctrine\ORM\GraphQL\Event\Metadata;
+use ApiSkeletons\Doctrine\ORM\GraphQL\Event\Metadata as MetadataEvent;
 use ApiSkeletons\Doctrine\ORM\GraphQL\Hydrator\Strategy;
+use ApiSkeletons\Doctrine\ORM\GraphQL\Metadata;
 use ApiSkeletons\Doctrine\ORM\GraphQL\Metadata\Common\MetadataFactory;
-use ArrayObject;
 use Doctrine\ORM\EntityManager;
 use League\Event\EventDispatcher;
 use Override;
@@ -20,18 +20,18 @@
  */
 final class GlobalEnable extends MetadataFactory
 {
-    private ArrayObject $metadata;
+    private Metadata $metadata;
 
     public function __construct(
         protected readonly EntityManager $entityManager,
         protected readonly Config $config,
         protected readonly EventDispatcher $eventDispatcher,
     ) {
-        $this->metadata = new ArrayObject();
+        $this->metadata = new Metadata();
     }
 
     /** @param class-string[] $entityClasses */
-    public function __invoke(array $entityClasses): ArrayObject
+    public function getMetadata(array $entityClasses): Metadata
     {
         foreach ($entityClasses as $entityClass) {
             // Get extract by value or reference
@@ -53,7 +53,7 @@ public function __invoke(array $entityClasses): ArrayObject
         }
 
         $this->eventDispatcher->dispatch(
-            new Metadata($this->metadata, 'metadata.build'),
+            new MetadataEvent($this->metadata, 'metadata.build'),
         );
 
         return $this->metadata;

src/Metadata/MetadataFactory.php

@@ -6,27 +6,26 @@
 
 use ApiSkeletons\Doctrine\ORM\GraphQL\Attribute;
 use ApiSkeletons\Doctrine\ORM\GraphQL\Config;
-use ApiSkeletons\Doctrine\ORM\GraphQL\Event\Metadata;
+use ApiSkeletons\Doctrine\ORM\GraphQL\Event\Metadata as MetadataEvent;
 use ApiSkeletons\Doctrine\ORM\GraphQL\Filter\Filters;
 use ApiSkeletons\Doctrine\ORM\GraphQL\Hydrator\Strategy;
+use ApiSkeletons\Doctrine\ORM\GraphQL\Metadata;
 use ApiSkeletons\Doctrine\ORM\GraphQL\Metadata\Common\MetadataFactory as CommonMetadataFactory;
-use ArrayObject;
 use Doctrine\ORM\EntityManager;
 use Doctrine\ORM\Mapping\ClassMetadata;
 use League\Event\EventDispatcher;
 use Override;
 use ReflectionClass;
 
 use function assert;
-use function count;
 
 /**
  * Build metadata for entities
  */
 class MetadataFactory extends CommonMetadataFactory
 {
     public function __construct(
-        protected ArrayObject $metadata,
+        protected Metadata $metadata,
         protected readonly EntityManager $entityManager,
         protected readonly Config $config,
         protected readonly GlobalEnable $globalEnable,
@@ -37,9 +36,9 @@ public function __construct(
     /**
      * Build metadata for all entities and return it
      */
-    public function __invoke(): ArrayObject
+    public function getMetadata(): Metadata
     {
-        if (count($this->metadata)) {
+        if ($this->metadata->count()) {
             return $this->metadata;
         }
 
@@ -51,7 +50,7 @@ public function __invoke(): ArrayObject
 
         // If global enable is set, use the GlobalEnable class to build metadata
         if ($this->config->getGlobalEnable()) {
-            $this->metadata = ($this->globalEnable)($entityClasses);
+            $this->metadata = $this->globalEnable->getMetadata($entityClasses);
 
             return $this->metadata;
         }
@@ -71,7 +70,7 @@ public function __invoke(): ArrayObject
 
         // Fire the metadata.build event
         $this->eventDispatcher->dispatch(
-            new Metadata($this->metadata, 'metadata.build'),
+            new MetadataEvent($this->metadata, 'metadata.build'),
         );
 
         return $this->metadata;

src/Resolve/ResolveCollectionFactory.php

@@ -7,10 +7,10 @@
 use ApiSkeletons\Doctrine\ORM\GraphQL\Config;
 use ApiSkeletons\Doctrine\ORM\GraphQL\Event\Criteria as CriteriaEvent;
 use ApiSkeletons\Doctrine\ORM\GraphQL\Filter\Filters;
+use ApiSkeletons\Doctrine\ORM\GraphQL\Metadata;
 use ApiSkeletons\Doctrine\ORM\GraphQL\Type\Entity\Entity;
 use ApiSkeletons\Doctrine\ORM\GraphQL\Type\Entity\EntityTypeContainer;
 use ApiSkeletons\Doctrine\ORM\GraphQL\Type\TypeContainer;
-use ArrayObject;
 use Closure;
 use Doctrine\Common\Collections\Collection;
 use Doctrine\Common\Collections\Criteria;
@@ -38,7 +38,7 @@ public function __construct(
         protected readonly TypeContainer $typeContainer,
         protected readonly EntityTypeContainer $entityTypeContainer,
         protected readonly EventDispatcher $eventDispatcher,
-        protected readonly ArrayObject $metadata,
+        protected readonly Metadata $metadata,
     ) {
     }
 

src/Resolve/ResolveEntityFactory.php

@@ -7,8 +7,8 @@
 use ApiSkeletons\Doctrine\ORM\GraphQL\Config;
 use ApiSkeletons\Doctrine\ORM\GraphQL\Event\QueryBuilder as QueryBuilderEvent;
 use ApiSkeletons\Doctrine\ORM\GraphQL\Filter\QueryBuilder as QueryBuilderFilter;
+use ApiSkeletons\Doctrine\ORM\GraphQL\Metadata;
 use ApiSkeletons\Doctrine\ORM\GraphQL\Type\Entity\Entity;
-use ArrayObject;
 use Closure;
 use Doctrine\ORM\EntityManager;
 use Doctrine\ORM\QueryBuilder;
@@ -28,7 +28,7 @@ public function __construct(
         protected readonly Config $config,
         protected readonly EntityManager $entityManager,
         protected readonly EventDispatcher $eventDispatcher,
-        protected readonly ArrayObject $metadata,
+        protected readonly Metadata $metadata,
     ) {
     }