Implementation more complex with better feedback

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

Hide file tree

Showing 2 changed files with 11 additions and 2 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;
@@ -606,7 +607,15 @@ public function make($abstract, array $parameters = [])
      */
     public function get($id)
     {
-        return $this->resolve($id);
+        try {
+            return $this->resolve($id);
+        } catch (Exception $e) {
+            if ($this->has($id)) {
+                throw $e;
+            }
+
+            throw new EntryNotFoundException;
+        }
     }
 
     /**

diff --git a/tests/Container/ContainerTest.php b/tests/Container/ContainerTest.php
@@ -1041,7 +1041,7 @@ public function testContainerCanDynamicallySetService()
     }
 
     /**
-     * @expectedException \Psr\Container\ContainerExceptionInterface
+     * @expectedException \Illuminate\Container\EntryNotFoundException
      */
     public function testUnknownEntryThrowsException()
     {
-Original file line number
+Diff line change
@@ Expand Up / @@ -1041,7 +1041,7 @@ public function testContainerCanDynamicallySetService() @@
         }
         /**
-         * @expectedException \Psr\Container\ContainerExceptionInterface
+         * @expectedException \Illuminate\Container\EntryNotFoundException
          */
         public function testUnknownEntryThrowsException()
         {
@@ Expand Down @@