Improve PSR-11 implementation

laravel · Oct 2, 2018 · 9da48a0 · 9da48a0
1 parent f4551ca
commit 9da48a0
Show file tree

Hide file tree

Showing 2 changed files with 10 additions and 6 deletions.
diff --git a/src/Illuminate/Container/Container.php b/src/Illuminate/Container/Container.php
@@ -606,11 +606,7 @@ public function make($abstract, array $parameters = [])
      */
     public function get($id)
     {
-        if ($this->has($id)) {
-            return $this->resolve($id);
-        }
-
-        throw new EntryNotFoundException;
+        return $this->resolve($id);
     }
 
     /**

diff --git a/tests/Container/ContainerTest.php b/tests/Container/ContainerTest.php
@@ -1041,13 +1041,21 @@ public function testContainerCanDynamicallySetService()
     }
 
     /**
-     * @expectedException \Illuminate\Container\EntryNotFoundException
+     * @expectedException \Psr\Container\ContainerExceptionInterface
      */
     public function testUnknownEntryThrowsException()
     {
         $container = new Container;
         $container->get('Taylor');
     }
+
+    public function testContainerCanResolveClasses()
+    {
+        $container = new Container;
+        $class = $container->get(ContainerConcreteStub::class);
+
+        $this->assertInstanceOf(ContainerConcreteStub::class, $class);
+    }
 }
 
 class ContainerConcreteStub