[5.7] [Option 1] Improve PSR-11 implementation (#25870)

* Improve PSR-11 implementation * Implementation more complex with better feedback * Include one more test case
laravel · Oct 4, 2018 · 35b8219 · 35b8219
1 parent 405aca4
commit 35b8219
Show file tree

Hide file tree

Showing 2 changed files with 27 additions and 3 deletions.
diff --git a/src/Illuminate/Container/Container.php b/src/Illuminate/Container/Container.php
@@ -3,6 +3,7 @@
 namespace Illuminate\Container;
 
 use Closure;
+use Exception;
 use ArrayAccess;
 use LogicException;
 use ReflectionClass;
@@ -613,11 +614,15 @@ public function make($abstract, array $parameters = [])
      */
     public function get($id)
     {
-        if ($this->has($id)) {
+        try {
             return $this->resolve($id);
-        }
+        } catch (Exception $e) {
+            if ($this->has($id)) {
+                throw $e;
+            }
 
-        throw new EntryNotFoundException;
+            throw new EntryNotFoundException;
+        }
     }
 
     /**

diff --git a/tests/Container/ContainerTest.php b/tests/Container/ContainerTest.php
@@ -1069,6 +1069,25 @@ public function testUnknownEntryThrowsException()
         $container = new Container;
         $container->get('Taylor');
     }
+
+    /**
+     * @expectedException \Psr\Container\ContainerExceptionInterface
+     */
+    public function testBoundEntriesThrowsContainerExceptionWhenNotResolvable()
+    {
+        $container = new Container;
+        $container->bind('Taylor', IContainerContractStub::class);
+
+        $container->get('Taylor');
+    }
+
+    public function testContainerCanResolveClasses()
+    {
+        $container = new Container;
+        $class = $container->get(ContainerConcreteStub::class);
+
+        $this->assertInstanceOf(ContainerConcreteStub::class, $class);
+    }
 }
 
 class ContainerConcreteStub