From 7a55d6e026008da4327f57ea9e3d8725d28c45f2 Mon Sep 17 00:00:00 2001
From: Gregory PLANCHAT <g.planchat@gmail.com>
Date: Thu, 12 Jul 2012 03:28:28 +0200
Subject: [PATCH] Added Dependency Injection configurator

Signed-off-by: Gregory PLANCHAT <g.planchat@gmail.com>
---
 .../DependencyInjection/Config/Config.php     | 23 ++++++
 .../Core/DependencyInjection/Factory.php      | 80 +++++++++----------
 2 files changed, 62 insertions(+), 41 deletions(-)
 create mode 100644 src/application/modules/WootookCore/src/Wootook/Core/DependencyInjection/Config/Config.php

diff --git a/src/application/modules/WootookCore/src/Wootook/Core/DependencyInjection/Config/Config.php b/src/application/modules/WootookCore/src/Wootook/Core/DependencyInjection/Config/Config.php
new file mode 100644
index 0000000..3f04a2c
--- /dev/null
+++ b/src/application/modules/WootookCore/src/Wootook/Core/DependencyInjection/Config/Config.php
@@ -0,0 +1,23 @@
+<?php
+
+namespace Wootook\Core\DependencyInjection\Config;
+
+use Wootook\Core\Config,
+    Wootook\Core\DependencyInjection;
+
+class Config
+{
+    public function __invoke(DependencyInjection\Factory $factory, Config\Node $config)
+    {
+        foreach ($config as $className => $classConfig) {
+            $classDefinition = $factory->initClassDefinition($className);
+            $factory->registerClassDefinition($className, $classDefinition);
+
+            if ($classConfig->methods instanceof Config\Node) {
+                foreach ($classConfig->methods as $methodName => $methodConfig) {
+                    $classDefinition->
+                }
+            }
+        }
+    }
+}
\ No newline at end of file
diff --git a/src/application/modules/WootookCore/src/Wootook/Core/DependencyInjection/Factory.php b/src/application/modules/WootookCore/src/Wootook/Core/DependencyInjection/Factory.php
index f4218de..018e3d7 100644
--- a/src/application/modules/WootookCore/src/Wootook/Core/DependencyInjection/Factory.php
+++ b/src/application/modules/WootookCore/src/Wootook/Core/DependencyInjection/Factory.php
@@ -12,27 +12,15 @@ class Factory
 
     protected $_registry = null;
 
-    protected $_definitions = array();
+    protected $_classDefinitions = array();
 
-    protected function _construct(Config\Node $config, Registry $registry = null)
+    protected $_classDefinitionClassName = 'Wootook\\Core\\DependencyInjection\\Definition\\ClassDefinition';
+
+    protected function _construct(Registry $registry = null)
     {
         if ($registry !== null) {
             $this->setRegistry($registry);
         }
-
-        foreach ($config as $className => $constructorArguments) {
-            $definition = $this->getDefinition($className);
-
-            if ($constructorArguments === null) {
-                continue;
-            }
-
-            foreach ($constructorArguments as $argumentId => $argumentConfig) {
-                $argumentType = key($argumentConfig);
-                $argumentValue = key($argumentConfig);
-                $definition->addConstructorArgument($argumentId, $argumentType, $argumentValue);
-            }
-        }
     }
 
     public function setRegistry(Registry $registry)
@@ -51,41 +39,51 @@ class Factory
         return $this->_registry;
     }
 
-    public function getDefinition($className)
+    public function getClassDefinition($className)
     {
-        if (!isset($this->_definitions[$className])) {
-            $this->_definitions[$className] = new Definition\ClassDefinition($className);
+        if (isset($this->_classDefinitions[$className])) {
+            return $this->_classDefinitions[$className];
         }
 
-        return $this->_definitions[$className];
+        return $this->initClassDefinition($className);
     }
 
-    public function get($className, Array $additionalArguments = array())
+    public function initClassDefinition($className)
     {
-        $definition = $this->getDefinition($className);
+        $class = $this->getClassDefinitionClassName();
+        return new $class($className);
+    }
 
-        try {
-            $reflectionClass = new \ReflectionClass($className);
-        } catch (\ReflectionException $e) {
-            throw new CoreException\RuntimeException(sprintf('Class "%s" not found', $className), null, $e);
-        }
+    public function registerClassDefinition($className, Definition\ClassDefinition $classDefinition)
+    {
+        $this->_classDefinitions[$className] = $classDefinition;
 
-        if (!$reflectionClass->hasMethod('__construct')) {
-            return $reflectionClass->newInstance();
-        }
+        return $this;
+    }
 
-        try {
-            $reflectionMethod = $reflectionClass->getMethod('__construct');
-        } catch (\ReflectionException $e) {
-            throw new CoreException\RuntimeException(sprintf('Class "%s" has no contructor', $className), null, $e);
-        }
+    public function addClassDefinition($className)
+    {
+        $this->registerClassDefinition($className, $this->initClassDefinition($className));
 
-        $constructorArguments = $definition->prepareArguments($reflectionMethod, $this->getRegistry(), $additionalArguments);
+        return $this;
+    }
 
-        try {
-            return $reflectionClass->newInstanceArgs($constructorArguments);
-        } catch (\ReflectionException $e) {
-            throw new CoreException\RuntimeException(sprintf('Class "%s" could not be instanciated', $className), null, $e);
-        }
+    public function setClassDefinitionClassName($className)
+    {
+        $this->_classDefinitionClassName = $className;
+
+        return $this;
+    }
+
+    public function getClassDefinitionClassName()
+    {
+        return $this->_classDefinitionClassName;
+    }
+
+    public function __invoke($className, Array $additionalArguments = array())
+    {
+        $definition = $this->getClassDefinition($className);
+
+        return $definition->newInstance($additionalArguments);
     }
 }