Merge pull request #94 from NaokiTsuchiya/script-injector-interface

Using ScriptInjectorInterface

src/CachedInjectorFactory.php

@@ -39,14 +39,14 @@ public static function getInstance(string $injectorId, string $scriptDir, callab
         /** @psalm-suppress DeprecatedClass */
         $cache = $cache ?? new NullCache();
         $cache->setNamespace($injectorId);
-        $cachedInjector = $cache->fetch(InjectorInterface::class);
-        if ($cachedInjector instanceof InjectorInterface) {
+        $cachedInjector = $cache->fetch(ScriptInjectorInterface::class);
+        if ($cachedInjector instanceof ScriptInjectorInterface) {
             return $cachedInjector; // @codeCoverageIgnore
         }
 
         $injector = self::getInjector($modules, $scriptDir, $savedSingletons);
-        if ($injector instanceof ScriptInjector) {
-            $cache->save(InjectorInterface::class, $injector);
+        if ($injector instanceof ScriptInjectorInterface) {
+            $cache->save(ScriptInjectorInterface::class, $injector);
         }
 
         self::$injectors[$injectorId] = serialize($injector);

src/CompileInjector.php

@@ -7,7 +7,6 @@
 use Ray\Compiler\Exception\Unbound;
 use Ray\Di\Annotation\ScriptDir;
 use Ray\Di\Bind;
-use Ray\Di\InjectorInterface;
 use Ray\Di\Name;
 use ReflectionParameter;
 
@@ -18,7 +17,7 @@
 use function sprintf;
 use function str_replace;
 
-final class CompileInjector implements InjectorInterface
+final class CompileInjector implements ScriptInjectorInterface
 {
     public const INSTANCE = '%s/%s.php';
 

src/ScriptInjector.php

@@ -11,7 +11,6 @@
 use Ray\Di\Bind;
 use Ray\Di\Dependency;
 use Ray\Di\DependencyInterface;
-use Ray\Di\InjectorInterface;
 use Ray\Di\Name;
 use Ray\Di\NullModule;
 use Ray\Di\ProviderSetModule;
@@ -39,7 +38,7 @@
 use const DIRECTORY_SEPARATOR;
 use const E_NOTICE;
 
-final class ScriptInjector implements InjectorInterface
+final class ScriptInjector implements ScriptInjectorInterface
 {
     public const MODULE = '/_module.txt';
 

src/ScriptInjectorInterface.php

@@ -0,0 +1,14 @@
+<?php
+
+declare(strict_types=1);
+
+namespace Ray\Compiler;
+
+use Ray\Di\InjectorInterface;
+
+/**
+ * Injector interface for script injector based injector
+ */
+interface ScriptInjectorInterface extends InjectorInterface
+{
+}