Implement injection into provide method

ob-ivan · Jan 18, 2018 · 14c5ca6 · 14c5ca6
1 parent 0ef68e1
commit 14c5ca6
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 3 deletions.
diff --git a/src/Container.php b/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);

diff --git a/tests/InjectionReceiverProvider.php b/tests/InjectionReceiverProvider.php
@@ -8,7 +8,7 @@ public function getServiceName(): string {
         return 'service';
     }
 
-    public function provide($param) {
+    public function provide(string $param = '') {
         return (object)[
             'param' => $param,
         ];