#138 Implementation of container-interop v1.0

composer.json

@@ -22,6 +22,7 @@
         "mnapoli/phpdocreader": "~1.2",
         "myclabs/php-enum": "1.*",
         "ocramius/proxy-manager": "~0.3",
-        "symfony/yaml": "2.*"
+        "symfony/yaml": "2.*",
+        "container-interop/container-interop": "~1.0"
     }
 }

src/DI/Container.php

@@ -20,6 +20,7 @@
 use DI\Definition\Resolver\DefinitionResolver;
 use DI\Definition\Resolver\ValueDefinitionResolver;
 use Exception;
+use Interop\Container\ContainerInterface as ContainerInteropInterface;
 use InvalidArgumentException;
 use ProxyManager\Factory\LazyLoadingValueHolderFactory;
 
@@ -28,7 +29,7 @@
  *
  * @author Matthieu Napoli <matthieu@mnapoli.fr>
  */
-class Container implements ContainerInterface, FactoryInterface
+class Container implements ContainerInteropInterface, ContainerInterface, FactoryInterface
 {
     /**
      * Map of entries with Singleton scope that are already resolved.
@@ -61,12 +62,12 @@ class Container implements ContainerInterface, FactoryInterface
      *
      * @param DefinitionManager             $definitionManager
      * @param LazyLoadingValueHolderFactory $proxyFactory
-     * @param ContainerInterface            $wrapperContainer  If the container is wrapped by another container.
+     * @param ContainerInteropInterface     $wrapperContainer If the container is wrapped by another container.
      */
     public function __construct(
         DefinitionManager $definitionManager,
         LazyLoadingValueHolderFactory $proxyFactory,
-        ContainerInterface $wrapperContainer = null
+        ContainerInteropInterface $wrapperContainer = null
     ) {
         $this->definitionManager = $definitionManager;
 

src/DI/ContainerBuilder.php

@@ -14,6 +14,7 @@
 use DI\Definition\Source\PHPFileDefinitionSource;
 use DI\Definition\Source\ReflectionDefinitionSource;
 use Doctrine\Common\Cache\Cache;
+use Interop\Container\ContainerInterface;
 use InvalidArgumentException;
 use ProxyManager\Configuration;
 use ProxyManager\Factory\LazyLoadingValueHolderFactory;

src/DI/ContainerInterface.php

@@ -9,31 +9,18 @@
 
 namespace DI;
 
+use Interop\Container\ContainerInterface as BaseContainerInterface;
+
 /**
  * Describes the basic interface of a container.
  *
  * Focuses only on methods allowing to use the container, not configure it or configure entries.
  *
  * @since 4.0
+ * @deprecated Use Interop\Container\ContainerInterface instead, will be removed in 5.0.
+ *
  * @author Matthieu Napoli <matthieu@mnapoli.fr>
  */
-interface ContainerInterface
+interface ContainerInterface extends BaseContainerInterface
 {
-    /**
-     * Returns an entry of the container by its name.
-     *
-     * @param string $name Name of the entry to look for.
-     *
-     * @throws NotFoundException No entry was found for this name.
-     * @return mixed Entry. Can be anything: object, value, ...
-     */
-    public function get($name);
-
-    /**
-     * Tests if the container can return an entry for the given name.
-     *
-     * @param string $name Name of the entry to look for.
-     * @return bool
-     */
-    public function has($name);
 }

src/DI/Definition/Resolver/AliasDefinitionResolver.php

@@ -9,9 +9,9 @@
 
 namespace DI\Definition\Resolver;
 
-use DI\ContainerInterface;
 use DI\Definition\AliasDefinition;
 use DI\Definition\Definition;
+use Interop\Container\ContainerInterface;
 
 /**
  * Resolves an alias definition to a value.

src/DI/Definition/Resolver/ClassDefinitionResolver.php

@@ -9,7 +9,6 @@
 
 namespace DI\Definition\Resolver;
 
-use DI\ContainerInterface;
 use DI\Definition\ClassDefinition;
 use DI\Definition\Definition;
 use DI\Definition\EntryReference;
@@ -19,6 +18,7 @@
 use DI\DependencyException;
 use DI\NotFoundException;
 use Exception;
+use Interop\Container\ContainerInterface;
 use ProxyManager\Factory\LazyLoadingValueHolderFactory;
 use ReflectionClass;
 use ReflectionException;

src/DI/Definition/Resolver/FactoryDefinitionResolver.php

@@ -9,9 +9,9 @@
 
 namespace DI\Definition\Resolver;
 
-use DI\ContainerInterface;
 use DI\Definition\FactoryDefinition;
 use DI\Definition\Definition;
+use Interop\Container\ContainerInterface;
 
 /**
  * Resolves a factory definition to a value.

src/DI/DependencyException.php

@@ -9,10 +9,11 @@
 
 namespace DI;
 
+use Interop\Container\Exception\ContainerException;
+
 /**
  * Exception for the Container
  */
-class DependencyException extends \Exception
+class DependencyException extends \Exception implements ContainerException
 {
-
 }

src/DI/NotFoundException.php

@@ -9,10 +9,11 @@
 
 namespace DI;
 
+use Interop\Container\Exception\NotFoundException as BaseNotFoundException;
+
 /**
  * Exception thrown when a class or a value is not found in the container
  */
-class NotFoundException extends \Exception
+class NotFoundException extends \Exception implements BaseNotFoundException
 {
-
 }

tests/UnitTests/DI/ContainerBuilderTest.php

@@ -57,7 +57,7 @@ public function testContainerNotWrapped()
 
     public function testContainerWrapped()
     {
-        $otherContainer = $this->getMockForAbstractClass('DI\ContainerInterface');
+        $otherContainer = $this->getMockForAbstractClass('Interop\Container\ContainerInterface');
 
         $builder = new ContainerBuilder('UnitTests\DI\Fixtures\FakeContainer');
         $builder->wrapContainer($otherContainer);
@@ -94,7 +94,7 @@ public function testFluentInterface()
         $result = $builder->setDefinitionCache($mockCache);
         $this->assertSame($builder, $result);
 
-        $result = $builder->wrapContainer($this->getMockForAbstractClass('DI\ContainerInterface'));
+        $result = $builder->wrapContainer($this->getMockForAbstractClass('Interop\Container\ContainerInterface'));
         $this->assertSame($builder, $result);
     }
 }

tests/UnitTests/DI/Fixtures/FakeContainer.php

@@ -9,8 +9,8 @@
 
 namespace UnitTests\DI\Fixtures;
 
-use DI\ContainerInterface;
 use DI\Definition\DefinitionManager;
+use Interop\Container\ContainerInterface;
 use ProxyManager\Factory\LazyLoadingValueHolderFactory;
 
 /**