Merge branch 'inherit-auto-declare'

src/ContainerAwareTrait.php

@@ -1,16 +1,18 @@
 <?php
-
 namespace SD\DependencyInjection;
 
-trait ContainerAwareTrait {
-    private $autoDeclareContainer = 'container';
+trait ContainerAwareTrait
+{
+    protected $autoDeclareContainer = 'container';
     private $container;
 
-    public function setContainer(Container $container) {
+    public function setContainer(Container $container)
+    {
         $this->container = $container;
     }
 
-    private function getContainer(): Container {
+    protected function getContainer(): Container
+    {
         return $this->container;
     }
 }

tests/ContainerAwareTraitTest.php

@@ -0,0 +1,15 @@
+<?php
+namespace tests;
+
+use PHPUnit\Framework\TestCase;
+use SD\DependencyInjection\Container;
+
+class ContainerAwareTraitTest extends TestCase
+{
+    public function testInheritAutoDeclare()
+    {
+        $container = new Container();
+        $subclassConsumer = $container->produce(SubclassConsumer::class);
+        $this->assertSame($container, $subclassConsumer->getService(), 'Subclass must inherit auto declare trait');
+    }
+}

tests/ParentConsumer.php

@@ -0,0 +1,12 @@
+<?php
+namespace tests;
+
+use SD\DependencyInjection\AutoDeclarerInterface;
+use SD\DependencyInjection\AutoDeclarerTrait;
+use SD\DependencyInjection\ContainerAwareTrait;
+
+class ParentConsumer implements AutoDeclarerInterface
+{
+    use AutoDeclarerTrait;
+    use ContainerAwareTrait;
+}

tests/SubclassConsumer.php

@@ -0,0 +1,10 @@
+<?php
+namespace tests;
+
+class SubclassConsumer extends ParentConsumer
+{
+    public function getService()
+    {
+        return $this->getContainer();
+    }
+}