Merge bdf8af9 into af288c6

composer.json

@@ -26,13 +26,12 @@
     "require": {
         "php": ">=7.0.0",
         "psr/container": "^1.0",
-        "psr/simple-cache": "^1.0",
         "php-di/invoker": "^2.0",
         "php-di/phpdoc-reader": "^2.0.1"
     },
     "require-dev": {
-        "phpunit/phpunit": "~5.0",
-        "mnapoli/phpunit-easymock": "~0.2.0",
+        "phpunit/phpunit": "~5.7",
+        "mnapoli/phpunit-easymock": "~0.2.3",
         "doctrine/annotations": "~1.2",
         "ocramius/proxy-manager": "~2.0.2"
     },

phpunit.xml.dist

@@ -9,7 +9,6 @@
          convertNoticesToExceptions="true"
          convertWarningsToExceptions="true"
          syntaxCheck="true"
-         forceCoversAnnotation="true"
          bootstrap="./vendor/autoload.php">
 
     <testsuites>
@@ -24,6 +23,9 @@
     <filter>
         <whitelist processUncoveredFilesFromWhitelist="true">
             <directory suffix=".php">src</directory>
+            <exclude>
+                <file>src/DI/Compiler/Template.php</file>
+            </exclude>
         </whitelist>
     </filter>
 

src/DI/CompiledContainer.php

@@ -0,0 +1,66 @@
+<?php
+
+namespace DI;
+
+/**
+ * Compiled version of the dependency injection container.
+ *
+ * @author Matthieu Napoli <matthieu@mnapoli.fr>
+ */
+abstract class CompiledContainer extends Container
+{
+    /**
+     * {@inheritdoc}
+     */
+    public function get($name)
+    {
+        // Try to find the entry in the singleton map
+        if (isset($this->resolvedEntries[$name]) || array_key_exists($name, $this->resolvedEntries)) {
+            return $this->resolvedEntries[$name];
+        }
+
+        $method = static::METHOD_MAPPING[$name] ?? null;
+
+        // If it's a compiled entry, then there is a method in this class
+        if ($method !== null) {
+            // Check if we are already getting this entry -> circular dependency
+            if (isset($this->entriesBeingResolved[$name])) {
+                throw new DependencyException("Circular dependency detected while trying to resolve entry '$name'");
+            }
+            $this->entriesBeingResolved[$name] = true;
+
+            try {
+                $value = $this->$method();
+            } finally {
+                unset($this->entriesBeingResolved[$name]);
+            }
+
+            // Store the entry to always return it without recomputing it
+            $this->resolvedEntries[$name] = $value;
+
+            return $value;
+        }
+
+        return parent::get($name);
+    }
+
+    /**
+     * {@inheritdoc}
+     */
+    public function has($name)
+    {
+        if (! is_string($name)) {
+            throw new \InvalidArgumentException(sprintf(
+                'The name parameter must be of type string, %s given',
+                is_object($name) ? get_class($name) : gettype($name)
+            ));
+        }
+
+        // The parent method is overridden to check in our array, it avoids resolving definitions
+        if (isset(static::METHOD_MAPPING[$name])) {
+            return true;
+        }
+
+        return parent::has($name);
+    }
+}