Merge branch 'inject-into-provide'

src/Container.php

@@ -29,7 +29,7 @@ public function __construct(array $config = [], $selfName = '') {
     public function connect(ProviderInterface $provider) {
         $this->register($provider->getServiceName(), function () use ($provider) {
             $this->injectRecursive($provider);
-            return $provider->provide();
+            return $this->inject([$provider, 'provide']);
         });
     }
 
@@ -90,7 +90,7 @@ public function get($name) {
 
     private function injectRecursive($consumer) {
         if (is_callable($consumer)) {
-            $parameters = $this->getParameterValues(new \ReflectionFunction($consumer));
+            $parameters = $this->getParameterValues(new \ReflectionFunction(\Closure::fromCallable($consumer)));
             return $consumer(...$parameters);
         } else {
             $consumer = $this->injectDeclarer($consumer);

tests/ContainerTest.php

@@ -89,4 +89,14 @@ public function testMerge() {
         $this->assertSame($request, $consumer->getRequest(), 'Must inject request from request container');
         $this->assertSame($mergedContainer, $consumer->getContainer(), 'Must inject merged container');
     }
+
+    public function testInjectIntoProvider() {
+        $param = 'R2D2';
+        $container = new Container([
+            'param' => $param,
+        ]);
+        $container->connect(new InjectionReceiverProvider());
+        $service = $container->get('service');
+        $this->assertSame($param, $service->param, 'Must inject param into service');
+    }
 }

tests/InjectionReceiverProvider.php

@@ -0,0 +1,16 @@
+<?php
+namespace tests;
+
+use SD\DependencyInjection\ProviderInterface;
+
+class InjectionReceiverProvider implements ProviderInterface {
+    public function getServiceName(): string {
+        return 'service';
+    }
+
+    public function provide(string $param = '') {
+        return (object)[
+            'param' => $param,
+        ];
+    }
+}