Merge pull request #13 from TomHAnderson/feature/di-hydrators

Use DI for all hydrators

src/HydratorManager.php

@@ -8,6 +8,7 @@
 use Illuminate\Pagination\LengthAwarePaginator;
 use Illuminate\Support\Collection;
 
+use function app;
 use function collect;
 use function get_class;
 use function is_object;
@@ -73,9 +74,11 @@ public function extract(mixed $class, ?string $overrideHydrator = null): Collect
             throw new Exception\NoHydrator(get_class($class));
         }
 
+        // Use DI for hydrators
         $extractorClass = $overrideHydrator ?: $this->classHydrators[get_class($class)];
+        $hydrator       = app($extractorClass);
 
-        return (new $extractorClass())->setHydratorManager($this)->extract($class);
+        return $hydrator->setHydratorManager($this)->extract($class);
     }
 
     /**

test/HydratorManagerTest.php

@@ -6,7 +6,9 @@
 
 use ApiSkeletons\Laravel\HAL\Exception\NoHydrator;
 use ApiSkeletons\Laravel\HAL\Resource;
+use ApiSkeletonsTest\Laravel\HAL\Hydrator\DiHydrator;
 use ApiSkeletonsTest\Laravel\HAL\Model\User;
+use Illuminate\Foundation\Application;
 use Illuminate\Pagination\LengthAwarePaginator;
 use Illuminate\Support\Collection;
 use PHPUnit\Framework\TestCase;
@@ -53,6 +55,18 @@ public function testExtract(): void
         $this->assertEquals('https://test/user/1', $array['_links']['self']['href']);
     }
 
+    public function testDiExtract(): void
+    {
+        $hydratorManager = new HydratorManager();
+        $user            = new User();
+
+        $resource = $hydratorManager->extract($user, DiHydrator::class);
+        $this->assertInstanceOf(Resource::class, $resource);
+
+        $array = $resource->toArray();
+        $this->assertEquals(Application::class, $array['app']);
+    }
+
     public function testNoHydratorInExtract(): void
     {
         $this->expectException(NoHydrator::class);

test/src/Hydrator/DiHydrator.php

@@ -0,0 +1,31 @@
+<?php
+
+declare(strict_types=1);
+
+namespace ApiSkeletonsTest\Laravel\HAL\Hydrator;
+
+use ApiSkeletons\Laravel\HAL\Hydrator;
+use ApiSkeletons\Laravel\HAL\Resource;
+use Illuminate\Foundation\Application;
+
+use function get_class;
+
+final class DiHydrator extends Hydrator
+{
+    private Application $app;
+
+    public function __construct(Application $app)
+    {
+        $this->app = $app;
+    }
+
+    /** {@inheritdoc} */
+    public function extract($class): Resource
+    {
+        $data = [
+            'app' => get_class($this->app),
+        ];
+
+        return $this->hydratorManager->resource($data);
+    }
+}