Add auto declarer interface to allow mixing auto dependencies and man…

…ual dependencies

src/AutoDeclarerInterface.php

@@ -0,0 +1,9 @@
+<?php
+namespace SD\DependencyInjection;
+
+interface AutoDeclarerInterface {
+    /**
+     * @return string[]
+    **/
+    public function autoDeclareDependencies();
+}

src/AutoDeclareTrait.php → src/AutoDeclarerTrait.php

@@ -2,13 +2,13 @@
 
 namespace SD\DependencyInjection;
 
-trait AutoDeclareTrait {
+trait AutoDeclarerTrait {
     private $prefixAutoDeclare = 'autoDeclare';
 
     /**
      * @return string[]
     **/
-    public function declareDependencies() {
+    public function autoDeclareDependencies() {
         $class = new \ReflectionClass($this);
         $deps = [];
         foreach ($class->getDefaultProperties () as $name => $value) {

src/Container.php

@@ -14,7 +14,7 @@ public function __construct(array $config = [], $selfName = '') {
     }
 
     public function connect(ProviderInterface $provider) {
-        $this->initializers[$provider->getName()] = function () use ($provider) {
+        $this->initializers[$provider->getServiceName()] = function () use ($provider) {
             $this->inject($provider);
             return $provider->provide();
         };
@@ -55,9 +55,7 @@ public function inject($consumer) {
             $parameters = $this->getParameterValues(new \ReflectionFunction($consumer));
             return $consumer(...$parameters);
         } else {
-            if ($consumer instanceof DeclarerInterface) {
-                $consumer = $this->injectDeclared($consumer);
-            }
+            $consumer = $this->injectDeclarer($consumer);
             return $consumer;
         }
     }
@@ -83,14 +81,22 @@ private function produceRecursive($initializer, array $names) {
         } else {
             $instance = $initializer;
         }
-        if ($instance instanceof DeclarerInterface) {
-            $instance = $this->injectDeclared($instance);
-        }
+        $instance = $this->injectDeclarer($instance);
         return $instance;
     }
 
-    private function injectDeclared(DeclarerInterface $object) {
-        foreach ($object->declareDependencies() as $name) {
+    private function injectDeclarer($object) {
+        if ($object instanceof AutoDeclarerInterface) {
+            $object = $this->injectByNames($object, $object->autoDeclareDependencies());
+        }
+        if ($object instanceof DeclarerInterface) {
+            $object = $this->injectByNames($object, $object->declareDependencies());
+        }
+        return $object;
+    }
+
+    private function injectByNames($object, array $names) {
+        foreach ($names as $name) {
             $setter = 'set' . implode('', array_map('ucfirst', explode('_', $name)));
             if (!method_exists($object, $setter)) {
                 throw new Exception("Object declared $name dependency, but setter method $setter was not found");

src/ProviderInterface.php

@@ -2,6 +2,6 @@
 namespace SD\DependencyInjection;
 
 interface ProviderInterface {
-    public function getName(): string;
+    public function getServiceName(): string;
     public function provide();
 }

tests/AutoDeclarerService.php

@@ -0,0 +1,15 @@
+<?php
+namespace tests;
+
+use SD\DependencyInjection\AutoDeclarerTrait;
+use SD\DependencyInjection\AutoDeclarerInterface;
+use SD\DependencyInjection\ContainerAwareTrait;
+
+class AutoDeclarerService implements AutoDeclarerInterface {
+    use AutoDeclarerTrait;
+    use ContainerAwareTrait;
+
+    public function getContainer() {
+        return $this->container;
+    }
+}

tests/AutoDeclareTraitTest.php → tests/AutoDeclarerTraitTest.php

@@ -2,13 +2,13 @@
 namespace tests;
 
 use PHPUnit\Framework\TestCase;
-use SD\DependencyInjection\AutoDeclareTrait;
+use SD\DependencyInjection\AutoDeclarerTrait;
 use SD\DependencyInjection\Container;
 
-class AutoDeclareTraitTest extends TestCase {
+class AutoDeclarerTraitTest extends TestCase {
     public function testDeclareDependencies() {
         $container = new Container([], 'container');
-        $service = $container->produce(AutoDeclareService::class);
+        $service = $container->produce(AutoDeclarerService::class);
         $this->assertEquals($container, $service->getContainer(), 'Must inject container with auto declare');
     }
 }

tests/ContainerTest.php

@@ -60,7 +60,7 @@ public function testConnect() {
         );
         $provider = new LegacyProvider();
         $container->connect($provider);
-        $service = $container->get($provider->getName());
+        $service = $container->get($provider->getServiceName());
         $this->assertInstanceOf(LegacyService::class, $service, 'Must return instance of LegacyService');
         $this->assertEquals($name, $service->getName(), 'Must inject name from config');
         $this->assertEquals($container, $service->getContainer(), 'Must inject container by setter');

tests/LegacyProvider.php

@@ -1,28 +1,27 @@
 <?php
 namespace tests;
 
-use SD\DependencyInjection\AutoDeclareTrait;
+use SD\DependencyInjection\AutoDeclarerInterface;
+use SD\DependencyInjection\AutoDeclarerTrait;
 use SD\DependencyInjection\ContainerAwareTrait;
 use SD\DependencyInjection\DeclarerInterface;
 use SD\DependencyInjection\ProviderInterface;
 
-class LegacyProvider implements DeclarerInterface, ProviderInterface {
-    use AutoDeclareTrait {
-        declareDependencies as autoDeclareDependencies;
-    }
+class LegacyProvider implements AutoDeclarerInterface, DeclarerInterface, ProviderInterface {
+    use AutoDeclarerTrait;
     use ContainerAwareTrait;
 
     private $name;
 
     public function declareDependencies() {
-        return array_merge($this->autoDeclareDependencies(), ['name']);
+        return ['name'];
     }
 
     public function setName(string $name) {
         $this->name = $name;
     }
 
-    public function getName(): string {
+    public function getServiceName(): string {
         return 'helloWorld';
     }