Merge pull request #405 from bearsunday/remove_module_cache

Remove module cache in getOverrideInstance

composer.json

@@ -92,6 +92,7 @@
     },
     "config": {
         "allow-plugins": {
+            "bamarni/composer-bin-plugin": true,
             "dealerdirect/phpcodesniffer-composer-installer": true
         }
     }

phpstan.neon

@@ -8,3 +8,4 @@ parameters:
     - tests/tmp/*
     - tests/Fake/*
     - tests/script/*
+    - tests/Injector/Fake/fake-app/var/tmp/*

src/Compiler/CompileDiScripts.php

@@ -11,7 +11,6 @@
 use Ray\Di\InjectorInterface;
 
 use function assert;
-use function class_exists;
 
 final class CompileDiScripts
 {
@@ -38,7 +37,6 @@ public function __invoke(AbstractAppMeta $appMeta): void
         $metas = $appMeta->getResourceListGenerator();
         foreach ($metas as $meta) {
             [$className] = $meta;
-            assert(class_exists($className));
             $this->scanClass($reader, $namedParams, $className);
         }
     }

src/Compiler/FakeRun.php

@@ -53,15 +53,15 @@ public function __invoke(): void
         ($bootstrap)($this->appMeta->name, $this->context, $GLOBALS, $_SERVER); // @phpstan-ignore-line
         $_SERVER['REQUEST_METHOD'] = 'DELETE';
         $app = $this->injector->getInstance(AppInterface::class);
-        assert(property_exists($app, 'resource')); // @phpstan-ignore-line
-        assert(property_exists($app, 'responder')); // @phpstan-ignore-line
+        assert(property_exists($app, 'resource'));
+        assert(property_exists($app, 'responder'));
         $ro = $this->injector->getInstance(NullPage::class);
-        $ro->uri = new Uri('app://self/'); // @phpstan-ignore-line
+        $ro->uri = new Uri('app://self/');
         /** @var NullPage $ro */
-        $ro = $app->resource->get->object($ro)(['required' => 'string']); // @phpstan-ignore-line
-        assert($app->responder instanceof TransferInterface); // @phpstan-ignore-line
+        $ro = $app->resource->get->object($ro)(['required' => 'string']);
+        assert($app->responder instanceof TransferInterface);
         ob_start();
-        $ro->transfer($app->responder, []); // @phpstan-ignore-line
+        $ro->transfer($app->responder, []);
         ob_end_clean();
         class_exists(HttpCacheInterface::class);
         class_exists(HttpCache::class);

src/Context/ProdModule.php

@@ -46,6 +46,7 @@ private function installCacheModule(): void
     {
         $this->install(new ProdQueryRepositoryModule());
         $this->install(new Psr6ApcuModule());
+        /** @psalm-suppress DeprecatedClass */
         $this->bind(CacheItemInterface::class)->annotatedWith(EtagPool::class)->toProvider(LocalCacheProvider::class);
         $this->bind(Reader::class)->toConstructor(
             PsrCachedReader::class,

src/Injector/FileUpdate.php

@@ -83,7 +83,7 @@ private function getFiles(string $path, string $regex): array
 
         $files = [];
         /** @var RegexIterator<string, SplFileInfo> $iterator */
-        foreach ($iterator as $fileName => $fileInfo) {
+        foreach ($iterator as $fileName => $fileInfo) { // @phpstan-ignore-line
             if ($fileInfo->isFile() && $fileInfo->getFilename()[0] !== '.') {
                 $files[] = $fileName;
             }

src/Injector/PackageInjector.php

@@ -31,9 +31,6 @@ final class PackageInjector
      */
     private static array $instances;
 
-    /** @var array<string, AbstractModule> */
-    private static array $modules;
-
     /**
      * @codeCoverageIgnore
      */
@@ -66,12 +63,8 @@ public static function factory(AbstractAppMeta $meta, string $context, ?Abstract
     {
         $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 = (new Module())($meta, $context);
 
-        $module = self::$modules[$moduleId];
         if ($overideModule instanceof AbstractModule) {
             $module->override($overideModule);
         }

tests/Fake/fake-app/src/FakeDep2.php

@@ -0,0 +1,12 @@
+<?php
+
+declare(strict_types=1);
+
+namespace FakeVendor\HelloWorld;
+
+class FakeDep2 implements FakeDepInterface
+{
+    public function foo()
+    {
+    }
+}

tests/Fake/fake-app/src/Resource/Page/Injection.php

@@ -0,0 +1,19 @@
+<?php
+
+declare(strict_types=1);
+
+namespace FakeVendor\HelloWorld\Resource\Page;
+
+use BEAR\Resource\ResourceObject;
+use FakeVendor\HelloWorld\FakeDepInterface;
+use FooName\FooInterface;
+
+
+class Injection extends ResourceObject
+{
+    public FakeDepInterface $foo;
+    public function __construct(FakeDepInterface $foo)
+    {
+        $this->foo = $foo;
+    }
+}

tests/Injector/PackageInjectorTest.php

@@ -0,0 +1,48 @@
+<?php
+
+declare(strict_types=1);
+
+namespace BEAR\Package\Injector;
+
+use BEAR\Package\Injector;
+use BEAR\Resource\ResourceInterface;
+use FakeVendor\HelloWorld\FakeDep;
+use FakeVendor\HelloWorld\FakeDep2;
+use FakeVendor\HelloWorld\FakeDepInterface;
+use FakeVendor\HelloWorld\Resource\Page\Injection;
+use PHPUnit\Framework\TestCase;
+use Ray\Di\AbstractModule;
+
+use function assert;
+use function dirname;
+
+class PackageInjectorTest extends TestCase
+{
+    public function testOriginalBind(): void
+    {
+        $injector = Injector::getInstance('FakeVendor\HelloWorld', 'app', dirname(__DIR__) . '/Fake/fake-app');
+        $resource = $injector->getInstance(ResourceInterface::class);
+        assert($resource instanceof ResourceInterface);
+        $page = $resource->newInstance('page://self/injection');
+        assert($page instanceof Injection);
+        $this->assertInstanceOf(FakeDep::class, $page->foo);
+    }
+
+    /**
+     * @depends testOriginalBind
+     */
+    public function testGetOverrideInstance(): void
+    {
+        $injector = Injector::getOverrideInstance('FakeVendor\HelloWorld', 'app', dirname(__DIR__) . '/Fake/fake-app', new class extends AbstractModule{
+            protected function configure()
+            {
+                $this->bind(FakeDepInterface::class)->to(FakeDep2::class);
+            }
+        });
+        $resource = $injector->getInstance(ResourceInterface::class);
+        assert($resource instanceof ResourceInterface);
+        $page = $resource->newInstance('page://self/injection');
+        assert($page instanceof Injection);
+        $this->assertInstanceOf(FakeDep2::class, $page->foo);
+    }
+}