From 391296d2913a2df6b573146fb5e7469905b6e0be Mon Sep 17 00:00:00 2001
From: franck <franck@cqfdev.fr>
Date: Wed, 19 Jun 2013 17:12:32 +0200
Subject: [PATCH] Beginning integration of template directives. Config xsd
 changed.

---
 core/lib/Thelia/Config/Resources/config.xml   | 45 ++++++++++---------
 .../Loader/XmlFileLoader.php                  | 43 ++++--------------
 .../Loader/schema/dic/config/thelia-1.0.xsd   | 32 +++++--------
 .../Core/Template/Smarty/SmartyParser.php     | 41 -----------------
 4 files changed, 42 insertions(+), 119 deletions(-)

diff --git a/core/lib/Thelia/Config/Resources/config.xml b/core/lib/Thelia/Config/Resources/config.xml
index 4199ce349..d5320fca2 100644
--- a/core/lib/Thelia/Config/Resources/config.xml
+++ b/core/lib/Thelia/Config/Resources/config.xml
@@ -4,14 +4,24 @@
         xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
         xsi:schemaLocation="http://thelia.net/schema/dic/config http://thelia.net/schema/dic/config/thelia-1.0.xsd">
 
-    <testLoops>
-        <testLoop name="equal" class="Thelia\Core\Template\TestLoop\Equal"/>
-    </testLoops>
-
     <loops>
         <loop class="Thelia\Core\Template\Loop\Category" name="category"/>
     </loops>
 
+
+    <filters>
+    	<!-- Sample definition
+        <filter class="Thelia\Core\Template\Filter\SomeFilterClass" name="my_filter"/>
+    	-->
+    </filters>
+
+    <templateDirectives>
+    	<!-- Sample definition
+        <templateDirectives class="Thelia\Core\Template\Filter\SomeFilterClass" name="my_filter"/>
+    	-->
+    </templateDirectives>
+
+
     <commands>
         <command class="Thelia\Command\CacheClear"/>
         <command class="Thelia\Command\Install"/>
@@ -55,10 +65,18 @@
             <argument type="service" id="request" />
             <argument type="service" id="event_dispatcher"/>
             <call method="setLoopList">
-                <argument>%tpex.loop%</argument>
+                <argument>%thelia.parser.loops%</argument>
             </call>
        </service>
 
+        <service id="smarty.plugin.translation" class="Thelia\Core\Template\Smarty\Plugins\Translation" >
+            <tag name="thelia.parser.register_plugin"/>
+        </service>
+
+        <service id="smarty.plugin.module" class="Thelia\Core\Template\Smarty\Plugins\Module" >
+            <tag name="thelia.parser.register_plugin"/>
+        </service>
+
 
         <service id="http_kernel" class="Thelia\Core\TheliaHttpKernel">
             <argument type="service" id="event_dispatcher" />
@@ -66,23 +84,6 @@
             <argument type="service" id="controller_resolver" />
         </service>
 
-        <service id="template" class="Thelia\Tpex\Tpex" scope="request">
-            <argument type="service" id="request" />
-            <argument type="service" id="event_dispatcher"/>
-            <call method="setLoop">
-                <argument>%tpex.loop%</argument>
-            </call>
-            <call method="setFilter">
-                <argument>%tpex.filter%</argument>
-            </call>
-            <call method="setBaseParams">
-                <argument>%tpex.baseParam%</argument>
-            </call>
-            <call method="setTestLoop">
-                <argument>%tpex.testLoop%</argument>
-            </call>
-        </service>
-
         <service id="request" scope="request" synthetic="true" />
 
         <service id="service_container" synthetic="true" />
diff --git a/core/lib/Thelia/Core/DependencyInjection/Loader/XmlFileLoader.php b/core/lib/Thelia/Core/DependencyInjection/Loader/XmlFileLoader.php
index e4ba1501d..58c81a64a 100644
--- a/core/lib/Thelia/Core/DependencyInjection/Loader/XmlFileLoader.php
+++ b/core/lib/Thelia/Core/DependencyInjection/Loader/XmlFileLoader.php
@@ -57,9 +57,7 @@ class XmlFileLoader extends FileLoader
 
         $this->parseFilters($xml);
 
-        $this->parseBaseParams($xml);
-
-        $this->parseTestLoops($xml);
+        $this->parseTemplateDirectives($xml);
 
         $this->parseParameters($xml);
 
