Merge pull request #291 from ray-di/provider-serialisable

Serializable provider provider

Author: koriym

.github/workflows/coding-standards.yml

@@ -9,4 +9,4 @@ jobs:
   cs:
     uses: ray-di/.github/.github/workflows/coding-standards.yml@v1
     with:
-      php_version: 8.1
+      php_version: 8.3

.github/workflows/demo-php8.yml

@@ -16,7 +16,7 @@ jobs:
       - name: Setup PHP
         uses: shivammathur/setup-php@v2
         with:
-          php-version: 8.1
+          php-version: 8.3
           tools: cs2pr
           coverage: none
 

.github/workflows/static-analysis.yml

@@ -9,4 +9,4 @@ jobs:
   sa:
     uses: ray-di/.github/.github/workflows/static-analysis.yml@v1
     with:
-      php_version: 8.1
+      php_version: 8.3

phpstan.neon

@@ -9,6 +9,7 @@ parameters:
     - tests/di/tmp/*
     - tests/Di/tmp/*
     - tests/di/Fake/*
+    - tests/di/Ray_Di_*
   ignoreErrors:
     - '#contains generic class ReflectionAttribute but does not specify its types:#'
     - '#generic class ReflectionAttribute but does not specify its types:#'

src/di/ProviderProvider.php

@@ -0,0 +1,33 @@
+<?php
+
+declare(strict_types=1);
+
+namespace Ray\Di;
+
+use Ray\Di\Di\Set;
+
+/**
+ * @implements ProviderInterface<mixed>
+ * @template T of object
+ */
+final class ProviderProvider implements ProviderInterface
+{
+    /** @var InjectorInterface  */
+    private $injector;
+
+    /** @var Set<T> */
+    private $set;
+
+    /** @param Set<T> $set */
+    public function __construct(InjectorInterface $injector, Set $set)
+    {
+        $this->injector = $injector;
+        $this->set = $set;
+    }
+
+    /** @return mixed */
+    public function get()
+    {
+        return $this->injector->getInstance($this->set->interface, $this->set->name);
+    }
+}

src/di/ProviderSetProvider.php

@@ -48,30 +48,6 @@ public function get()
             throw new SetNotFound((string) $this->ip->getParameter());
         }
 
-        return new class ($this->injector, $set) implements ProviderInterface
-        {
-            /** @var InjectorInterface  */
-            private $injector;
-
-            /** @var Set<object>  */
-            private $set;
-
-            /**
-             * @param Set<object> $set
-             */
-            public function __construct(InjectorInterface $injector, Set $set)
-            {
-                $this->injector = $injector;
-                $this->set = $set;
-            }
-
-            /**
-             * @return mixed
-             */
-            public function get()
-            {
-                return $this->injector->getInstance($this->set->interface, $this->set->name);
-            }
-        };
+        return new ProviderProvider($this->injector, $set);
     }
 }

tests/di/ProviderProviderTest.php

@@ -0,0 +1,27 @@
+<?php
+
+declare(strict_types=1);
+
+namespace Ray\Di;
+
+use PHPUnit\Framework\TestCase;
+use Ray\Di\Di\Set;
+
+class ProviderProviderTest extends TestCase
+{
+    public function testGet(): void
+    {
+        $injector = new Injector(
+            new class extends AbstractModule {
+                protected function configure()
+                {
+                    $this->bind(FakeEngineInterface::class)->toInstance(new FakeEngine());
+                }
+            }
+        );
+        $set = new Set(FakeEngineInterface::class);
+        $provider = new ProviderProvider($injector, $set);
+        $instance = $provider->get();
+        $this->assertInstanceOf(FakeEngine::class, $instance);
+    }
+}

tests/di/VisitorTest.php

@@ -30,7 +30,7 @@ class VisitorTest extends TestCase
     public function setUp(): void
     {
         $this->visitor = new NullVisitor();
-        $this->container = (new ContainerFactory())(new FakeCarModule(), __DIR__);
+        $this->container = (new ContainerFactory())(new FakeCarModule(), __DIR__ . '/tmp');
         $container = $this->container->getContainer();
         $dependency = $container['Ray\Di\FakeCarInterface-'];
         assert($dependency instanceof Dependency);