Introducing CompileVisitor using the visitor pattern

.gitignore

@@ -7,3 +7,4 @@ build
 /.phpcs-cache
 .phpunit.result.cache
 /coverage.xml
+/tests/Fake/tmp

README.md

@@ -9,60 +9,20 @@
 
 Ray.Compiler compiles Ray.Di bindings into PHP code, providing a performance boost that makes Dependency Injection couldn't be any faster.
 
-##  Script Injector
+## Compile Injector
 
-`ScriptInjector` has the same interface as Ray.Di Injector; whereas Ray.Di Injector resolves dependencies based on memory bindings, ScriptInjector executes pre-compiled PHP code and is faster.
+`CompileInjector` is designed to enhance performance by utilizing `Compiler` to compile modules and initializing `AirInjector` for managing dependencies. This approach ensures efficient dependency management and faster execution.
 
-Ray.Di injector
 ```php
-$injector = new Injector(new CarModule); // Ray.Di injector
-```
-
-Ray.Compiler injector
-```php
-$injector = new ScriptInjector($tmpDir, fn => new CarModule);
+$injector = new CompileInjector($tmpDir, fn => new CarModule);
+$car = $injector->getInstance(CarInterface::class);
 ```
 
 ## Precompile
 
-You will want to compile all dependencies into code before deploying the production. The `DiCompiler` will compile all bindings into PHP code.
+You will want to compile all dependencies into code before deploying the production.
 
 ```php
-$compiler = new DiCompiler(new CarModule, $tmpDir);
+$compiler = new Compiler($tmpDir, new CarModule);
 $compiler->compile();
 ```
-
-## Object graph visualization
-
-Object graph can be visualized with `dumpGraph()`.
-Graph HTML files will be output at `graph` folder under `$tmpDir`.
-
-```php
-$compiler = new DiCompiler(new Module, $tmpDir);
-$compiler->compile();
-$compiler->dumpGraph();
-```
-
-```
-open tmp/graph/Ray_Compiler_FakeCarInterface-.html
-```
-
-## CompileInjector
-
-The `CompileInjector` gives you the best performance in both development (x2) and production (x10) by switching two injector.
-
-Get the injector by specifying the binding and cache, depending on the execution context of the application.
-
-```php
-$injector = new CompileInjector($tmpDir, $injectorContext);
-```
-
-`$injectorContext` example: 
-
- * [dev](docs/exmaple/DevInjectorContext.php)
- * [prod](docs/exmaple/ProdInjectorContext.php)
-
-The `__invoke()` method prepares the modules needed in that context.
-The `getCache()` method specifies the cache of the injector itself.
-
-Install `DiCompileModule` in the context for production. The injector is more optimized and dependency errors are reported at compile-time instead of run-time.

composer-require-checker.json

@@ -4,19 +4,8 @@
     "static", "self", "parent",
     "array", "string", "int", "float", "bool", "iterable", "callable", "void", "object",
     "Attribute", "ReflectionAttribute",
-    "Ray\\Di\\AbstractModule", "Ray\\Di\\Annotation\\ScriptDir",
-    "Ray\\Di\\Argument", "Ray\\Di\\Arguments",
-    "Ray\\Di\\AssistedModule", "Ray\\Di\\Bind",
-    "Ray\\Di\\Container", "Ray\\Di\\Dependency",
-    "Ray\\Di\\DependencyInterface","Ray\\Di\\DependencyProvider",
-    "Ray\\Di\\Di\\Qualifier", "Ray\\Di\\Exception\\NotFound",
-    "Ray\\Di\\Exception\\Unbound", "Ray\\Di\\InjectionPointInterface",
-    "Ray\\Di\\Injector", "Ray\\Di\\InjectorInterface", "Ray\\Di\\Instance",
-    "Ray\\Di\\MultiBinding\\Map", "Ray\\Di\\MultiBinding\\MapProvider",
-    "Ray\\Di\\Name", "Ray\\Di\\NullCache",
-    "Ray\\Di\\NullModule", "Ray\\Di\\NullObjectDependency",
-    "Ray\\Di\\ProviderInterface", "Ray\\Di\\ProviderSetModule",
-    "Ray\\Di\\SetContextInterface"
-
+    "Doctrine\\Common\\Annotations\\Reader",
+    "Doctrine\\Common\\Cache\\CacheProvider",
+    "Koriym\\Printo\\Printo"
   ]
 }

composer.json

