Merge branch 'master' into loops

Conflicts:
	core/lib/Thelia/Core/Template/Loop/Category.php
	core/lib/Thelia/Core/Template/Loop/FeatureValue.php
	core/lib/Thelia/Core/Template/Loop/Folder.php
	core/lib/Thelia/Core/Template/Loop/Product.php
	core/lib/Thelia/Core/Template/Smarty/Plugins/TheliaLoop.php
	install/faker.php

documentation/api/files/Core/DependencyInjection/Compiler/RegisterRouterPass.php.txt

@@ -0,0 +1,86 @@
+<?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\Core\DependencyInjection\Compiler;
+
+use Symfony\Component\DependencyInjection\Compiler\CompilerPassInterface;
+use Symfony\Component\DependencyInjection\ContainerBuilder;
+use Symfony\Component\DependencyInjection\Definition;
+use Symfony\Component\DependencyInjection\Exception\InvalidArgumentException;
+use Symfony\Component\DependencyInjection\Reference;
+
+class RegisterRouterPass implements CompilerPassInterface
+{
+
+    /**
+     * You can modify the container here before it is dumped to PHP code.
+     *
+     * @param ContainerBuilder $container
+     *
+     * @api
+     */
+    public function process(ContainerBuilder $container)
+    {
+        try {
+            $chainRouter = $container->getDefinition("router.chainRequest");
+        } catch (InvalidArgumentException $e) {
+            return;
+        }
+
+        foreach ($container->findTaggedServiceIds("router.register") as $id => $attributes) {
+            $priority = isset($attributes[0]["priority"]) ? $attributes[0]["priority"] : 0;
+            $router = $container->getDefinition($id);
+            $router->addMethodCall("setOption", array("matcher_cache_class", $container::camelize("ProjectUrlMatcher".$id)));
+
+            $chainRouter->addMethodCall("add", array(new Reference($id), $priority));
+
+        }
+        if (defined("THELIA_INSTALL_MODE") === false) {
+            $modules = \Thelia\Model\ModuleQuery::getActivated();
+
+            foreach ($modules as $module) {
+                $moduleCode = ucfirst($module->getCode());
+                if (file_exists(THELIA_MODULE_DIR . "/" . $moduleCode . "/Config/routing.xml")) {
+                    $definition = new Definition(
+                        $container->getParameter("router.class"),
+                        array(
+                            new Reference("router.module.xmlLoader"),
+                            ucfirst($module->getCode()) . "/Config/routing.xml",
+                            array(
+                                "cache_dir" => $container->getParameter("kernel.cache_dir"),
+                                "debug" => $container->getParameter("kernel.debug"),
+                                "matcher_cache_class" => $container::camelize("ProjectUrlMatcher".$moduleCode)
+                            ),
+                            new Reference("request.context")
+                        )
+                    );
+
+                    $container->setDefinition("router.".$moduleCode, $definition);
+
+                    $chainRouter->addMethodCall("add", array(new Reference("router.".$moduleCode), -1));
+                }
+            }
+        }
+
+    }
+}
+