From 1686d6d87c5c2c28dd3fef63bd0df80336c52e67 Mon Sep 17 00:00:00 2001
From: Manuel Raynaud <raynaud.manu@gmail.com>
Date: Fri, 6 Sep 2013 11:43:37 +0200
Subject: [PATCH] each module is available in the container with name
 module.ModuleName

---
 core/lib/Thelia/Core/Thelia.php               | 12 ++++++
 core/lib/Thelia/Module/BaseModule.php         |  4 +-
 .../lib/Thelia/Module/BaseModuleInterface.php | 37 +++++++++++++++++++
 .../Thelia/Module/DeliveryModuleInterface.php | 36 ++++++++++++++++++
 install/insert.sql                            |  2 -
 5 files changed, 88 insertions(+), 3 deletions(-)
 create mode 100644 core/lib/Thelia/Module/BaseModuleInterface.php
 create mode 100644 core/lib/Thelia/Module/DeliveryModuleInterface.php

diff --git a/core/lib/Thelia/Core/Thelia.php b/core/lib/Thelia/Core/Thelia.php
index b28b23156..8c4dd68e0 100755
--- a/core/lib/Thelia/Core/Thelia.php
+++ b/core/lib/Thelia/Core/Thelia.php
@@ -33,8 +33,10 @@ namespace Thelia\Core;
  */
 
 use Symfony\Component\DependencyInjection\ContainerBuilder;
+use Symfony\Component\DependencyInjection\Definition;
 use Symfony\Component\HttpKernel\Kernel;
 use Symfony\Component\Config\Loader\LoaderInterface;
+use Symfony\Component\Validator\Tests\Fixtures\Reference;
 use Symfony\Component\Yaml\Yaml;
 use Symfony\Component\DependencyInjection\ParameterBag\ParameterBag;
 
@@ -107,6 +109,16 @@ class Thelia extends Kernel
             foreach ($modules as $module) {
 
                 try {
+
+                    $defintion = new Definition();
+                    $defintion->setClass($module->getCode() ."\\". ucfirst($module->getCode()));
+                    $defintion->addMethodCall("setContainer", array('service_container'));
+
+                    $container->setDefinition(
+                        "module.".$module->getCode(),
+                        $defintion
+                    );
+
                     $loader = new XmlFileLoader($container, new FileLocator(THELIA_MODULE_DIR . "/" . ucfirst($module->getCode()) . "/Config"));
                     $loader->load("config.xml");
                 } catch (\InvalidArgumentException $e) {
diff --git a/core/lib/Thelia/Module/BaseModule.php b/core/lib/Thelia/Module/BaseModule.php
index 07cc1d116..89725e33b 100755
--- a/core/lib/Thelia/Module/BaseModule.php
+++ b/core/lib/Thelia/Module/BaseModule.php
@@ -24,7 +24,9 @@
 
 namespace Thelia\Module;
 
-abstract class BaseModule
+use Symfony\Component\DependencyInjection\ContainerAware;
+
+abstract class BaseModule extends ContainerAware
 {
 
     public function __construct()
diff --git a/core/lib/Thelia/Module/BaseModuleInterface.php b/core/lib/Thelia/Module/BaseModuleInterface.php
new file mode 100644
index 000000000..2db450830
--- /dev/null
+++ b/core/lib/Thelia/Module/BaseModuleInterface.php
@@ -0,0 +1,37 @@
+<?php
+/*************************************************************************************/
+/*                                                                                   */
+/*      Thelia	                                                                     */
+/*                                                                                   */
+/*      Copyright (c) OpenStudio                                                     */
+/*      email : info@thelia.net                                                      */
+/*      web : http://www.thelia.net                                                  */
+/*                                                                                   */
+/*      This program is free software; you can redistribute it and/or modify         */
+/*      it under the terms of the GNU General Public License as published by         */
+/*      the Free Software Foundation; either version 3 of the License                */
+/*                                                                                   */
+/*      This program is distributed in the hope that it will be useful,              */
+/*      but WITHOUT ANY WARRANTY; without even the implied warranty of               */
+/*      MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the                */
+/*      GNU General Public License for more details.                                 */
+/*                                                                                   */
+/*      You should have received a copy of the GNU General Public License            */
+/*	    along with this program. If not, see <http://www.gnu.org/licenses/>.         */
+/*                                                                                   */
+/*************************************************************************************/
+
+namespace Thelia\Module;
+
+
+use Symfony\Component\EventDispatcher\EventDispatcherInterface;
+use Symfony\Component\HttpFoundation\Request;
+
+interface BaseModuleInterface {
+
+    public function setRequest(Request $request);
+    public function getRequest();
+
+    public function setDispatcher(EventDispatcherInterface $dispatcher);
+    public function getDispatcher();
+}
\ No newline at end of file
diff --git a/core/lib/Thelia/Module/DeliveryModuleInterface.php b/core/lib/Thelia/Module/DeliveryModuleInterface.php
new file mode 100644
index 000000000..2ef593ee5
--- /dev/null
+++ b/core/lib/Thelia/Module/DeliveryModuleInterface.php
@@ -0,0 +1,36 @@
+<?php
+/*************************************************************************************/
+/*                                                                                   */
+/*      Thelia	                                                                     */
+/*                                                                                   */
+/*      Copyright (c) OpenStudio                                                     */
+/*      email : info@thelia.net                                                      */
+/*      web : http://www.thelia.net                                                  */
+/*                                                                                   */
+/*      This program is free software; you can redistribute it and/or modify         */
+/*      it under the terms of the GNU General Public License as published by         */
+/*      the Free Software Foundation; either version 3 of the License                */
+/*                                                                                   */
+/*      This program is distributed in the hope that it will be useful,              */
+/*      but WITHOUT ANY WARRANTY; without even the implied warranty of               */
+/*      MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the                */
+/*      GNU General Public License for more details.                                 */
+/*                                                                                   */
+/*      You should have received a copy of the GNU General Public License            */
+/*	    along with this program. If not, see <http://www.gnu.org/licenses/>.         */
+/*                                                                                   */
+/*************************************************************************************/
+
+namespace Thelia\Module;
+
+
+interface DeliveryModuleInterface extends BaseModuleInterface {
+
+    /**
+     *
+     * calculate and return delivery price
+     *
+     * @return mixed
+     */
+    public function calculate();
+}
\ No newline at end of file
diff --git a/install/insert.sql b/install/insert.sql
index a2e5868e4..f4fe74d4e 100755
--- a/install/insert.sql
+++ b/install/insert.sql
@@ -17,8 +17,6 @@ INSERT INTO `config` (`name`, `value`, `secured`, `hidden`, `created_at`, `updat
 ('currency_rate_update_url', 'http://www.ecb.int/stats/eurofxref/eurofxref-daily.xml', 0, 0, NOW(), NOW()),
 ('page_not_found_view', '404.html', 0, 0, NOW(), NOW());
 
-INSERT INTO `module` (`code`, `type`, `activate`, `position`, `created_at`, `updated_at`) VALUES ('test', '1', '1', '1', NOW(), NOW());
-
 INSERT INTO `customer_title`(`id`, `by_default`, `position`, `created_at`, `updated_at`) VALUES
 (1, 1, 1, NOW(), NOW()),
 (2, 0, 2, NOW(), NOW()),