Merge e621ac1 into 85d635e

.github/workflows/test.yml

@@ -22,7 +22,7 @@ jobs:
       CC_TEST_REPORTER_ID: ${{ secrets.github_token }}
     strategy:
       matrix:
-        php-versions: ['7.1', '7.2', '7.3', '7.4']
+        php-versions: ['7.2', '7.3', '7.4']
 
     steps:
     - name: Checkout

composer.json

@@ -33,7 +33,7 @@
         }
     },
     "require": {
-        "php": "^7.1",
+        "php": "^7.2",
         "psr/container": "^1.0"
     },
     "require-dev": {

src/Container/Resolver.php

@@ -34,6 +34,8 @@ public function handle(callable $instance, array $args = [])
     {
         if (is_string($instance) && false !== strpos($instance, '::')) {
             $instance = explode('::', $instance);
+        } elseif (is_object($instance)) {
+            $instance = (new \ReflectionMethod($instance, '__invoke'))->getClosure($instance);
         }
 
         $params = [];
@@ -64,11 +66,7 @@ public function resolve($concrete)
             return $this->createInstance($concrete);
         }
 
-        if ($concrete instanceof \Closure) {
-            return $concrete->bindTo($this->container);
-        }
-
-        if (is_object($concrete) || is_callable($concrete)) {
+        if ($concrete instanceof \Closure || is_object($concrete) || is_callable($concrete)) {
             return $concrete;
         }
 

test/spec/Container.spec.php

@@ -3,7 +3,7 @@
 use Projek\Container;
 use Projek\Container\{ArrayContainer, ContainerInterface, Exception, NotFoundException, Resolver };
 use Psr\Container\ContainerInterface as PsrContainer;
-use Stubs\ { Dummy, AbstractFoo, ConcreteBar };
+use Stubs\ { Dummy, AbstractFoo, ConcreteBar, ServiceProvider};
 use function Kahlan\describe;
 use function Kahlan\expect;
 
@@ -28,6 +28,15 @@
         expect($this->c->get(PsrContainer::class))->toBeAnInstanceOf(PsrContainer::class);
     });
 
+    it('Should resolve serive provider', function () {
+        $this->c->set('dummy', Dummy::class);
+        $this->c->set(AbstractFoo::class, ConcreteBar::class);
+
+        $this->c->set('myService', ServiceProvider::class);
+
+        expect($this->c->get('myService'))->toEqual('dummy lorem');
+    });
+
     it('Should manage instance', function () {
         $this->c->set('dummy', Dummy::class);
 

test/spec/Resolver.spec.php

@@ -26,7 +26,7 @@
     it('could handle array callable', function () {
         expect(
             $this->r->handle([$this->dummy, 'lorem'])
-        )->toEqual('lorem');
+        )->toEqual('dummy lorem');
 
         expect(
             $this->r->handle([ConcreteBar::class, 'std'])

test/stub/AbstractFoo.php

@@ -4,7 +4,7 @@
 
 abstract class AbstractFoo
 {
-    public function lorem($text = 'lorem')
+    public function lorem(string $text = 'lorem')
     {
         return $text;
     }

test/stub/Dummy.php

@@ -4,9 +4,9 @@
 
 class Dummy
 {
-    public function lorem(AbstractFoo $foo)
+    public function lorem(AbstractFoo $foo, $text = 'dummy lorem')
     {
-        return $foo->lorem();
+        return $foo->lorem($text);
     }
 }
 

test/stub/ServiceProvider.php

@@ -0,0 +1,22 @@
+<?php
+
+namespace Stubs;
+
+class ServiceProvider
+{
+    protected $abs;
+
+    public function __construct(AbstractFoo $abs)
+    {
+        $this->abs = $abs;
+    }
+
+    /**
+     * @param Dummy $d
+     * @return string
+     */
+    public function __invoke($dummy)
+    {
+        return $dummy->lorem($this->abs);
+    }
+}