Merge branch 'install_wizard'

2013-09-17 16:02:24 +02:00
parent ddbced036f 072dec5cc9
commit 8122dc3084
38 changed files with 10957 additions and 100 deletions
--- a/core/lib/Thelia/Controller/BaseController.php
+++ b/core/lib/Thelia/Controller/BaseController.php
@@ -31,6 +31,7 @@ use Symfony\Component\Routing\Exception\MissingMandatoryParametersException;
 use Symfony\Component\Routing\Exception\RouteNotFoundException;
 use Symfony\Component\Routing\Router;
 use Thelia\Core\Security\SecurityContext;
+use Thelia\Core\Translation\Translator;
 use Thelia\Tools\URL;
 use Thelia\Tools\Redirect;
 use Thelia\Core\Template\ParserContext;
@@ -97,7 +98,7 @@ class BaseController extends ContainerAware
     *
     * return the Translator
     *
-     * @return mixed \Thelia\Core\Translation\Translator
+     * @return Translator
     */
    public function getTranslator()
    {