Merge pull request #11950 from lucasmichot/feature/5.2/is-shared

[5.2] isShared : no need to check instances AND bindings
laravel · Jan 19, 2016 · 3b60cc4 · 3b60cc4
2 parents 30a1c93 + 6e7d15b
commit 3b60cc4
Showing 1 changed file with 7 additions and 5 deletions.
diff --git a/src/Illuminate/Container/Container.php b/src/Illuminate/Container/Container.php
@@ -1046,13 +1046,15 @@ public function isShared($abstract)
     {
         $abstract = $this->normalize($abstract);
 
-        if (isset($this->bindings[$abstract]['shared'])) {
-            $shared = $this->bindings[$abstract]['shared'];
-        } else {
-            $shared = false;
+        if (isset($this->instances[$abstract])) {
+            return true;
+        }
+
+        if (! isset($this->bindings[$abstract]['shared'])) {
+            return false;
         }
 
-        return isset($this->instances[$abstract]) || $shared === true;
+        return $this->bindings[$abstract]['shared'] === true;
     }
 
     /**