Merge pull request #13 from laravel/master

Master

Author: imanghafoori1

tests/Container/ContainerTest.php

@@ -426,181 +426,12 @@ public function testBindingResolutionExceptionMessage()
 
     /**
      * @expectedException \Illuminate\Contracts\Container\BindingResolutionException
-     * @expectedExceptionMessage Target [Illuminate\Tests\Container\IContainerContractStub] is not instantiable while building [Illuminate\Tests\Container\ContainerTestContextInjectOne].
+     * @expectedExceptionMessage Target [Illuminate\Tests\Container\IContainerContractStub] is not instantiable while building [Illuminate\Tests\Container\ContainerDependentStub].
      */
     public function testBindingResolutionExceptionMessageIncludesBuildStack()
     {
         $container = new Container;
-        $container->make(ContainerTestContextInjectOne::class, []);
-    }
-
-    public function testContainerCanInjectDifferentImplementationsDependingOnContext()
-    {
-        $container = new Container;
-
-        $container->bind(IContainerContractStub::class, ContainerImplementationStub::class);
-
-        $container->when(ContainerTestContextInjectOne::class)->needs(IContainerContractStub::class)->give(ContainerImplementationStub::class);
-        $container->when(ContainerTestContextInjectTwo::class)->needs(IContainerContractStub::class)->give(ContainerImplementationStubTwo::class);
-
-        $one = $container->make(ContainerTestContextInjectOne::class);
-        $two = $container->make(ContainerTestContextInjectTwo::class);
-
-        $this->assertInstanceOf(ContainerImplementationStub::class, $one->impl);
-        $this->assertInstanceOf(ContainerImplementationStubTwo::class, $two->impl);
-
-        /*
-         * Test With Closures
-         */
-        $container = new Container;
-
-        $container->bind(IContainerContractStub::class, ContainerImplementationStub::class);
-
-        $container->when(ContainerTestContextInjectOne::class)->needs(IContainerContractStub::class)->give(ContainerImplementationStub::class);
-        $container->when(ContainerTestContextInjectTwo::class)->needs(IContainerContractStub::class)->give(function ($container) {
-            return $container->make(ContainerImplementationStubTwo::class);
-        });
-
-        $one = $container->make(ContainerTestContextInjectOne::class);
-        $two = $container->make(ContainerTestContextInjectTwo::class);
-
-        $this->assertInstanceOf(ContainerImplementationStub::class, $one->impl);
-        $this->assertInstanceOf(ContainerImplementationStubTwo::class, $two->impl);
-    }
-
-    public function testContextualBindingWorksForExistingInstancedBindings()
-    {
-        $container = new Container;
-
-        $container->instance(IContainerContractStub::class, new ContainerImplementationStub);
-
-        $container->when(ContainerTestContextInjectOne::class)->needs(IContainerContractStub::class)->give(ContainerImplementationStubTwo::class);
-
-        $this->assertInstanceOf(ContainerImplementationStubTwo::class, $container->make(ContainerTestContextInjectOne::class)->impl);
-    }
-
-    public function testContextualBindingWorksForNewlyInstancedBindings()
-    {
-        $container = new Container;
-
-        $container->when(ContainerTestContextInjectOne::class)->needs(IContainerContractStub::class)->give(ContainerImplementationStubTwo::class);
-
-        $container->instance(IContainerContractStub::class, new ContainerImplementationStub);
-
-        $this->assertInstanceOf(
-            ContainerImplementationStubTwo::class,
-            $container->make(ContainerTestContextInjectOne::class)->impl
-        );
-    }
-
-    public function testContextualBindingWorksOnExistingAliasedInstances()
-    {
-        $container = new Container;
-
-        $container->instance('stub', new ContainerImplementationStub);
-        $container->alias('stub', IContainerContractStub::class);
-
-        $container->when(ContainerTestContextInjectOne::class)->needs(IContainerContractStub::class)->give(ContainerImplementationStubTwo::class);
-
-        $this->assertInstanceOf(
-            ContainerImplementationStubTwo::class,
-            $container->make(ContainerTestContextInjectOne::class)->impl
-        );
-    }
-
-    public function testContextualBindingWorksOnNewAliasedInstances()
-    {
-        $container = new Container;
-
-        $container->when(ContainerTestContextInjectOne::class)->needs(IContainerContractStub::class)->give(ContainerImplementationStubTwo::class);
-
-        $container->instance('stub', new ContainerImplementationStub);
-        $container->alias('stub', IContainerContractStub::class);
-
-        $this->assertInstanceOf(
-            ContainerImplementationStubTwo::class,
-            $container->make(ContainerTestContextInjectOne::class)->impl
-        );
-    }
-
-    public function testContextualBindingWorksOnNewAliasedBindings()
-    {
-        $container = new Container;
-
-        $container->when(ContainerTestContextInjectOne::class)->needs(IContainerContractStub::class)->give(ContainerImplementationStubTwo::class);
-
-        $container->bind('stub', ContainerImplementationStub::class);
-        $container->alias('stub', IContainerContractStub::class);
-
-        $this->assertInstanceOf(
-            ContainerImplementationStubTwo::class,
-            $container->make(ContainerTestContextInjectOne::class)->impl
-        );
-    }
-
-    public function testContextualBindingWorksForMultipleClasses()
-    {
-        $container = new Container;
-
-        $container->bind(IContainerContractStub::class, ContainerImplementationStub::class);
-
-        $container->when([ContainerTestContextInjectTwo::class, ContainerTestContextInjectThree::class])->needs(IContainerContractStub::class)->give(ContainerImplementationStubTwo::class);
-
-        $this->assertInstanceOf(
-            ContainerImplementationStub::class,
-            $container->make(ContainerTestContextInjectOne::class)->impl
-        );
-
-        $this->assertInstanceOf(
-            ContainerImplementationStubTwo::class,
-            $container->make(ContainerTestContextInjectTwo::class)->impl
-        );
-
-        $this->assertInstanceOf(
-            ContainerImplementationStubTwo::class,
-            $container->make(ContainerTestContextInjectThree::class)->impl
-        );
-    }
-
-    public function testContextualBindingDoesntOverrideNonContextualResolution()
-    {
-        $container = new Container;
-
-        $container->instance('stub', new ContainerImplementationStub);
-        $container->alias('stub', IContainerContractStub::class);
-
-        $container->when(ContainerTestContextInjectTwo::class)->needs(IContainerContractStub::class)->give(ContainerImplementationStubTwo::class);
-
-        $this->assertInstanceOf(
-            ContainerImplementationStubTwo::class,
-            $container->make(ContainerTestContextInjectTwo::class)->impl
-        );
-
-        $this->assertInstanceOf(
-            ContainerImplementationStub::class,
-            $container->make(ContainerTestContextInjectOne::class)->impl
-        );
-    }
-
-    public function testContextuallyBoundInstancesAreNotUnnecessarilyRecreated()
-    {
-        ContainerTestContextInjectInstantiations::$instantiations = 0;
-
-        $container = new Container;
-
-        $container->instance(IContainerContractStub::class, new ContainerImplementationStub);
-        $container->instance(ContainerTestContextInjectInstantiations::class, new ContainerTestContextInjectInstantiations);
-
-        $this->assertEquals(1, ContainerTestContextInjectInstantiations::$instantiations);
-
-        $container->when(ContainerTestContextInjectOne::class)->needs(IContainerContractStub::class)->give(ContainerTestContextInjectInstantiations::class);
-
-        $container->make(ContainerTestContextInjectOne::class);
-        $container->make(ContainerTestContextInjectOne::class);
-        $container->make(ContainerTestContextInjectOne::class);
-        $container->make(ContainerTestContextInjectOne::class);
-
-        $this->assertEquals(1, ContainerTestContextInjectInstantiations::$instantiations);
+        $container->make(ContainerDependentStub::class, []);
     }
 
     public function testContainerTags()
