Merge be1cfbc into 8ecded4

src/DI/Container.php

@@ -48,6 +48,13 @@ class Container implements ContainerInterface, InteropContainerInterface, Factor
      */
     private $definitionResolver;
 
+    /**
+     * Map of definitions that are already fetched / looked up.
+     *
+     * @var array
+     */
+    private $fetchedDefinitions = [];
+
     /**
      * Array of entries being resolved. Used to avoid circular dependencies and infinite loops.
      * @var array
@@ -116,7 +123,7 @@ public function get($name)
             return $this->singletonEntries[$name];
         }
 
-        $definition = $this->definitionSource->getDefinition($name);
+        $definition = $this->getDefinition($name);
         if (! $definition) {
             throw new NotFoundException("No entry or class found for '$name'");
         }
@@ -131,6 +138,15 @@ public function get($name)
         return $value;
     }
 
+    private function getDefinition($name)
+    {
+        if(!array_key_exists($name, $this->fetchedDefinitions)){
+            $this->fetchedDefinitions[$name] = $this->definitionSource->getDefinition($name);
+        }
+
+        return $this->fetchedDefinitions[$name];
+    }
+
     /**
      * Build an entry of the container by its name.
      *
@@ -159,7 +175,7 @@ public function make($name, array $parameters = [])
             ));
         }
 
-        $definition = $this->definitionSource->getDefinition($name);
+        $definition = $this->getDefinition($name);
         if (! $definition) {
             // Try to find the entry in the singleton map
             if (array_key_exists($name, $this->singletonEntries)) {
@@ -193,7 +209,7 @@ public function has($name)
             return true;
         }
 
-        $definition = $this->definitionSource->getDefinition($name);
+        $definition = $this->getDefinition($name);
         if ($definition === null) {
             return false;
         }