@@ -112,7 +110,7 @@ class XmlFileLoader extends FileLoader
             return;
         }
         try {
-            $loopConfig = $this->container->getParameter("Tpex.loop");
+            $loopConfig = $this->container->getParameter("Thelia.parser.loops");
         } catch (\Symfony\Component\DependencyInjection\Exception\ParameterNotFoundException $e) {
             $loopConfig = array();
         }
@@ -121,7 +119,7 @@ class XmlFileLoader extends FileLoader
             $loopConfig[$loop->getAttributeAsPhp("name")] = $loop->getAttributeAsPhp("class");
         }
 
-        $this->container->setParameter("Tpex.loop", $loopConfig);
+        $this->container->setParameter("Thelia.parser.loops", $loopConfig);
     }
 
     /**
@@ -135,7 +133,7 @@ class XmlFileLoader extends FileLoader
             return;
         }
         try {
-            $filterConfig = $this->container->getParameter("Tpex.filter");
+            $filterConfig = $this->container->getParameter("Thelia.parser.filters");
         } catch (\Symfony\Component\DependencyInjection\Exception\ParameterNotFoundException $e) {
             $filterConfig = array();
         }
@@ -144,7 +142,7 @@ class XmlFileLoader extends FileLoader
             $filterConfig[$filter->getAttributeAsPhp("name")] = $filter->getAttributeAsPhp("class");
         }
 
-        $this->container->setParameter("Tpex.filter", $filterConfig);
+        $this->container->setParameter("Thelia.parser.filters", $filterConfig);
     }
 
     /**
@@ -152,13 +150,13 @@ class XmlFileLoader extends FileLoader
      *
      * @param SimpleXMLElement $xml
      */