@@ -766,21 +597,6 @@ public function testItThrowsExceptionWhenAbstractIsSameAsAlias()
         $container->getAlias('name');
     }
 
-    public function testContainerCanInjectSimpleVariable()
-    {
-        $container = new Container;
-        $container->when(ContainerInjectVariableStub::class)->needs('$something')->give(100);
-        $instance = $container->make(ContainerInjectVariableStub::class);
-        $this->assertEquals(100, $instance->something);
-
-        $container = new Container;
-        $container->when(ContainerInjectVariableStub::class)->needs('$something')->give(function ($container) {
-            return $container->make(ContainerConcreteStub::class);
-        });
-        $instance = $container->make(ContainerInjectVariableStub::class);
-        $this->assertInstanceOf(ContainerConcreteStub::class, $instance->something);
-    }
-
     public function testContainerGetFactory()
     {
         $container = new Container;
@@ -806,25 +622,6 @@ public function testExtensionWorksOnAliasedBindings()
         $this->assertEquals('some value extended', $container->make('something'));
     }
 
-    public function testContextualBindingWorksWithAliasedTargets()
-    {
-        $container = new Container;
-
-        $container->bind(IContainerContractStub::class, ContainerImplementationStub::class);
-        $container->alias(IContainerContractStub::class, 'interface-stub');
-
-        $container->alias(ContainerImplementationStub::class, 'stub-1');
-
-        $container->when(ContainerTestContextInjectOne::class)->needs('interface-stub')->give('stub-1');
-        $container->when(ContainerTestContextInjectTwo::class)->needs('interface-stub')->give(ContainerImplementationStubTwo::class);
-
-        $one = $container->make(ContainerTestContextInjectOne::class);
-        $two = $container->make(ContainerTestContextInjectTwo::class);
-
-        $this->assertInstanceOf(ContainerImplementationStub::class, $one->impl);
-        $this->assertInstanceOf(ContainerImplementationStubTwo::class, $two->impl);
-    }
-
     public function testMakeWithMethodIsAnAliasForMakeMethod()
     {
         $mock = $this->getMockBuilder(Container::class)
@@ -1046,36 +843,6 @@ public function init()
     }
 }
 
-class ContainerTestContextInjectOne
-{
-    public $impl;
-
-    public function __construct(IContainerContractStub $impl)
-    {
-        $this->impl = $impl;
-    }
-}
-
-class ContainerTestContextInjectTwo
-{
-    public $impl;
-
-    public function __construct(IContainerContractStub $impl)
-    {
-        $this->impl = $impl;
-    }
-}
-
-class ContainerTestContextInjectThree
-{
-    public $impl;
-
-    public function __construct(IContainerContractStub $impl)
-    {
-        $this->impl = $impl;
-    }
-}
-
 class ContainerInjectVariableStub
 {
     public $something;
@@ -1095,13 +862,3 @@ public function __construct(ContainerConcreteStub $concrete, $something)
         $this->something = $something;
     }
 }
-
-class ContainerTestContextInjectInstantiations implements IContainerContractStub
-{
-    public static $instantiations;
-
-    public function __construct()
-    {
-        static::$instantiations++;
-    }
-}