ContainerInterface entry references the container entry

woohoolabs · Jan 13, 2017 · 0ca3620 · 0ca3620
1 parent f4cee4c
commit 0ca3620
Show file tree

Hide file tree

Showing 7 changed files with 15 additions and 12 deletions.
diff --git a/src/Container/Compiler.php b/src/Container/Compiler.php
@@ -47,8 +47,8 @@ public function compile(AbstractCompilerConfig $compilerConfig, array $definitio
 
     private function getEntryPoints(AbstractCompilerConfig $compilerConfig): Traversable
     {
-        yield ContainerInterface::class;
         yield $compilerConfig->getContainerFqcn();
+        yield ContainerInterface::class;
 
         foreach ($compilerConfig->getContainerConfigs() as $containerConfig) {
             foreach ($containerConfig->createEntryPoints() as $entryPoint) {

diff --git a/src/Container/DependencyResolver.php b/src/Container/DependencyResolver.php
@@ -14,6 +14,7 @@
 use WoohooLabs\Zen\Config\Hint\DefinitionHintInterface;
 use WoohooLabs\Zen\Container\Definition\ClassDefinition;
 use WoohooLabs\Zen\Container\Definition\DefinitionInterface;
+use WoohooLabs\Zen\Container\Definition\ReferenceDefinition;
 use WoohooLabs\Zen\Container\Definition\SelfDefinition;
 use WoohooLabs\Zen\Exception\ContainerException;
 
@@ -55,8 +56,10 @@ public function __construct(AbstractCompilerConfig $compilerConfig, array $defin
         $this->typeHintReader = new PhpDocReader();
 
         $this->definitions = [
-            ContainerInterface::class => new SelfDefinition($this->compilerConfig->getContainerFqcn()),
-            $this->compilerConfig->getContainerFqcn() => new SelfDefinition($this->compilerConfig->getContainerFqcn())
+            $this->compilerConfig->getContainerFqcn() => new SelfDefinition($this->compilerConfig->getContainerFqcn()),
+            ContainerInterface::class => new ReferenceDefinition(
+                ContainerInterface::class,
+                $this->compilerConfig->getContainerFqcn())
         ];
     }
 

diff --git a/tests/unit/Container/DependencyResolverTest.php b/tests/unit/Container/DependencyResolverTest.php
@@ -46,8 +46,8 @@ public function resolveConstructorDependencies()
 
         $this->assertEquals(
             [
-                ContainerInterface::class => new SelfDefinition(""),
                 "" => new SelfDefinition(""),
+                ContainerInterface::class => new ReferenceDefinition(ContainerInterface::class, ""),
                 ConstructorA::class => ClassDefinition::singleton(ConstructorA::class)
                     ->addRequiredConstructorArgument(ConstructorB::class)
                     ->addRequiredConstructorArgument(ConstructorC::class)
@@ -77,8 +77,8 @@ public function resolvePropertyDependencies()
 
         $this->assertEquals(
             [
-                ContainerInterface::class => new SelfDefinition(""),
                 "" => new SelfDefinition(""),
+                ContainerInterface::class => new ReferenceDefinition(ContainerInterface::class, ""),
                 AnnotationA::class => ClassDefinition::singleton(AnnotationA::class)
                     ->addProperty("b", AnnotationB::class)
                     ->addProperty("c", AnnotationC::class)
@@ -111,8 +111,8 @@ public function resolveAllDependencies()
 
         $this->assertEquals(
             [
-                ContainerInterface::class => new SelfDefinition(""),
                 "" => new SelfDefinition(""),
+                ContainerInterface::class => new ReferenceDefinition(ContainerInterface::class, ""),
                 MixedA::class => ClassDefinition::singleton(MixedA::class)
                     ->addRequiredConstructorArgument(MixedB::class)
                     ->addRequiredConstructorArgument(MixedC::class)
@@ -147,8 +147,8 @@ public function resolvePrototypeDependency()
 
         $this->assertEquals(
             [
-                ContainerInterface::class => new SelfDefinition(""),
                 "" => new SelfDefinition(""),
+                ContainerInterface::class => new ReferenceDefinition(ContainerInterface::class, ""),
                 ConstructorD::class => ClassDefinition::prototype(ConstructorD::class)
                     ->resolveDependencies(),
             ],
@@ -172,8 +172,8 @@ public function resolveAliasedDependency()
 
         $this->assertEquals(
             [
-                ContainerInterface::class => new SelfDefinition(""),
                 "" => new SelfDefinition(""),
+                ContainerInterface::class => new ReferenceDefinition(ContainerInterface::class, ""),
                 ConstructorC::class => ClassDefinition::singleton(ConstructorC::class)
                     ->addRequiredConstructorArgument(ConstructorD::class)
                     ->resolveDependencies(),

diff --git a/tests/unit/Fixture/Container/ContainerWithEntry.php b/tests/unit/Fixture/Container/ContainerWithEntry.php
@@ -9,8 +9,8 @@ class ContainerWithEntry extends AbstractContainer
      * @var string[]
      */
     protected $entryPoints = [
-        \Interop\Container\ContainerInterface::class => 'Interop__Container__ContainerInterface',
         \WoohooLabs\Zen\Tests\Unit\Fixture\Container\ContainerWithEntry::class => 'WoohooLabs__Zen__Tests__Unit__Fixture__Container__ContainerWithEntry',
+        \Interop\Container\ContainerInterface::class => 'Interop__Container__ContainerInterface',
     ];
 
     protected function WoohooLabs__Zen__Tests__Unit__Double__StubDefinition()

diff --git a/tests/unit/Fixture/Container/ContainerWithEntryPoint.php b/tests/unit/Fixture/Container/ContainerWithEntryPoint.php
@@ -9,8 +9,8 @@ class ContainerWithEntryPoint extends AbstractContainer
      * @var string[]
      */
     protected $entryPoints = [
-        \Interop\Container\ContainerInterface::class => 'Interop__Container__ContainerInterface',
         \WoohooLabs\Zen\Tests\Unit\Fixture\Container\ContainerWithEntryPoint::class => 'WoohooLabs__Zen__Tests__Unit__Fixture__Container__ContainerWithEntryPoint',
+        \Interop\Container\ContainerInterface::class => 'Interop__Container__ContainerInterface',
         \WoohooLabs\Zen\Tests\Unit\Double\StubDefinition::class => 'WoohooLabs__Zen__Tests__Unit__Double__StubDefinition',
     ];
 

diff --git a/tests/unit/Fixture/Container/EmptyContainerWithNamespace.php b/tests/unit/Fixture/Container/EmptyContainerWithNamespace.php
@@ -9,7 +9,7 @@ class EmptyContainerWithNamespace extends AbstractContainer
      * @var string[]
      */
     protected $entryPoints = [
-        \Interop\Container\ContainerInterface::class => 'Interop__Container__ContainerInterface',
         \WoohooLabs\Zen\Tests\Unit\Fixture\Container\EmptyContainerWithNamespace::class => 'WoohooLabs__Zen__Tests__Unit__Fixture__Container__EmptyContainerWithNamespace',
+        \Interop\Container\ContainerInterface::class => 'Interop__Container__ContainerInterface',
     ];
 }
diff --git a/tests/unit/Fixture/Container/EmptyContainerWithoutNamespace.php b/tests/unit/Fixture/Container/EmptyContainerWithoutNamespace.php
@@ -8,7 +8,7 @@ class EmptyContainerWithoutNamespace extends AbstractContainer
      * @var string[]
      */
     protected $entryPoints = [
-        \Interop\Container\ContainerInterface::class => 'Interop__Container__ContainerInterface',
         \EmptyContainerWithoutNamespace::class => 'EmptyContainerWithoutNamespace',
+        \Interop\Container\ContainerInterface::class => 'Interop__Container__ContainerInterface',
     ];
 }