@@ -12,20 +12,17 @@
     ],
     "require": {
         "php": "^7.2 || ^8.0",
-        "doctrine/annotations": "^1.12 || ^2.0",
-        "doctrine/cache": "^1.10 || ^2.1",
         "koriym/attributes": "^1.0",
         "koriym/null-object": "^1.0",
         "koriym/param-reader": "^1.0",
-        "koriym/printo": "^1.0",
-        "nikic/php-parser": "^4.5 || ^5.0",
-        "ray/aop": "^2.14"
+        "ray/aop": "^2.15",
+        "ray/di": "^2.17.1"
     },
     "require-dev": {
         "ext-pdo": "*",
-        "ray/di": "^2.16",
-        "phpunit/phpunit": "^8.5.24 || ^9.5",
-        "bamarni/composer-bin-plugin": "^1.4"
+        "bamarni/composer-bin-plugin": "^1.4",
+        "doctrine/cache": "^1.0 || ^2.2",
+        "phpunit/phpunit": "^8.5.24 || ^9.5"
     },
     "config": {
         "sort-packages": true,
@@ -35,7 +32,7 @@
     },
     "autoload": {
         "psr-4": {
-            "Ray\\Compiler\\": ["src", "src-deprecated"]
+            "Ray\\Compiler\\": ["src", "src-cached-injector-factory", "src-deprecated"]
         }
     },
     "autoload-dev": {
@@ -53,10 +50,11 @@
         "cs": ["phpcs --standard=./phpcs.xml src tests"],
         "cs-fix": ["phpcbf src tests"],
         "clean": ["phpstan clear-result-cache", "psalm --clear-cache", "rm -rf tests/tmp/*.php"],
-        "sa": ["psalm -c psalm.compiler.xml --show-info=true", "phpstan analyse -c phpstan.neon --no-progress"],
+        "sa": ["psalm -c psalm.compiler.xml --show-info=false", "phpstan analyse -c phpstan.neon --no-progress"],
         "metrics": ["@test", "phpmetrics --report-html=build/metrics --exclude=Exception --log-junit=build/junit.xml --junit=build/junit.xml src"],
-        "phpmd": ["phpmd src/di text ./phpmd.xml"],
-        "build": ["@cs", "@sa", "@pcov", "@metrics"]
+        "phpmd": ["phpmd src text ./phpmd.xml"],
+        "build": ["@cs", "@sa", "@pcov", "@metrics"],
+        "req-check": ["./vendor/bin/composer-require-checker"]
     },
     "extra": {
         "bamarni-bin": {

docs/exmaple/DevInjectorContext.php

@@ -2,11 +2,8 @@
 
 declare(strict_types=1);
 
-use Doctrine\Common\Cache\ApcuCache;
 use Doctrine\Common\Cache\CacheProvider;
 use Ray\Compiler\AbstractInjectorContext;
-use Ray\Compiler\DiCompileModule;
-use Ray\Compiler\FakeCarModule;
 use Ray\Di\AbstractModule;
 use Ray\Di\NullCache;
 

docs/exmaple/ProdInjectorContext.php

@@ -6,7 +6,6 @@
 use Doctrine\Common\Cache\CacheProvider;
 use Ray\Compiler\AbstractInjectorContext;
 use Ray\Compiler\DiCompileModule;
-use Ray\Compiler\FakeCarModule;
 use Ray\Di\AbstractModule;
 
 final class ProdInjectorContext extends AbstractInjectorContext

phpcs.xml

@@ -28,6 +28,7 @@
         <!-- Base -->
         <exclude name="Generic.Formatting.MultipleStatementAlignment.NotSame"/>
         <exclude name="Squiz.Strings.DoubleQuoteUsage.ContainsVar"/>
+        <exclude name="Squiz.Functions.MultiLineFunctionDeclaration.ContentAfterBrace"/>
         <exclude name="SlevomatCodingStandard.Classes.SuperfluousAbstractClassNaming.SuperfluousPrefix"/>
         <exclude name="SlevomatCodingStandard.Classes.SuperfluousExceptionNaming.SuperfluousSuffix"/>
         <exclude name="SlevomatCodingStandard.Classes.SuperfluousInterfaceNaming.SuperfluousSuffix"/>
@@ -39,6 +40,7 @@
         <exclude name="Squiz.PHP.GlobalKeyword.NotAllowed"/>
         <exclude name="SlevomatCodingStandard.PHP.RequireExplicitAssertion.RequiredExplicitAssertion"/>
         <exclude name="SlevomatCodingStandard.Commenting.InlineDocCommentDeclaration.InvalidFormat"/>
+        <exclude name="SlevomatCodingStandard.Functions.UnusedInheritedVariablePassedToClosure.UnusedInheritedVariable" />
         <!-- PHP8 attribute -->
         <exclude name="PSR12.Files.FileHeader.IncorrectOrder"/>
         <!-- /Base -->

phpstan.neon

@@ -6,5 +6,4 @@ parameters:
   excludePaths:
     - tests/tmp/*
     - tests/Fake/*
-  checkGenericClassInNonGenericObjectType: false
 

src/CachedInjectorFactory.php → src-cached-injector-factory/CachedInjectorFactory.php

@@ -7,14 +7,19 @@
 use Doctrine\Common\Cache\CacheProvider;
 use Ray\Di\AbstractModule;
 use Ray\Di\InjectorInterface;
-use Ray\Di\NullCache;
-
 use function assert;
+use function class_exists;
 use function serialize;
 use function unserialize;
 
 final class CachedInjectorFactory
 {
+    public function __construct()
+    {
+        if (! class_exists(CacheProvider::class)) {
+            throw new \RuntimeException('CachedInjectorFactory requires doctrine/cache');
+        }
+    }
     /** @var array<string, string> */
     private static $injectors = [];
 

src/InjectorFactory.php → src-cached-injector-factory/InjectorFactory.php

@@ -9,13 +9,10 @@
 use Ray\Di\Exception\Unbound;
 use Ray\Di\Injector as RayInjector;
 use Ray\Di\InjectorInterface;
-
 use function is_dir;
 use function mkdir;
 
-/**
- * @psalm-immutable
- */
+/** @psalm-immutable */
 final class InjectorFactory
 {
     /**

src-cached-injector-factory/NullCache.php

@@ -0,0 +1,58 @@
+<?php
+
+declare(strict_types=1);
+
+namespace Ray\Compiler;
+
+use Doctrine\Common\Cache\CacheProvider;
+
+final class NullCache extends CacheProvider
+{
+    /**
+     * {@inheritDoc}
+     */
+    protected function doFetch($id)
+    {
+        return false;
+    }
+
+    /**
+     * {@inheritDoc}
+     */
+    protected function doContains($id)
+    {
+        return false;
+    }
+
+    /**
+     * {@inheritDoc}
+     */
+    protected function doSave($id, $data, $lifeTime = 0)
+    {
+        return true;
+    }
+
+    /**
+     * {@inheritDoc}
+     */
+    protected function doDelete($id)
+    {
+        return true;
+    }
+
+    /**
+     * {@inheritDoc}
+     */
+    protected function doFlush()
+    {
+        return true;
+    }
+
+    /**
+     * {@inheritDoc}
+     */
+    protected function doGetStats()
+    {
+        return [];
+    }
+}

src-deprecated/DiCompiler.php

@@ -0,0 +1,67 @@
+<?php
+
+declare(strict_types=1);
+
+namespace Ray\Compiler;
+
+use Ray\Di\AbstractModule;
+use Ray\Di\InjectorInterface;
+use Ray\Di\Name;
+
+/** @deprecated  */
+final class DiCompiler implements InjectorInterface
+{
+    /** @var AirInjector */
+    private $injector;
+
+    /** @var AbstractModule  */
+    private $module;
+
+    /** @var string  */
+    private $scriptDir;
+
+    public function __construct(AbstractModule $module, string $scriptDir)
+    {
+        $this->module = $module;
+        $this->scriptDir = $scriptDir;
+        $this->injector = new AirInjector($scriptDir);
+        $injectorModule = new class ($this->injector) extends AbstractModule {
+            private $injector;
+
+            public function __construct(InjectorInterface $injector)
+            {
+                $this->injector = $injector;
+            }
+
+            protected function configure()
+            {
+                $this->bind(InjectorInterface::class)->toInstance($this->injector);
+            }
+        };
+        $module->install($injectorModule);
+        (new Compiler())->compile($module, $scriptDir);
+    }
+
+    /**
+     * {@inheritdoc}
+     */
+    public function getInstance($interface, $name = Name::ANY)
+    {
+        return $this->injector->getInstance($interface, $name);
+    }
+
+    /** @deprecated  */
+    public function compile(): void
+    {
+    }
+
+    /** @deprecated  */
+    public function savePointcuts(): void
+    {
+    }
+
+    /** @deprecated  */
+    public function dumpGraph(): void
+    {
+    }
+}

src/GraphDumper.php → src-deprecated/GraphDumper.php

@@ -7,7 +7,6 @@
 use Koriym\Printo\Printo;
 use Ray\Di\Container;
 use Ray\Di\Name;
-
 use function assert;
 use function class_exists;
 use function explode;
@@ -16,9 +15,9 @@
 use function interface_exists;
 use function mkdir;
 use function str_replace;
-
 use const LOCK_EX;
 
+/** @deprecated  */
 final class GraphDumper
 {
     /** @var Container */

src/IpQualifier.php → src-deprecated/IpQualifier.php

@@ -5,9 +5,9 @@
 namespace Ray\Compiler;
 
 use ReflectionParameter;
-
 use function serialize;
 
+/** @deprecated  */
 final class IpQualifier
 {
     /** @var ReflectionParameter */