[5.4] [WIP] Fix container

src/Illuminate/Container/Container.php

@@ -241,9 +241,11 @@ public function bind($abstract, $concrete = null, $shared = false)
     protected function getClosure($abstract, $concrete)
     {
         return function ($container, $parameters = []) use ($abstract, $concrete) {
-            $method = ($abstract == $concrete) ? 'build' : 'make';
+            if ($abstract == $concrete) {
+                return $container->build($concrete);
+            }
 
-            return $container->$method($concrete, $parameters);
+            return $container->makeWith($concrete, $parameters);
         };
     }
 

src/Illuminate/Foundation/Application.php

@@ -689,6 +689,26 @@ public function registerDeferredProvider($provider, $service = null)
         }
     }
 
+    /**
+     * Resolve the given type from the container.
+     *
+     * (Overriding Container::makeWith)
+     *
+     * @param  string  $abstract
+     * @param  array  $parameters
+     * @return mixed
+     */
+    public function makeWith($abstract, array $parameters)
+    {
+        $abstract = $this->getAlias($abstract);
+
+        if (isset($this->deferredServices[$abstract])) {
+            $this->loadDeferredProvider($abstract);
+        }
+
+        return parent::makeWith($abstract, $parameters);
+    }
+
     /**
      * Resolve the given type from the container.
      *

tests/Container/ContainerTest.php

@@ -799,6 +799,14 @@ public function testResolvingWithArrayOfParameters()
         $this->assertEquals([1, 2, 3], $container->makeWith('foo', [1, 2, 3]));
     }
 
+    public function testResolvingWithUsingAnInterface()
+    {
+        $container = new Container;
+        $container->bind(IContainerContractStub::class, ContainerInjectVariableStubWithInterfaceImplementation::class);
+        $instance = $container->makeWith(IContainerContractStub::class, ['something' => 'laurence']);
+        $this->assertEquals('laurence', $instance->something);
+    }
+
     public function testNestedParameterOverride()
     {
         $container = new Container;
@@ -864,6 +872,7 @@ interface IContainerContractStub
 class ContainerImplementationStub implements IContainerContractStub
 {
 }
+
 class ContainerImplementationStubTwo implements IContainerContractStub
 {
 }
@@ -990,6 +999,16 @@ public function __construct(ContainerConcreteStub $concrete, $something)
     }
 }
 
+class ContainerInjectVariableStubWithInterfaceImplementation implements IContainerContractStub
+{
+    public $something;
+
+    public function __construct(ContainerConcreteStub $concrete, $something)
+    {
+        $this->something = $something;
+    }
+}
+
 function containerTestInject(ContainerConcreteStub $stub, $default = 'taylor')
 {
     return func_get_args();