Merge pull request #5 from kawanamiyuu/injector-factory

Injector factory

.gitignore

@@ -1,3 +1,4 @@
+/build/
 /vendor/
 /composer.lock
 /.phpunit.result.cache

README.md

@@ -7,25 +7,20 @@ use Acme\BarMiddleware;
 use Acme\BuzRequestHandler;
 use Acme\FooMiddleware;
 use K9u\Framework\ApplicationInterface;
+use K9u\Framework\CachedInjectorFactory;
 use K9u\Framework\FrameworkModule;
 use Laminas\Diactoros\ServerRequestFactory;
-use Ray\Compiler\ScriptInjector;
-use Ray\Di\Bind;
-use Ray\Di\InjectorInterface;
 
 $module = new FrameworkModule([
     FooMiddleware::class,
     BarMiddleware::class,
     BuzRequestHandler::class,
 ]);
 
-$injector = new ScriptInjector('/path/to/cache', function () use (&$injector, $module) {
-    (new Bind($module->getContainer(), InjectorInterface::class))->toInstance($injector);
-    return $module;
-});
+$injector = (new CachedInjectorFactory('/path/to/cache'))($module);
 
 $app = $injector->getInstance(ApplicationInterface::class);
-assert($app instanceof ApplicationInterface);
+/* @var ApplicationInterface $app */
 
 $request = ServerRequestFactory::fromGlobals();
 

src/CachedInjectorFactory.php

@@ -0,0 +1,30 @@
+<?php
+
+declare(strict_types=1);
+
+namespace K9u\Framework;
+
+use Ray\Compiler\ScriptInjector;
+use Ray\Di\AbstractModule;
+use Ray\Di\Bind;
+use Ray\Di\InjectorInterface;
+
+class CachedInjectorFactory implements InjectorFactoryInterface
+{
+    private string $cacheDir;
+
+    public function __construct(string $cacheDir)
+    {
+        $this->cacheDir = $cacheDir;
+    }
+
+    public function __invoke(AbstractModule $module): InjectorInterface
+    {
+        $injector = new ScriptInjector($this->cacheDir, function () use (&$injector, $module) {
+            (new Bind($module->getContainer(), InjectorInterface::class))->toInstance($injector);
+            return $module;
+        });
+
+        return $injector;
+    }
+}

src/InjectorFactoryInterface.php

@@ -0,0 +1,13 @@
+<?php
+
+declare(strict_types=1);
+
+namespace K9u\Framework;
+
+use Ray\Di\AbstractModule;
+use Ray\Di\InjectorInterface;
+
+interface InjectorFactoryInterface
+{
+    public function __invoke(AbstractModule $module): InjectorInterface;
+}

src/OnDemandInjectorFactory.php

@@ -0,0 +1,17 @@
+<?php
+
+declare(strict_types=1);
+
+namespace K9u\Framework;
+
+use Ray\Di\AbstractModule;
+use Ray\Di\Injector;
+use Ray\Di\InjectorInterface;
+
+class OnDemandInjectorFactory implements InjectorFactoryInterface
+{
+    public function __invoke(AbstractModule $module): InjectorInterface
+    {
+        return new Injector($module);
+    }
+}

tests/FrameworkModuleTest.php

@@ -5,19 +5,27 @@
 namespace K9u\Framework;
 
 use PHPUnit\Framework\TestCase;
-use Ray\Di\Injector;
+use Ray\Compiler\DiCompiler;
 
 class FrameworkModuleTest extends TestCase
 {
+    public function setUp(): void
+    {
+        array_map('unlink', glob(__DIR__ . '/../build/tests/*'));
+    }
+
     public function testCompile(): void
     {
-        $injector = new Injector(new FrameworkModule([
+        $module = new FrameworkModule([
             FakeMiddleware::class,
             FakeRequestHandler::class
-        ]));
+        ]);
 
-        $instance = $injector->getInstance(ApplicationInterface::class);
+        $compiler = new DiCompiler($module, __DIR__ . '/../build/tests');
+        $instance = $compiler->getInstance(ApplicationInterface::class);
 
         $this->assertInstanceOf(ApplicationInterface::class, $instance);
+
+//        $compiler->dumpGraph();
     }
 }