-    protected function parseBaseParams(SimpleXMLElement $xml)
+    protected function parseTemplateDirectives(SimpleXMLElement $xml)
     {
-        if (false === $baseParams = $xml->xpath('//config:baseParams/config:baseParam')) {
+        if (false === $baseParams = $xml->xpath('//config:templateDirectives/config:templateDirective')) {
             return;
         }
         try {
-            $baseParamConfig = $this->container->getParameter("Tpex.baseParam");
+            $baseParamConfig = $this->container->getParameter("Thelia.parser.templateDirectives");
         } catch (\Symfony\Component\DependencyInjection\Exception\ParameterNotFoundException $e) {
             $baseParamConfig = array();
         }
@@ -167,30 +165,7 @@ class XmlFileLoader extends FileLoader
             $baseParamConfig[$baseParam->getAttributeAsPhp("name")] = $baseParam->getAttributeAsPhp("class");
         }
 
-        $this->container->setParameter("Tpex.baseParam", $baseParamConfig);
-    }
-
-    /**
-     * parse testLoops property
-     *
-     * @param SimpleXMLElement $xml
-     */
-    protected function parseTestLoops(SimpleXMLElement $xml)
-    {
-        if (false === $testLoops = $xml->xpath('//config:testLoops/config:testLoop')) {
-            return;
-        }
-        try {
-            $baseParamConfig = $this->container->getParameter("Tpex.baseParam");
-        } catch (\Symfony\Component\DependencyInjection\Exception\ParameterNotFoundException $e) {
-            $baseParamConfig = array();
-        }
-
-        foreach ($testLoops as $testLoop) {
-            $baseParamConfig[$testLoop->getAttributeAsPhp("name")] = $testLoop->getAttributeAsPhp("class");
-        }
-
-        $this->container->setParameter("Tpex.testLoop", $baseParamConfig);
+        $this->container->setParameter("Thelia.parser.templateDirectives", $baseParamConfig);
     }
 
     /**
diff --git a/core/lib/Thelia/Core/DependencyInjection/Loader/schema/dic/config/thelia-1.0.xsd b/core/lib/Thelia/Core/DependencyInjection/Loader/schema/dic/config/thelia-1.0.xsd
index 2c700a34e..33f563040 100644
--- a/core/lib/Thelia/Core/DependencyInjection/Loader/schema/dic/config/thelia-1.0.xsd
+++ b/core/lib/Thelia/Core/DependencyInjection/Loader/schema/dic/config/thelia-1.0.xsd
@@ -10,9 +10,8 @@
     <xsd:complexType name="config">
         <xsd:choice minOccurs="0" maxOccurs="unbounded">
             <xsd:element name="loops" type="loops" />
-            <xsd:element name="filters" type="filter" />
-            <xsd:element name="baseParams" type="baseParams" />
-            <xsd:element name="testLoops" type="testLoops" />
+            <xsd:element name="filters" type="filters" />
+            <xsd:element name="templateDirectives" type="templateDirectives" />
             <xsd:element name="services" type="services" />
             <xsd:element name="parameters" type="parameters"/>
             <xsd:element name="commands" type="commands"/>
@@ -55,7 +54,7 @@
     </xsd:simpleType>
 
     <xsd:complexType name="loops">
-        <xsd:choice minOccurs="1" maxOccurs="unbounded" >
+        <xsd:choice minOccurs="0" maxOccurs="unbounded" >
             <xsd:element name="loop" type="loop"/>
         </xsd:choice>
     </xsd:complexType>
@@ -66,7 +65,7 @@
     </xsd:complexType>
 
     <xsd:complexType name="commands">
-        <xsd:choice minOccurs="1" maxOccurs="unbounded" >
+        <xsd:choice minOccurs="0" maxOccurs="unbounded" >
             <xsd:element name="command" type="command"/>
         </xsd:choice>
     </xsd:complexType>
@@ -76,34 +75,23 @@
     </xsd:complexType>
 
     <xsd:complexType name="filters">
-        <xsd:choice minOccurs="1" maxOccurs="unbounded">
+        <xsd:choice minOccurs="0" maxOccurs="unbounded">
             <xsd:element name="filter" type="filter" />
         </xsd:choice>
     </xsd:complexType>
-    
+
     <xsd:complexType name="filter">
         <xsd:attribute name="class" type="xsd:string" use="required" />
         <xsd:attribute name="name" type="xsd:string" use="required" />
     </xsd:complexType>
 
-    <xsd:complexType name="baseParams">
-        <xsd:choice minOccurs="1" maxOccurs="unbounded">
-            <xsd:element name="baseParam" type="baseParam" />
+    <xsd:complexType name="templateDirectives">
+        <xsd:choice minOccurs="0" maxOccurs="unbounded">
+            <xsd:element name="templateDirective" type="templateDirective" />
         </xsd:choice>
     </xsd:complexType>
 
-    <xsd:complexType name="baseParam">
-        <xsd:attribute name="class" type="xsd:string" use="required" />
-        <xsd:attribute name="name" type="xsd:string" use="required" />
-    </xsd:complexType>
-
-    <xsd:complexType name="testLoops">
-        <xsd:choice minOccurs="1" maxOccurs="unbounded">
-            <xsd:element name="testLoop" type="testLoop" />
-        </xsd:choice>
-    </xsd:complexType>
-
-    <xsd:complexType name="testLoop">
+    <xsd:complexType name="templateDirective">
         <xsd:attribute name="class" type="xsd:string" use="required" />
         <xsd:attribute name="name" type="xsd:string" use="required" />
     </xsd:complexType>
diff --git a/core/lib/Thelia/Core/Template/Smarty/SmartyParser.php b/core/lib/Thelia/Core/Template/Smarty/SmartyParser.php
index ecf5b352c..86a5c3ada 100644
--- a/core/lib/Thelia/Core/Template/Smarty/SmartyParser.php
+++ b/core/lib/Thelia/Core/Template/Smarty/SmartyParser.php
@@ -61,12 +61,6 @@ class SmartyParser extends Smarty implements ParserInterface {
 
         // The default HTTP status
         $this->status = 200;
-
-        // Register translation function 'intl'
-        $this->registerPlugin('function', 'intl', array($this, 'theliaTranslate'));
-
-        // Register Thelia modules inclusion function 'thelia_module'
-        $this->registerPlugin('function', 'thelia_module', array($this, 'theliaModule'));
     }
 
     public function setTemplate($template_path_from_template_base) {
@@ -94,41 +88,6 @@ class SmartyParser extends Smarty implements ParserInterface {
     	return $this->fetch($realTemplateName);
     }
 
-    /**
-     * Process translate function
-     *
-     * @param unknown $params
-     * @param unknown $smarty
-     * @return string
-     */
-    public function theliaTranslate($params, &$smarty)
-    {
-    	if (isset($params['l'])) {
-    		$string = str_replace('\'', '\\\'', $params['l']);
-    	}
-    	else {
-    		$string = '';
-    	}
-
-    	// TODO
-
-    	return "[$string]";
-    }
-
-
-    /**
-     * Process theliaModule template inclusion function
-     *
-     * @param unknown $params
-     * @param unknown $smarty
-     * @return string
-     */
-    public function theliaModule($params, &$smarty)
-    {
-        // TODO
-        return "";
-    }
-
 	/**
 	 *
 	 * This method must return a Symfony\Component\HttpFoudation\Response instance or the content of the response