Merge pull request #396 from koriym/injector

Create PackageInjector from Injector
bearsunday · Mar 18, 2022 · 192b3e2 · 192b3e2
2 parents f90c209 + 6f8a5f8
commit 192b3e2
Show file tree

Hide file tree

Showing 2 changed files with 98 additions and 65 deletions.
diff --git a/src/Injector.php b/src/Injector.php
@@ -5,38 +5,21 @@
 namespace BEAR\Package;
 
 use BEAR\AppMeta\Meta;
-use BEAR\Package\Injector\FileUpdate;
-use BEAR\Package\Module\ScriptinjectorModule;
-use BEAR\Sunday\Extension\Application\AppInterface;
-use Ray\Compiler\Annotation\Compile;
-use Ray\Compiler\ScriptInjector;
+use BEAR\Package\Injector\PackageInjector;
 use Ray\Di\AbstractModule;
-use Ray\Di\Injector as RayInjector;
 use Ray\Di\InjectorInterface;
-use Symfony\Component\Cache\Adapter\AdapterInterface;
 use Symfony\Component\Cache\Adapter\ApcuAdapter;
 use Symfony\Component\Cache\Adapter\ChainAdapter;
 use Symfony\Component\Cache\Adapter\FilesystemAdapter;
 use Symfony\Contracts\Cache\CacheInterface;
 
-use function assert;
-use function is_bool;
-use function is_dir;
-use function mkdir;
 use function str_replace;
 
+/**
+ * @see PackageInjector
+ */
 final class Injector
 {
-    /**
-     * Serialized injector instances
-     *
-     * @var array<string, InjectorInterface>
-     */
-    private static array $instances;
-
-    /** @var array<string, AbstractModule> */
-    private static array $modules;
-
     /**
      * @codeCoverageIgnore
      */
@@ -46,55 +29,15 @@ private function __construct()
 
     public static function getInstance(string $appName, string $context, string $appDir, ?CacheInterface $cache = null): InjectorInterface
     {
-        $injectorId = str_replace('\\', '_', $appName) . $context;
-        if (isset(self::$instances[$injectorId])) {
-            return self::$instances[$injectorId];
-        }
-
         $meta = new Meta($appName, $context, $appDir);
-        $cache ??= new ChainAdapter([new ApcuAdapter($injectorId), new FilesystemAdapter($injectorId, 0, $meta->tmpDir . '/injector')]);
-        assert($cache instanceof AdapterInterface);
-        /** @psalm-suppress all */
-        [$injector, $fileUpdate] = $cache->getItem($injectorId)->get(); // @phpstan-ignore-line
-        $isCacheableInjector = $injector instanceof ScriptInjector || ($injector instanceof InjectorInterface && $fileUpdate instanceof FileUpdate && $fileUpdate->isNotUpdated($meta));
-        if (! $isCacheableInjector) {
-            $injector = self::factory($meta, $context);
-            $cache->save($cache->getItem($injectorId)->set([$injector, new FileUpdate($meta)]));
-        }
-
-        self::$instances[$injectorId] = $injector;
+        $cacheNamespace = str_replace('/', '_', $appDir) . $context;
+        $cache ??= new ChainAdapter([new ApcuAdapter($cacheNamespace), new FilesystemAdapter('', 0, $meta->tmpDir . '/injector')]);
 
-        return $injector;
+        return PackageInjector::getInstance($meta, $context, $cache);
     }
 
     public static function getOverrideInstance(string $appName, string $context, string $appDir, AbstractModule $overrideModule): InjectorInterface
     {
-        return self::factory(new Meta($appName, $context, $appDir), $context, $overrideModule);
-    }
-
-    private static function factory(Meta $meta, string $context, ?AbstractModule $overideModule = null): InjectorInterface
-    {
-        $scriptDir = $meta->tmpDir . '/di';
-        ! is_dir($scriptDir) && ! @mkdir($scriptDir) && ! is_dir($scriptDir);
-        $moduleId = $meta->appDir . $context;
-        if (! isset(self::$modules[$moduleId])) {
-            self::$modules[$moduleId] = (new Module())($meta, $context);
-        }
-
-        $module = self::$modules[$moduleId];
-        if ($overideModule instanceof AbstractModule) {
-            $module->override($overideModule);
-        }
-
-        $injector = new RayInjector($module, $scriptDir);
-        $isProd = $injector->getInstance('', Compile::class);
-        assert(is_bool($isProd));
-        if ($isProd) {
-            $injector = new ScriptInjector($scriptDir, static fn () => new ScriptinjectorModule($scriptDir, $module));
-        }
-
-        $injector->getInstance(AppInterface::class);
-
-        return $injector;
+        return PackageInjector::factory(new Meta($appName, $context, $appDir), $context, $overrideModule);
     }
 }
diff --git a/src/Injector/PackageInjector.php b/src/Injector/PackageInjector.php
@@ -0,0 +1,90 @@
+<?php
+
+declare(strict_types=1);
+
+namespace BEAR\Package\Injector;
+
+use BEAR\AppMeta\AbstractAppMeta;
+use BEAR\Package\Module;
+use BEAR\Package\Module\ScriptinjectorModule;
+use BEAR\Sunday\Extension\Application\AppInterface;
+use Ray\Compiler\Annotation\Compile;
+use Ray\Compiler\ScriptInjector;
+use Ray\Di\AbstractModule;
+use Ray\Di\Injector as RayInjector;
+use Ray\Di\InjectorInterface;
+use Symfony\Component\Cache\Adapter\AdapterInterface;
+use Symfony\Contracts\Cache\CacheInterface;
+
+use function assert;
+use function is_bool;
+use function is_dir;
+use function mkdir;
+use function str_replace;
+
+final class PackageInjector
+{
+    /**
+     * Serialized injector instances
+     *
+     * @var array<string, InjectorInterface>
+     */
+    private static array $instances;
+
+    /** @var array<string, AbstractModule> */
+    private static array $modules;
+
+    /**
+     * @codeCoverageIgnore
+     */
+    private function __construct()
+    {
+    }
+
+    public static function getInstance(AbstractAppMeta $meta, string $context, ?CacheInterface $cache): InjectorInterface
+    {
+        $injectorId = str_replace('\\', '_', $meta->name) . $context;
+        if (isset(self::$instances[$injectorId])) {
+            return self::$instances[$injectorId];
+        }
+
+        assert($cache instanceof AdapterInterface);
+        /** @psalm-suppress all */
+        [$injector, $fileUpdate] = $cache->getItem($injectorId)->get(); // @phpstan-ignore-line
+        $isCacheableInjector = $injector instanceof ScriptInjector || ($injector instanceof InjectorInterface && $fileUpdate instanceof FileUpdate && $fileUpdate->isNotUpdated($meta));
+        if (! $isCacheableInjector) {
+            $injector = self::factory($meta, $context);
+            $cache->save($cache->getItem($injectorId)->set([$injector, new FileUpdate($meta)]));
+        }
+
+        self::$instances[$injectorId] = $injector;
+
+        return $injector;
+    }
+
+    public static function factory(AbstractAppMeta $meta, string $context, ?AbstractModule $overideModule = null): InjectorInterface
+    {
+        $scriptDir = $meta->tmpDir . '/di';
+        ! is_dir($scriptDir) && ! @mkdir($scriptDir) && ! is_dir($scriptDir);
+        $moduleId = $meta->appDir . $context;
+        if (! isset(self::$modules[$moduleId])) {
+            self::$modules[$moduleId] = (new Module())($meta, $context);
+        }
+
+        $module = self::$modules[$moduleId];
+        if ($overideModule instanceof AbstractModule) {
+            $module->override($overideModule);
+        }
+
+        $injector = new RayInjector($module, $scriptDir);
+        $isProd = $injector->getInstance('', Compile::class);
+        assert(is_bool($isProd));
+        if ($isProd) {
+            $injector = new ScriptInjector($scriptDir, static fn () => new ScriptinjectorModule($scriptDir, $module));
+        }
+
+        $injector->getInstance(AppInterface::class);
+
+        return $injector;
+    }
+}