apply cs-fixer

core/lib/Thelia/Action/BaseAction.php

@@ -22,15 +22,12 @@
 /*************************************************************************************/
 namespace Thelia\Action;
 
-
 use Thelia\Form\BaseForm;
 use Thelia\Action\Exception\FormValidationException;
 use Thelia\Core\Event\ActionEvent;
 use Symfony\Component\Form\Form;
 use Symfony\Component\DependencyInjection\ContainerInterface;
 
-
-
 class BaseAction
 {
 
@@ -39,7 +36,8 @@ class BaseAction
      */
     protected $container;
 
-    public function __construct(ContainerInterface $container) {
+    public function __construct(ContainerInterface $container)
+    {
         $this->container = $container;
     }
 
@@ -60,14 +58,11 @@ class BaseAction
             $form->bind($aBaseForm->getRequest());
 
             if ($form->isValid()) {
-
                 return $form;
-            }
+            } else {
-            else {
                 throw new FormValidationException("Missing or invalid data");
             }
-        }
+        } else {
-        else {
             throw new FormValidationException(sprintf("Wrong form method, %s expected.", $expectedMethod));
         }
     }
@@ -79,8 +74,8 @@ class BaseAction
      * @param string      $error_message an error message that may be displayed to the customer
      * @param ActionEvent $event         the action event
      */
-    protected function propagateFormError(BaseForm $aBaseForm, $error_message, ActionEvent $event) {
+    protected function propagateFormError(BaseForm $aBaseForm, $error_message, ActionEvent $event)
-
+    {
         // The form has an error
         $aBaseForm->setError(true);
         $aBaseForm->setErrorMessage($error_message);

core/lib/Thelia/Action/Cart.php

@@ -25,10 +25,8 @@ namespace Thelia\Action;
 
 use Propel\Runtime\Exception\PropelException;
 use Symfony\Component\Config\Definition\Exception\Exception;
-use Symfony\Component\EventDispatcher\EventDispatcherInterface;
 use Symfony\Component\HttpFoundation\Request;
 use Symfony\Component\EventDispatcher\EventSubscriberInterface;
-use Thelia\Core\Event\ActionEvent;
 use Thelia\Core\Event\CartEvent;
 use Thelia\Form\CartAdd;
 use Thelia\Model\ProductPrice;
@@ -92,14 +90,13 @@ class Cart extends BaseAction implements EventSubscriberInterface
 
             $message = $e->getMessage();
         }
-        if($message) {
+        if ($message) {
             // The form has errors, propagate it.
             $this->propagateFormError($cartAdd, $message, $event);
         }
 
     }
 
-
     /**
      *
      * Delete specify article present into cart
@@ -184,8 +181,6 @@ class Cart extends BaseAction implements EventSubscriberInterface
         );
     }
 
-
-
     /**
      * increase the quantity for an existing cartItem
      *

core/lib/Thelia/Action/Category.php

@@ -40,7 +40,6 @@ use Propel\Runtime\Propel;
 use Thelia\Model\Map\CategoryTableMap;
 use Propel\Runtime\Exception\PropelException;
 
-
 class Category extends BaseAction implements EventSubscriberInterface
 {
     public function create(ActionEvent $event)
@@ -237,7 +236,8 @@ class Category extends BaseAction implements EventSubscriberInterface
      *
      * @param ActionEvent $event
      */
-    public function changePositionUp(ActionEvent $event) {
+    public function changePositionUp(ActionEvent $event)
+    {
         return $this->exchangePosition($event, 'up');
     }
 
@@ -246,7 +246,8 @@ class Category extends BaseAction implements EventSubscriberInterface
      *
      * @param ActionEvent $event
      */
-    public function changePositionDown(ActionEvent $event) {
+    public function changePositionDown(ActionEvent $event)
+    {
         return $this->exchangePosition($event, 'down');
     }
 
@@ -256,8 +257,8 @@ class Category extends BaseAction implements EventSubscriberInterface
      * @param ActionEvent $event
      * @param string      $direction up to move up, down to move down
      */
-    protected function exchangePosition(ActionEvent $event, $direction) {
+    protected function exchangePosition(ActionEvent $event, $direction)
-
+    {
         $this->checkAuth("ADMIN", "admin.category.edit");
 
         $request = $event->getRequest();
@@ -277,17 +278,15 @@ class Category extends BaseAction implements EventSubscriberInterface
             if ($direction == 'up') {
                 // Find the category immediately before me
                 $search->filterByPosition(array('max' => $my_position-1))->orderByPosition(Criteria::DESC);
-    		}
+            } elseif ($direction == 'down') {
-    		else if ($direction == 'down') {
                 // Find the category immediately after me
                 $search->filterByPosition(array('min' => $my_position+1))->orderByPosition(Criteria::ASC);
-    		}
+            } else
-    		else
+
                 return;
 
             $result = $search->findOne();
 
-
             // If we found the proper category, exchange their positions
             if ($result) {
 
@@ -301,8 +300,7 @@ class Category extends BaseAction implements EventSubscriberInterface
                     $result->setPosition($my_position)->save();
 
                     $cnx->commit();
-	    		}
+                } catch (Exception $e) {
-	    		catch(Exception $e) {
                     $cnx->rollback();
                 }
             }
@@ -314,8 +312,8 @@ class Category extends BaseAction implements EventSubscriberInterface
      *
      * @param ActionEvent $event
      */
-    public function changePosition(ActionEvent $event) {
+    public function changePosition(ActionEvent $event)
-
+    {
         $this->checkAuth("ADMIN", "admin.category.edit");
 
         $request = $event->getRequest();
@@ -340,8 +338,7 @@ class Category extends BaseAction implements EventSubscriberInterface
                     $search->filterByPosition(array('min' => 1+$current_position, 'max' => $new_position));
 
                     $delta = -1;
-	    		}
+                } else {
-	    		else {
                     // The new position is brefore the current position -> we will offset - 1 all categories located between us and the new position
                     $search->filterByPosition(array('min' => $new_position, 'max' => $current_position - 1));
 
@@ -355,15 +352,14 @@ class Category extends BaseAction implements EventSubscriberInterface
                 $cnx->beginTransaction();
 
                 try {
-	    			foreach($results as $result) {
+                    foreach ($results as $result) {
                         $result->setPosition($result->getPosition() + $delta)->save($cnx);
                     }
 
                     $category->setPosition($new_position)->save($cnx);
 
                     $cnx->commit();
-	    		}
+                } catch (Exception $e) {
-	    		catch(Exception $e) {
                     $cnx->rollback();
                 }
             }

core/lib/Thelia/Action/Customer.php

@@ -26,7 +26,6 @@ namespace Thelia\Action;
 use Symfony\Component\EventDispatcher\EventSubscriberInterface;
 use Thelia\Core\Event\ActionEvent;
 use Thelia\Core\Event\TheliaEvents;
-use Thelia\Form\BaseForm;
 use Thelia\Form\CustomerCreation;
 use Thelia\Form\CustomerModification;
 use Thelia\Model\Customer as CustomerModel;
@@ -34,7 +33,6 @@ use Thelia\Log\Tlog;
 use Thelia\Model\CustomerQuery;
 use Thelia\Form\CustomerLogin;
 use Thelia\Core\Security\Authentication\CustomerUsernamePasswordFormAuthenticator;
-use Thelia\Core\Security\SecurityContext;
 use Symfony\Component\Validator\Exception\ValidatorException;
 use Thelia\Core\Security\Exception\AuthenticationException;
 use Thelia\Core\Security\Exception\UsernameNotFoundException;
@@ -122,7 +120,6 @@ class Customer extends BaseAction implements EventSubscriberInterface
             $this->processSuccessfullLogin($event, $customer, $customerModification);
         } catch (PropelException $e) {
 
-
               Tlog::getInstance()->error(sprintf('error during modifying customer on action/modifyCustomer with message "%s"', $e->getMessage()));
 
             $message = "Failed to change your account, please try again.";
@@ -144,7 +141,6 @@ class Customer extends BaseAction implements EventSubscriberInterface
     {
         $event->getDispatcher()->dispatch(TheliaEvents::CUSTOMER_LOGOUT, $event);
 
-
           $this->getFrontSecurityContext()->clear();
     }
 

core/lib/Thelia/Cart/CartTrait.php

@@ -22,10 +22,6 @@
 /*************************************************************************************/
 namespace Thelia\Cart;
 
-use Thelia\Model\ProductPrice;
-use Thelia\Model\ProductPriceQuery;
-use Thelia\Model\CartItem;
-use Thelia\Model\CartItemQuery;
 use Thelia\Model\CartQuery;
 use Thelia\Model\Cart as CartModel;
 use Thelia\Model\ConfigQuery;
@@ -35,7 +31,8 @@ use Thelia\Core\HttpFoundation\Session\Session;
 use Thelia\Core\Event\Internal\CartEvent;
 use Thelia\Core\Event\TheliaEvents;
 
-trait CartTrait {
+trait CartTrait
+{
     /**
      *
      * search if cart already exists in session. If not try to create a new one or duplicate an old one.
@@ -46,7 +43,7 @@ trait CartTrait {
     public function getCart(Request $request)
     {
 
-        if(null !== $cart = $request->getSession()->getCart()){
+        if (null !== $cart = $request->getSession()->getCart()) {
             return $cart;
         }
 
@@ -61,7 +58,7 @@ trait CartTrait {
                 $customer = $request->getSession()->getCustomerUser();
 
                 if ($customer) {
-                    if($cart->getCustomerId() != $customer->getId()) {
+                    if ($cart->getCustomerId() != $customer->getId()) {
                         //le customer du panier n'est pas le mm que celui connecté, il faut cloner le panier sans le customer_id
                         $cart = $this->duplicateCart($cart, $request->getSession(), $customer);
                     }
@@ -92,7 +89,7 @@ trait CartTrait {
         $cart = new CartModel();
         $cart->setToken($this->generateCookie());
 
-        if(null !== $customer = $session->getCustomerUser()) {
+        if (null !== $customer = $session->getCustomerUser()) {
             $cart->setCustomer($customer);
         }
 
@@ -103,7 +100,6 @@ trait CartTrait {
         return $cart;
     }
 
-
     /**
      * try to duplicate existing Cart. Customer is here to determine if this cart belong to him.
      *

core/lib/Thelia/Command/BaseModuleGenerate.php

@@ -22,12 +22,8 @@
 /*************************************************************************************/
 namespace Thelia\Command;
 
-use Propel\Runtime\Propel;
+abstract class BaseModuleGenerate extends ContainerAwareCommand
-use Symfony\Component\Console\Application;
+{
-
-
-abstract class BaseModuleGenerate extends ContainerAwareCommand {
-
      protected $module;
      protected $moduleDirectory;
 
@@ -53,6 +49,7 @@ abstract class BaseModuleGenerate extends ContainerAwareCommand {
          if (in_array(strtolower($name), $this->reservedKeyWords)) {
              throw new \RuntimeException(sprintf("%s module name is a reserved keyword", $name));
          }
+
          return ucfirst($name);
      }
 }

core/lib/Thelia/Command/CacheClear.php

@@ -23,7 +23,6 @@
 
 namespace Thelia\Command;
 
-use Symfony\Component\Console\Input\InputArgument;
 use Symfony\Component\Console\Input\InputInterface;
 use Symfony\Component\Console\Output\OutputInterface;
 use Symfony\Component\Filesystem\Filesystem;
@@ -56,7 +55,7 @@ class CacheClear extends ContainerAwareCommand
             $fs->remove($cacheDir);
 
             $output->writeln("<info>cache cleared successfully</info>");
-        } catch(IOException $e) {
+        } catch (IOException $e) {
             $output->writeln(sprintf("error during clearing cache : %s", $e->getMessage()));
         }
 

core/lib/Thelia/Command/ContainerAwareCommand.php

@@ -32,7 +32,8 @@ use Symfony\Component\DependencyInjection\ContainerAwareInterface;
  *
  * @author Fabien Potencier <fabien@symfony.com>
  */
-class ContainerAwareCommand extends Command implements ContainerAwareInterface {
+class ContainerAwareCommand extends Command implements ContainerAwareInterface
+{
     /**
      * @var ContainerInterface
      */

core/lib/Thelia/Command/Install.php

@@ -29,7 +29,6 @@ use Symfony\Component\Console\Output\OutputInterface;
 use Symfony\Component\Filesystem\Filesystem;
 use Thelia\Command\ContainerAwareCommand;
 
-
 class Install extends ContainerAwareCommand
 {
     /**
@@ -80,7 +79,6 @@ class Install extends ContainerAwareCommand
 
         $this->checkPermission($output);
 
-
         $connectionInfo = array(
             "host" => $input->getOption("db_host"),
             "dbName" => $input->getOption("db_name"),
@@ -88,9 +86,7 @@ class Install extends ContainerAwareCommand
             "password" => $input->getOption("db_password")
         );
 
-
+        while (false === $connection = $this->tryConnection($connectionInfo, $output)) {
-
-        while(false === $connection = $this->tryConnection($connectionInfo, $output)) {
                 $connectionInfo = $this->getConnectionInfo($input, $output);
         }
 
@@ -164,8 +160,6 @@ class Install extends ContainerAwareCommand
             exit;
         }
 
-
-
     }
 
     /**
@@ -180,7 +174,6 @@ class Install extends ContainerAwareCommand
         $sampleConfigFile = THELIA_ROOT . "/local/config/database.yml.sample";
         $configFile = THELIA_ROOT . "/local/config/database.yml";
 
-
         $fs->copy($sampleConfigFile, $configFile, true);
 
         $configContent = file_get_contents($configFile);
@@ -200,7 +193,6 @@ class Install extends ContainerAwareCommand
 
         $fs->remove($this->getContainer()->getParameter("kernel.cache_dir"));
 
-
     }
 
     /**
@@ -237,7 +229,7 @@ class Install extends ContainerAwareCommand
 
         $tab = explode(";", $sql);
 
-        for($i=0; $i<count($tab); $i++){
+        for ($i=0; $i<count($tab); $i++) {
             $queryTemp = str_replace("-CODE-", ";',", $tab[$i]);
             $queryTemp = str_replace("|", ";", $queryTemp);
             $query[] = $queryTemp;
@@ -288,11 +280,10 @@ class Install extends ContainerAwareCommand
             $output->writeln(array(
                 "<error>Wrong connection information</error>"
             ));
+
             return false;
         }
 
-
-
         return $connection;
     }
 

core/lib/Thelia/Command/ModuleGenerateCommand.php

@@ -22,16 +22,13 @@
 /*************************************************************************************/
 namespace Thelia\Command;
 
-
 use Symfony\Component\Console\Input\InputArgument;
 use Symfony\Component\Console\Input\InputInterface;
 use Symfony\Component\Console\Output\OutputInterface;
 use Symfony\Component\Filesystem\Filesystem;
 
-class ModuleGenerateCommand extends BaseModuleGenerate {
+class ModuleGenerateCommand extends BaseModuleGenerate
-
+{
-
-
     protected function configure()
     {
         $this
@@ -53,7 +50,7 @@ class ModuleGenerateCommand extends BaseModuleGenerate {
 
         $this->createDirectories();
         $this->createFiles();
-        if(method_exists($this, "renderBlock")) {
+        if (method_exists($this, "renderBlock")) {
             //impossible to change output class in CommandTester...
             $output->renderBlock(array(
                 '',
@@ -99,6 +96,4 @@ class ModuleGenerateCommand extends BaseModuleGenerate {
         file_put_contents($this->moduleDirectory . DIRECTORY_SEPARATOR . "Config". DIRECTORY_SEPARATOR . "schema.xml", $schemaContent);
     }
 
-
-
 }

core/lib/Thelia/Command/ModuleGenerateModelCommand.php

@@ -23,18 +23,16 @@
 
 namespace Thelia\Command;
 
-
 use Propel\Generator\Command\ModelBuildCommand;
 use Symfony\Component\Console\Input\ArrayInput;
 use Symfony\Component\Console\Input\InputArgument;
 use Symfony\Component\Console\Input\InputInterface;
 use Symfony\Component\Console\Input\InputOption;
 use Symfony\Component\Console\Output\OutputInterface;
-use Symfony\Component\Console\Output\StreamOutput;
 use Symfony\Component\Filesystem\Filesystem;
 
-class ModuleGenerateModelCommand extends BaseModuleGenerate {
+class ModuleGenerateModelCommand extends BaseModuleGenerate
-
+{
     protected function configure()
     {
         $this
@@ -124,7 +122,6 @@ class ModuleGenerateModelCommand extends BaseModuleGenerate {
             }
         }
 
-
     }
 
 }

core/lib/Thelia/Command/ModuleGenerateSqlCommand.php

@@ -23,17 +23,15 @@
 
 namespace Thelia\Command;
 
-
 use Propel\Generator\Command\SqlBuildCommand;
 use Symfony\Component\Console\Input\ArrayInput;
 use Symfony\Component\Console\Input\InputArgument;
 use Symfony\Component\Console\Input\InputInterface;
 use Symfony\Component\Console\Output\OutputInterface;
-use Symfony\Component\Console\Output\StreamOutput;
 use Symfony\Component\Filesystem\Filesystem;
 
-class ModuleGenerateSqlCommand extends BaseModuleGenerate {
+class ModuleGenerateSqlCommand extends BaseModuleGenerate
-
+{
     public function configure()
     {
         $this

core/lib/Thelia/Command/Output/TheliaConsoleOutput.php

@@ -23,11 +23,10 @@
 
 namespace Thelia\Command\Output;
 
-
 use Symfony\Component\Console\Output\ConsoleOutput;
 
-class TheliaConsoleOutput extends ConsoleOutput{
+class TheliaConsoleOutput extends ConsoleOutput
-
+{
     public function renderBlock(array $messages, $style = "info")
     {
         $strlen = function ($string) {

core/lib/Thelia/Command/Skeleton/Module/Class.php

@@ -21,12 +21,11 @@
 /*                                                                                   */
 /*************************************************************************************/
 
-
 namespace %%NAMESPACE%%;
 
 use Thelia\Module\BaseModule;
 
-class %%CLASSNAME%% extends BaseModule
+class Class extends BaseModule
 {
     /**
      * YOU HAVE TO IMPLEMENT HERE ABSTRACT METHODD FROM BaseModule Class

core/lib/Thelia/Config/DefinePropel.php

@@ -26,9 +26,8 @@ namespace Thelia\Config;
 use Symfony\Component\Config\Definition\Processor;
 use Symfony\Component\Config\Definition\ConfigurationInterface;
 
-
+class DefinePropel
-class DefinePropel {
+{
-
     private $processorConfig;
 
     public function __construct(ConfigurationInterface $configuration, array $propelConf)
@@ -40,6 +39,7 @@ class DefinePropel {
     public function getConfig()
     {
         $connection = $this->processorConfig["connection"];
+
         return $conf = array(
             "dsn" => $connection["dsn"],
             "user" => $connection["user"],

core/lib/Thelia/Controller/Front/DefaultController.php

@@ -22,7 +22,6 @@
 /*************************************************************************************/
 namespace Thelia\Controller\Front;
 
-use Thelia\Controller\NullControllerInterface;
 use Symfony\Component\HttpFoundation\Request;
 
 /**

core/lib/Thelia/Core/Context.php

@@ -23,7 +23,6 @@
 
 namespace Thelia\Core;
 
-
 class Context
 {
     const CONTEXT_FRONT_OFFICE = 'front';
@@ -43,8 +42,7 @@ class Context
 
     public function setContext($context)
     {
-        if($this->isValidContext($context))
+        if ($this->isValidContext($context)) {
-        {
             $this->currentContext = $context;
         }
     }

core/lib/Thelia/Core/DependencyInjection/Compiler/RegisterRouterPass.php

@@ -22,10 +22,8 @@
 /*************************************************************************************/
 namespace Thelia\Core\DependencyInjection\Compiler;
 
-
 use Symfony\Component\DependencyInjection\Compiler\CompilerPassInterface;
 use Symfony\Component\DependencyInjection\ContainerBuilder;
-use Symfony\Component\DependencyInjection\ContainerInterface;
 use Symfony\Component\DependencyInjection\Exception\InvalidArgumentException;
 use Symfony\Component\DependencyInjection\Reference;
 
@@ -43,7 +41,7 @@ class RegisterRouterPass implements CompilerPassInterface
     {
         try {
             $chainRouter = $container->getDefinition("router.chainRequest");
-        } catch(InvalidArgumentException $e) {
+        } catch (InvalidArgumentException $e) {
             return;
         }
 
@@ -55,8 +53,6 @@ class RegisterRouterPass implements CompilerPassInterface
 
             $chainRouter->addMethodCall("add", array(new Reference($id), $priority));
 
-
-
         }
     }
 }

core/lib/Thelia/Core/Event/ActionEvent.php

@@ -26,7 +26,6 @@ namespace Thelia\Core\Event;
 use Symfony\Component\EventDispatcher\Event;
 use Thelia\Core\HttpFoundation\Request;
 use Thelia\Form\BaseForm;
-use Thelia\Core\Security\SecurityContext;
 /**
  *
  * Class thrown on Thelia.action event
@@ -43,7 +42,6 @@ abstract class ActionEvent extends Event
      */
     protected $request;
 
-
     protected $errorForm = null;
 
     protected $parameters = array();
@@ -58,7 +56,6 @@ abstract class ActionEvent extends Event
         $this->request = $request;
     }
 
-
     public function __set($name, $value)
     {
         $this->parameters[$name] = $value;
@@ -82,17 +79,20 @@ abstract class ActionEvent extends Event
         return $this->request;
     }
 
-    public function setErrorForm(BaseForm $form) {
+    public function setErrorForm(BaseForm $form)
+    {
         $this->errorForm = $form;
 
         if ($form != null) $this->stopPropagation();
     }
 
-    public function getErrorForm() {
+    public function getErrorForm()
+    {
         return $this->errorForm;
     }
 
-    public function hasErrorForm() {
+    public function hasErrorForm()
+    {
         return $this->errorForm != null ? true : false;
     }
 }

core/lib/Thelia/Core/Event/CartEvent.php

@@ -26,8 +26,8 @@ namespace Thelia\Core\Event;
 use Thelia\Core\HttpFoundation\Request;
 use Thelia\Model\Cart;
 
-class CartEvent extends ActionEvent {
+class CartEvent extends ActionEvent
-
+{
     protected $cart;
 
     public function __construct(Request $request, Cart $cart)

core/lib/Thelia/Core/Event/CartItemEvent.php

@@ -23,11 +23,10 @@
 
 namespace Thelia\Core\Event;
 
-
 use Thelia\Model\CartItem;
 
-class CartItemEvent extends InternalEvent {
+class CartItemEvent extends InternalEvent
-
+{
     protected $cartItem;
 
     public function __construct(CartItem $cartItem)

core/lib/Thelia/Core/Event/CategoryEvent.php

@@ -23,11 +23,10 @@
 
 namespace Thelia\Core\Event;
 
-
 use Thelia\Model\Category;
 
-class CategoryEvent extends InternalEvent {
+class CategoryEvent extends InternalEvent
-
+{
     public $category;
 
     public function __construct(Category $category)

core/lib/Thelia/Core/Event/Internal/CartEvent.php

@@ -21,14 +21,12 @@
 /*                                                                                   */
 /*************************************************************************************/
 
-
 namespace Thelia\Core\Event\Internal;
 
-
 use Thelia\Model\Cart;
 
-class CartEvent extends InternalEvent {
+class CartEvent extends InternalEvent
-
+{
     public $cart;
 
     public function __construct(Cart $cart)
@@ -36,6 +34,4 @@ class CartEvent extends InternalEvent {
         $this->cart = $cart;
     }
 
-
-
 }

core/lib/Thelia/Core/Event/Internal/CustomerEvent.php

@@ -23,11 +23,10 @@
 
 namespace Thelia\Core\Event\Internal;
 
-
 use Thelia\Model\Customer;
 
-class CustomerEvent extends InternalEvent {
+class CustomerEvent extends InternalEvent
-
+{
     public $customer;
 
     public function __construct(Customer $customer)

core/lib/Thelia/Core/Event/Internal/InternalEvent.php

@@ -23,7 +23,6 @@
 
 namespace Thelia\Core\Event\Internal;
 
-
 use Symfony\Component\EventDispatcher\Event;
 
 /**
@@ -32,6 +31,6 @@ use Symfony\Component\EventDispatcher\Event;
  * Class InternalEvent
  * @package Thelia\Core\Event
  */
-abstract class InternalEvent extends Event {
+abstract class InternalEvent extends Event
-
+{
 }

core/lib/Thelia/Core/Event/TheliaEvents.php

@@ -65,8 +65,6 @@ final class TheliaEvents
      */
     const ADMIN_LOGIN  = "action.admin_login";
 
-
-
     /**
      * Sent once the customer creation form has been successfully validated, and before customer insertion in the database.
      */
@@ -86,8 +84,6 @@ final class TheliaEvents
      */
     const AFTER_CHANGECUSTOMER 	= "action.after_changecustomer";
 
-
-
     /**
      * Sent once the category creation form has been successfully validated, and before category insertion in the database.
      */
@@ -112,7 +108,6 @@ final class TheliaEvents
      */
     const AFTER_CHANGECATEGORY 	= "action.after_changecategory";
 
-
     /**
      * sent when a new existing cat id duplicated. This append when current customer is different from current cart
      */

core/lib/Thelia/Core/EventListener/ControllerListener.php

@@ -44,7 +44,8 @@ class ControllerListener implements EventSubscriberInterface
      */
     protected $parserContext;
 
-	public function __construct(ParserContext $parserContext) {
+    public function __construct(ParserContext $parserContext)
+    {
         $this->parserContext = $parserContext;
     }
 

core/lib/Thelia/Core/EventListener/ViewListener.php

@@ -81,11 +81,9 @@ class ViewListener implements EventSubscriberInterface
             } else {
                 $event->setResponse(new Response($content, $parser->getStatus() ?: 200));
             }
-        }
+        } catch (ResourceNotFoundException $e) {
-        catch (ResourceNotFoundException $e) {
             $event->setResponse(new Response($e->getMessage(), 404));
-        }
+        } catch (AuthenticationException $ex) {
-        catch (AuthenticationException $ex) {
 
             // Redirect to the login template
             $event->setResponse(Redirect::exec(URL::viewUrl($ex->getLoginTemplate())));

core/lib/Thelia/Core/HttpFoundation/Request.php

@@ -23,7 +23,6 @@
 namespace Thelia\Core\HttpFoundation;
 
 use Symfony\Component\HttpFoundation\Request as BaseRequest;
-use Thelia\Core\Context;
 
 class Request extends BaseRequest
 {
@@ -46,6 +45,7 @@ class Request extends BaseRequest
         if ('' == $this->getQueryString()) {
             $additionalQs = '?'. ltrim($additionalQs, '&');
         }
+
         return $uri . $additionalQs;
     }
 }

core/lib/Thelia/Core/HttpFoundation/Session/Session.php

@@ -128,7 +128,7 @@ class Session extends BaseSession
         $customer = $this->getCustomerUser();
         if ($customer && $cart->getCustomerId() != $customer->getId()) {
             throw new InvalidCartException("customer in session and customer_id in cart are not the same");
-        } else if($customer === null && $cart->getCustomerId() !== null) {
+        } elseif ($customer === null && $cart->getCustomerId() !== null) {
             throw new InvalidCartException("Customer exists in cart and not in session");
         }
     }

core/lib/Thelia/Core/Security/Authentication/AdminUsernamePasswordFormAuthenticator.php

@@ -31,9 +31,10 @@ use Thelia\Core\Security\UserProvider\AdminUserProvider;
 use Thelia\Core\Security\Authentication\UsernamePasswordFormAuthenticator;
 use Thelia\Form\AdminLogin;
 
-class AdminUsernamePasswordFormAuthenticator extends UsernamePasswordFormAuthenticator {
+class AdminUsernamePasswordFormAuthenticator extends UsernamePasswordFormAuthenticator
-
+{
-	public function __construct(Request $request, AdminLogin $loginForm) {
+    public function __construct(Request $request, AdminLogin $loginForm)
+    {
         parent::__construct(
             $request,
             $loginForm,

core/lib/Thelia/Core/Security/Authentication/AuthenticatorInterface.php

@@ -23,8 +23,8 @@
 
 namespace Thelia\Core\Security\Authentication;
 
-interface AuthenticatorInterface {
+interface AuthenticatorInterface
-
+{
     /**
      * Returns a UserInterface instance, authentified using the authenticator specific method
      */

core/lib/Thelia/Core/Security/Authentication/CustomerUsernamePasswordFormAuthenticator.php

@@ -29,9 +29,10 @@ use Thelia\Core\Security\Authentication\UsernamePasswordFormAuthenticator;
 use Thelia\Form\CustomerLogin;
 use Thelia\Core\Security\UserProvider\CustomerUserProvider;
 
-class CustomerUsernamePasswordFormAuthenticator extends UsernamePasswordFormAuthenticator {
+class CustomerUsernamePasswordFormAuthenticator extends UsernamePasswordFormAuthenticator
-
+{
-	public function __construct(Request $request, CustomerLogin $loginForm) {
+    public function __construct(Request $request, CustomerLogin $loginForm)
+    {
         parent::__construct(
             $request,
             $loginForm,

core/lib/Thelia/Core/Security/Authentication/UsernamePasswordFormAuthenticator.php

@@ -32,8 +32,8 @@ use Thelia\Core\Security\Exception\UsernameNotFoundException;
 use Symfony\Component\Validator\Exception\ValidatorException;
 use Thelia\Form\BaseForm;
 
-class UsernamePasswordFormAuthenticator implements AuthenticatorInterface {
+class UsernamePasswordFormAuthenticator implements AuthenticatorInterface
-
+{
     protected $request;
     protected $loginForm;
     protected $userProvider;
@@ -41,7 +41,8 @@ class UsernamePasswordFormAuthenticator implements AuthenticatorInterface {
 
     protected $baseLoginForm;
 
-	public function __construct(Request $request, BaseForm $loginForm, UserProviderInterface $userProvider, array $options = array()) {
+    public function __construct(Request $request, BaseForm $loginForm, UserProviderInterface $userProvider, array $options = array())
+    {
         $this->request = $request;
         $this->baseLoginForm = $loginForm;
         $this->loginForm = $this->baseLoginForm->getForm();
@@ -61,15 +62,16 @@ class UsernamePasswordFormAuthenticator implements AuthenticatorInterface {
     /**
      * @return string the username value
      */
-	public function getUsername() {
+    public function getUsername()
+    {
         return $this->loginForm->get($this->options['username_field_name'])->getData();
     }
 
     /**
      * @see \Thelia\Core\Security\Authentication\AuthenticatorInterface::getAuthentifiedUser()
      */
-	public function getAuthentifiedUser() {
+    public function getAuthentifiedUser()
-
+    {
         if ($this->request->isMethod($this->options['required_method'])) {
 
             if (! $this->loginForm->isValid()) throw new ValidatorException("Form is not valid.");
@@ -86,7 +88,6 @@ class UsernamePasswordFormAuthenticator implements AuthenticatorInterface {
             $authOk = $user->checkPassword($password) === true;
 
             if ($authOk !== true) throw new WrongPasswordException(sprintf("Wrong password for user '%s'.", $username));
-
             return $user;
         }
 

core/lib/Thelia/Core/Security/Exception/AuthenticationException.php

@@ -33,7 +33,8 @@ class AuthenticationException extends \Exception
     /**
      * @return string the login template name
      */
-	public function getLoginTemplate() {
+    public function getLoginTemplate()
+    {
         return $this->loginTemplate;
     }
 
@@ -42,7 +43,8 @@ class AuthenticationException extends \Exception
      *
      * @param string $loginPath the login template name
      */
-	public function setLoginTemplate($loginTemplate) {
+    public function setLoginTemplate($loginTemplate)
+    {
         $this->loginTemplate = $loginTemplate;
     }
 }

core/lib/Thelia/Core/Security/Role/Role.php

@@ -39,7 +39,8 @@ class Role implements RoleInterface
         return $this->role;
     }
 
-    public function __toString() {
+    public function __toString()
+    {
         return $this->role;
     }
 }

core/lib/Thelia/Core/Security/SecurityContext.php

@@ -23,9 +23,6 @@
 
 namespace Thelia\Core\Security;
 
-use Thelia\Core\Security\Authentication\AuthenticationProviderInterface;
-use Thelia\Core\Security\Exception\AuthenticationTokenNotFoundException;
-use Thelia\Core\Security\Token\TokenInterface;
 use Thelia\Core\Security\User\UserInterface;
 use Thelia\Core\HttpFoundation\Request;
 
@@ -34,22 +31,23 @@ use Thelia\Core\HttpFoundation\Request;
  *
  * @author Franck Allimant <franck@cqfdev.fr>
  */
-class SecurityContext {
+class SecurityContext
-
+{
     const CONTEXT_FRONT_OFFICE = 'front';
     const CONTEXT_BACK_OFFICE  = 'admin';
 
     private $request;
     private $context;
 
-	public function __construct(Request $request) {
+    public function __construct(Request $request)
-
+    {
         $this->request = $request;
 
         $this->context = null;
     }
 
-	public function setContext($context) {
+    public function setContext($context)
+    {
         if ($context !== self::CONTEXT_FRONT_OFFICE && $context !== self::CONTEXT_BACK_OFFICE) {
             throw new \InvalidArgumentException(sprintf("Invalid or empty context identifier '%s'", $context));
         }
@@ -59,14 +57,16 @@ class SecurityContext {
         return $this;
     }
 
-	public function getContext($exception_if_context_undefined = false) {
+    public function getContext($exception_if_context_undefined = false)
+    {
         if (null === $this->context && $exception_if_context_undefined === true)
             throw new \LogicException("No context defined. Please use setContext() first.");
 
         return $this->context;
     }
 
-	private function getSession() {
+    private function getSession()
+    {
         $session = $this->request->getSession();
 
         if ($session === null)
@@ -80,7 +80,8 @@ class SecurityContext {
     *
     * @return UserInterface|null A UserInterface instance or null if no user is available
     */
-	public function getUser() {
+    public function getUser()
+    {
         $context = $this->getContext(true);
 
         if ($context === self::CONTEXT_FRONT_OFFICE)
@@ -118,7 +119,7 @@ class SecurityContext {
 
             $roleFound = false;
 
-        	foreach($userRoles as $role) {
+            foreach ($userRoles as $role) {
                 if (in_array($role, $roles)) {
                     $roleFound = true;
 
@@ -146,7 +147,7 @@ class SecurityContext {
                        return true;
 
                    // Check that user's permissions matches required permissions
-       			foreach($permissions as $permission) {
+                   foreach ($permissions as $permission) {
                        if (! in_array($permission, $userPermissions)) {
                            $permissionsFound = false;
 
@@ -181,7 +182,8 @@ class SecurityContext {
     /**
      * Clear the user from the security context
      */
-    public function clear() {
+    public function clear()
+    {
         $context = $this->getContext(true);
 
         if ($context === self::CONTEXT_FRONT_OFFICE)

core/lib/Thelia/Core/Security/User/UserInterface.php

@@ -8,8 +8,8 @@ namespace Thelia\Core\Security\User;
  * @author Franck Allimant <franck@cqfdev.fr>
  *
  */
-interface UserInterface {
+interface UserInterface
-
+{
     /**
      * Return the user unique name
      */

core/lib/Thelia/Core/Security/UserProvider/AdminUserProvider.php

@@ -4,10 +4,10 @@ namespace Thelia\Core\Security\UserProvider;
 use Thelia\Model\Admin;
 use Thelia\Model\AdminQuery;
 
-class AdminUserProvider implements UserProviderInterface {
+class AdminUserProvider implements UserProviderInterface
-
+{
-    public function getUser($key) {
+    public function getUser($key)
-
+    {
         $admin = AdminQuery::create()
             ->filterByLogin($key)
             ->findOne();

core/lib/Thelia/Core/Security/UserProvider/CustomerUserProvider.php

@@ -1,13 +1,12 @@
 <?php
 namespace Thelia\Core\Security\UserProvider;
 
-
 use Thelia\Action\Customer;
 use Thelia\Model\CustomerQuery;
-class CustomerUserProvider implements UserProviderInterface {
+class CustomerUserProvider implements UserProviderInterface
-
+{
-    public function getUser($key) {
+    public function getUser($key)
-
+    {
         $customer = CustomerQuery::create()
             ->filterByEmail($key)
             ->findOne();

core/lib/Thelia/Core/Security/UserProvider/UserProviderInterface.php

@@ -2,7 +2,8 @@
 
 namespace Thelia\Core\Security\UserProvider;
 
-interface UserProviderInterface {
+interface UserProviderInterface
+{
     /**
      * Returns a UserInterface instance
      *
@@ -11,4 +12,3 @@ interface UserProviderInterface {
      */
     public function getUser($key);
 }
-?>

core/lib/Thelia/Core/Template/Element/BaseLoop.php

@@ -51,7 +51,6 @@ abstract class BaseLoop
      */
     protected $securityContext;
 
-
     protected $args;
 
     /**
@@ -93,8 +92,8 @@ abstract class BaseLoop
      * @return null
      * @throws \InvalidArgumentException if the parameter is unknown or the method name is not supported.
      */
-    public function __call($name, $arguments) {
+    public function __call($name, $arguments)
-
+    {
         if (substr($name, 0, 3) == 'get') {
 
             // camelCase to underscore: getNotEmpty -> not_empty
@@ -113,8 +112,8 @@ abstract class BaseLoop
      *
      * @throws \InvalidArgumentException if somùe argument values are missing, or invalid
      */
-    public function initializeArgs(array $nameValuePairs) {
+    public function initializeArgs(array $nameValuePairs)
-
+    {
         $faultActor = array();
         $faultDetails = array();
 
@@ -127,24 +126,21 @@ abstract class BaseLoop
             $value = isset($nameValuePairs[$argument->name]) ? $nameValuePairs[$argument->name] : null;
 
             /* check if mandatory */
-            if($value === null && $argument->mandatory) {
+            if ($value === null && $argument->mandatory) {
                 $faultActor[] = $argument->name;
                 $faultDetails[] = sprintf('"%s" parameter is missing in loop type: %s, name: %s', $argument->name, $loopType, $loopName);
-            }
+            } else  if ($value === '' && !$argument->empty) {
-			else  if($value === '' && !$argument->empty) {
                    /* check if empty */
                 $faultActor[] = $argument->name;
                 $faultDetails[] = sprintf('"%s" parameter cannot be empty in loop type: %s, name: %s', $argument->name, $loopType, $loopName);
-            }
+            } elseif ($value !== null && !$argument->type->isValid($value)) {
-            else if($value !== null && !$argument->type->isValid($value)) {
                 /* check type */
                 $faultActor[] = $argument->name;
                 $faultDetails[] = sprintf('Invalid value for "%s" argument in loop type: %s, name: %s', $argument->name, $loopType, $loopName);
-            }
+            } else {
-			else {
                 /* set default */
                 /* did it as last checking for we consider default value is acceptable no matter type or empty restriction */
-	            if($value === null) {
+                if ($value === null) {
                     $value = $argument->default;
                 }
 
@@ -167,8 +163,8 @@ abstract class BaseLoop
      * @throws \InvalidArgumentException if argument is not found in loop argument list
      * @return Argument                  the loop argument.
      */
-    public function getArg($argumentName) {
+    public function getArg($argumentName)
-
+    {
         $arg = $this->args->get($argumentName);
 
         if ($arg === null)
@@ -185,8 +181,8 @@ abstract class BaseLoop
      * @throws \InvalidArgumentException if argument is not found in loop argument list
      * @return Argument                  the loop argument.
      */
-    public function getArgValue($argumentName) {
+    public function getArgValue($argumentName)
-
+    {
         return $this->getArg($argumentName)->getValue();
     }
 
@@ -198,7 +194,7 @@ abstract class BaseLoop
      */
     public function search(ModelCriteria $search, &$pagination = null)
     {
-        if($this->getArgValue('page') !== null) {
+        if ($this->getArgValue('page') !== null) {
             return $this->searchWithPagination($search, $pagination);
         } else {
             return $this->searchWithOffset($search);
@@ -212,7 +208,7 @@ abstract class BaseLoop
      */
     public function searchWithOffset(ModelCriteria $search)
     {
-        if($this->getArgValue('limit') >= 0) {
+        if ($this->getArgValue('limit') >= 0) {
             $search->limit($this->getArgValue('limit'));
         }
         $search->offset($this->getArgValue('offset'));
@@ -230,7 +226,7 @@ abstract class BaseLoop
     {
         $pagination = $search->paginate($this->getArgValue('page'), $this->getArgValue('limit'));
 
-        if($this->getArgValue('page') > $pagination->getLastPage()) {
+        if ($this->getArgValue('page') > $pagination->getLastPage()) {
             return array();
         } else {
             return $pagination;

core/lib/Thelia/Core/Template/Loop/Accessory.php

@@ -26,19 +26,12 @@ namespace Thelia\Core\Template\Loop;
 use Thelia\Core\Template\Loop\Product;
 
 use Propel\Runtime\ActiveQuery\Criteria;
-use Propel\Runtime\ActiveQuery\Join;
-use Thelia\Core\Template\Element\BaseLoop;
 use Thelia\Core\Template\Element\LoopResult;
-use Thelia\Core\Template\Element\LoopResultRow;
 
 use Thelia\Core\Template\Loop\Argument\ArgumentCollection;
 use Thelia\Core\Template\Loop\Argument\Argument;
-use Thelia\Log\Tlog;
 
 use Thelia\Model\AccessoryQuery;
-use Thelia\Model\ProductQuery;
-use Thelia\Model\ConfigQuery;
-use Thelia\Type\TypeCollection;
 use Thelia\Type;
 
 /**
@@ -86,12 +79,12 @@ class Accessory extends Product
         $order = $this->getOrder();
         $orderByAccessory = array_search('accessory', $order);
         $orderByAccessoryReverse = array_search('accessory_reverse', $order);
-        if($orderByAccessory !== false) {
+        if ($orderByAccessory !== false) {
             $search->orderByPosition(Criteria::ASC);
             $order[$orderByAccessory] = 'given_id';
             $this->args->get('order')->setValue( implode(',', $order) );
         }
-        if($orderByAccessoryReverse !== false) {
+        if ($orderByAccessoryReverse !== false) {
             $search->orderByPosition(Criteria::DESC);
             $order[$orderByAccessoryReverse] = 'given_id';
             $this->args->get('order')->setValue( implode(',', $order) );
@@ -107,7 +100,7 @@ class Accessory extends Product
         $receivedIdList = $this->getId();
 
         /* if an Id list is receive, loop will only match accessories from this list */
-        if($receivedIdList === null) {
+        if ($receivedIdList === null) {
             $this->args->get('id')->setValue( implode(',', $accessoryIdList) );
         } else {
             $this->args->get('id')->setValue( implode(',', array_intersect($receivedIdList, $accessoryIdList)) );

core/lib/Thelia/Core/Template/Loop/Address.php

@@ -30,10 +30,8 @@ use Thelia\Core\Template\Element\LoopResultRow;
 
 use Thelia\Core\Template\Loop\Argument\ArgumentCollection;
 use Thelia\Core\Template\Loop\Argument\Argument;
-use Thelia\Log\Tlog;
 
 use Thelia\Model\AddressQuery;
-use Thelia\Model\ConfigQuery;
 use Thelia\Type\TypeCollection;
 use Thelia\Type;
 
@@ -87,7 +85,7 @@ class Address extends BaseLoop
 
         if ($customer === 'current') {
             $currentCustomer = $this->request->getSession()->getCustomerUser();
-            if($currentCustomer === null) {
+            if ($currentCustomer === null) {
                 return new LoopResult();
             } else {
                 $search->filterByCustomerId($currentCustomer->getId(), Criteria::EQUAL);
@@ -100,7 +98,7 @@ class Address extends BaseLoop
 
         if ($default === true) {
             $search->filterByIsDefault(1, Criteria::EQUAL);
-        } elseif($default === false) {
+        } elseif ($default === false) {
             $search->filterByIsDefault(1, Criteria::NOT_EQUAL);
         }
 

core/lib/Thelia/Core/Template/Loop/Argument/Argument.php

@@ -51,12 +51,14 @@ class Argument
         $this->setValue($value);
     }
 
-    public function getValue() {
+    public function getValue()
+    {
         return $this->type->getFormattedValue($this->value);
     }
 
-    public function setValue($value) {
+    public function setValue($value)
-    	$this->value = $value === null ? null : (string)$value;
+    {
+        $this->value = $value === null ? null : (string) $value;
     }
 
     public static function createAnyTypeArgument($name, $default=null, $mandatory=false, $empty=true)

core/lib/Thelia/Core/Template/Loop/Argument/ArgumentCollection.php

@@ -37,11 +37,13 @@ class ArgumentCollection implements \Iterator
         $this->addArguments(func_get_args(), true);
     }
 
-    public function hasKey($key) {
+    public function hasKey($key)
+    {
         return isset($this->arguments[$key]);
     }
 
-    public function get($key) {
+    public function get($key)
+    {
         return $this->hasKey($key) ? $this->arguments[$key] : null;
     }
 
@@ -58,7 +60,7 @@ class ArgumentCollection implements \Iterator
      */
     public function addArguments(array $argumentList, $force = true)
     {
-        foreach($argumentList as $argument) {
+        foreach ($argumentList as $argument) {
             $this->addArgument($argument, $force);
         }
 
@@ -73,7 +75,7 @@ class ArgumentCollection implements \Iterator
      */
     public function addArgument(Argument $argument, $force = true)
     {
-        if(isset($this->arguments[$argument->name]) && ! $force) {
+        if (isset($this->arguments[$argument->name]) && ! $force) {
             return $this;
         }
 

core/lib/Thelia/Core/Template/Loop/Auth.php

@@ -30,11 +30,6 @@ use Thelia\Core\Template\Element\LoopResultRow;
 use Thelia\Core\Template\Loop\Argument\ArgumentCollection;
 use Thelia\Core\Template\Loop\Argument\Argument;
 
-use Thelia\Type\TypeCollection;
-use Thelia\Type;
-
-use Symfony\Component\DependencyInjection\ContainerInterface;
-
 /**
  *
  * @package Thelia\Core\Template\Loop
@@ -87,8 +82,7 @@ class Auth extends BaseLoop
                 // Create an empty row: loop is no longer empty :)
                 $loopResult->addRow(new LoopResultRow());
             }
-    	}
+        } catch (\Exception $ex) {
-    	catch (\Exception $ex) {
             // Not granted, loop is empty
         }
 

core/lib/Thelia/Core/Template/Loop/Cart.php

@@ -9,13 +9,13 @@
 
 namespace Thelia\Core\Template\Loop;
 
-
 use Thelia\Core\Template\Element\BaseLoop;
 use Thelia\Core\Template\Element\LoopResult;
 use Thelia\Core\Template\Element\LoopResultRow;
 use Thelia\Core\Template\Loop\Argument\ArgumentCollection;
 
-class Cart extends BaseLoop {
+class Cart extends BaseLoop
+{
     use \Thelia\Cart\CartTrait;
     /**
      *
@@ -74,11 +74,10 @@ class Cart extends BaseLoop {
         $result = new LoopResult();
         $cart = $this->getCart($this->request);
 
-        if($cart === null) {
+        if ($cart === null) {
             return $result;
         }
 
-
         $cartItems = $cart->getCartItems();
 
         foreach ($cartItems as $cartItem) {
@@ -99,5 +98,4 @@ class Cart extends BaseLoop {
         return $result;
     }
 
-
 }

core/lib/Thelia/Core/Template/Loop/Category.php

@@ -30,7 +30,6 @@ use Thelia\Core\Template\Element\LoopResultRow;
 
 use Thelia\Core\Template\Loop\Argument\ArgumentCollection;
 use Thelia\Core\Template\Loop\Argument\Argument;
-use Thelia\Log\Tlog;
 
 use Thelia\Model\CategoryQuery;
 use Thelia\Model\ConfigQuery;
@@ -107,7 +106,6 @@ class Category extends BaseLoop
             $search->filterByParent($parent);
         }
 
-
         $current = $this->getCurrent();
 
         if ($current === true) {
@@ -116,7 +114,6 @@ class Category extends BaseLoop
             $search->filterById($this->request->get("category_id"), Criteria::NOT_IN);
         }
 
-
          $exclude = $this->getExclude();
 
         if (!is_null($exclude)) {
@@ -128,7 +125,7 @@ class Category extends BaseLoop
 
         $orders  = $this->getOrder();
 
-        foreach($orders as $order) {
+        foreach ($orders as $order) {
             switch ($order) {
                 case "alpha":
                     $search->addAscendingOrderByColumn(\Thelia\Model\Map\CategoryI18nTableMap::TITLE);
@@ -171,7 +168,6 @@ class Category extends BaseLoop
 
             if ($this->getNotEmpty() && $category->countAllProducts() == 0) continue;
 
-
             $loopResultRow = new LoopResultRow();
 
             $loopResultRow

core/lib/Thelia/Core/Template/Loop/CategoryPath.php

@@ -23,18 +23,14 @@
 
 namespace Thelia\Core\Template\Loop;
 
-use Propel\Runtime\ActiveQuery\Criteria;
 use Thelia\Core\Template\Element\BaseLoop;
 use Thelia\Core\Template\Element\LoopResult;
 use Thelia\Core\Template\Element\LoopResultRow;
 
 use Thelia\Core\Template\Loop\Argument\ArgumentCollection;
 use Thelia\Core\Template\Loop\Argument\Argument;
-use Thelia\Log\Tlog;
 
 use Thelia\Model\CategoryQuery;
-use Thelia\Model\ConfigQuery;
-use Thelia\Type\TypeCollection;
 use Thelia\Type;
 use Thelia\Type\BooleanOrBothType;
 
@@ -122,8 +118,7 @@ class CategoryPath extends BaseLoop
                     if ($visible == true) $search->filterByVisible($visible);
                 }
             }
-		}
+        } while ($category != null && $parent > 0);
-		while ($category != null && $parent > 0);
 
         // Reverse list and build the final result
         $results = array_reverse($results);

core/lib/Thelia/Core/Template/Loop/CategoryTree.php

@@ -30,11 +30,8 @@ use Thelia\Core\Template\Element\LoopResultRow;
 
 use Thelia\Core\Template\Loop\Argument\ArgumentCollection;
 use Thelia\Core\Template\Loop\Argument\Argument;
-use Thelia\Log\Tlog;
 
 use Thelia\Model\CategoryQuery;
-use Thelia\Model\ConfigQuery;
-use Thelia\Type\TypeCollection;
 use Thelia\Type;
 use Thelia\Type\BooleanOrBothType;
 
@@ -65,8 +62,8 @@ class CategoryTree extends BaseLoop
     }
 
     // changement de rubrique
-    protected function buildCategoryTree($parent, $visible, $level, $max_level, array $exclude, LoopResult &$loopResult) {
+    protected function buildCategoryTree($parent, $visible, $level, $max_level, array $exclude, LoopResult &$loopResult)
-
+    {
         if ($level > $max_level) return;
 
          $search = CategoryQuery::create();
@@ -81,7 +78,7 @@ class CategoryTree extends BaseLoop
 
         $results = $search->find();
 
-    	foreach($results as $result) {
+        foreach ($results as $result) {
 
             $loopResultRow = new LoopResultRow();
 

core/lib/Thelia/Core/Template/Loop/Content.php

@@ -24,16 +24,13 @@
 namespace Thelia\Core\Template\Loop;
 
 use Propel\Runtime\ActiveQuery\Criteria;
-use Propel\Runtime\ActiveQuery\Join;
 use Thelia\Core\Template\Element\BaseLoop;
 use Thelia\Core\Template\Element\LoopResult;
 use Thelia\Core\Template\Element\LoopResultRow;
 
 use Thelia\Core\Template\Loop\Argument\ArgumentCollection;
 use Thelia\Core\Template\Loop\Argument\Argument;
-use Thelia\Log\Tlog;
 
-use Thelia\Model\Base\FeatureContentQuery;
 use Thelia\Model\FolderQuery;
 use Thelia\Model\Map\ContentTableMap;
 use Thelia\Model\ContentFolderQuery;
@@ -101,8 +98,8 @@ class Content extends BaseLoop
 
             $depth = $this->getDepth();
 
-            if(null !== $depth) {
+            if (null !== $depth) {
-                foreach(FolderQuery::findAllChild($folder, $depth) as $subFolder) {
+                foreach (FolderQuery::findAllChild($folder, $depth) as $subFolder) {
                     $folders->prepend($subFolder);
                 }
             }
@@ -117,7 +114,7 @@ class Content extends BaseLoop
 
         if ($current === true) {
             $search->filterById($this->request->get("content_id"));
-        } elseif($current === false) {
+        } elseif ($current === false) {
             $search->filterById($this->request->get("content_id"), Criteria::NOT_IN);
         }
 
@@ -134,7 +131,7 @@ class Content extends BaseLoop
                 )->find(),
                 Criteria::IN
             );
-        } elseif($current_folder === false) {
+        } elseif ($current_folder === false) {
             $search->filterByFolder(
                 FolderQuery::create()->filterByContent(
                     ContentFolderQuery::create()->filterByContentId(
@@ -153,7 +150,7 @@ class Content extends BaseLoop
 
         $orders  = $this->getOrder();
 
-        foreach($orders as $order) {
+        foreach ($orders as $order) {
             switch ($order) {
                 case "alpha":
                     $search->addAscendingOrderByColumn(\Thelia\Model\Map\ContentI18nTableMap::TITLE);
@@ -174,7 +171,7 @@ class Content extends BaseLoop
                 case "given_id":
                     if(null === $id)
                         throw new \InvalidArgumentException('Given_id order cannot be set without `id` argument');
-                    foreach($id as $singleId) {
+                    foreach ($id as $singleId) {
                         $givenIdMatched = 'given_id_matched_' . $singleId;
                         $search->withColumn(ContentTableMap::ID . "='$singleId'", $givenIdMatched);
                         $search->orderBy($givenIdMatched, Criteria::DESC);

core/lib/Thelia/Core/Template/Loop/Country.php

@@ -30,12 +30,9 @@ use Thelia\Core\Template\Element\LoopResultRow;
 
 use Thelia\Core\Template\Loop\Argument\ArgumentCollection;
 use Thelia\Core\Template\Loop\Argument\Argument;
-use Thelia\Log\Tlog;
 
 use Thelia\Model\CountryQuery;
 use Thelia\Model\ConfigQuery;
-use Thelia\Type\TypeCollection;
-use Thelia\Type;
 
 /**
  *

core/lib/Thelia/Core/Template/Loop/Customer.php

@@ -30,10 +30,8 @@ use Thelia\Core\Template\Element\LoopResultRow;
 
 use Thelia\Core\Template\Loop\Argument\ArgumentCollection;
 use Thelia\Core\Template\Loop\Argument\Argument;
-use Thelia\Log\Tlog;
 
 use Thelia\Model\CustomerQuery;
-use Thelia\Model\ConfigQuery;
 use Thelia\Type\TypeCollection;
 use Thelia\Type;
 
@@ -80,7 +78,7 @@ class Customer extends BaseLoop
 
         if ($current === true) {
             $currentCustomer = $this->request->getSession()->getCustomerUser();
-            if($currentCustomer === null) {
+            if ($currentCustomer === null) {
                 return new LoopResult();
             } else {
                 $search->filterById($currentCustomer->getId(), Criteria::EQUAL);
@@ -103,7 +101,7 @@ class Customer extends BaseLoop
 
         if ($reseller === true) {
             $search->filterByReseller(1, Criteria::EQUAL);
-        } else if($reseller === false) {
+        } elseif ($reseller === false) {
             $search->filterByReseller(0, Criteria::EQUAL);
         }
 

core/lib/Thelia/Core/Template/Loop/Feature.php

@@ -24,14 +24,12 @@
 namespace Thelia\Core\Template\Loop;
 
 use Propel\Runtime\ActiveQuery\Criteria;
-use Propel\Runtime\ActiveQuery\Join;
 use Thelia\Core\Template\Element\BaseLoop;
 use Thelia\Core\Template\Element\LoopResult;
 use Thelia\Core\Template\Element\LoopResultRow;
 
 use Thelia\Core\Template\Loop\Argument\ArgumentCollection;
 use Thelia\Core\Template\Loop\Argument\Argument;
-use Thelia\Log\Tlog;
 
 use Thelia\Model\Base\CategoryQuery;
 use Thelia\Model\Base\ProductCategoryQuery;
@@ -102,17 +100,17 @@ class Feature extends BaseLoop
         $product = $this->getProduct();
         $category = $this->getCategory();
 
-        if(null !== $product) {
+        if (null !== $product) {
             $productCategories = ProductCategoryQuery::create()->select(array(ProductCategoryTableMap::CATEGORY_ID))->filterByProductId($product, Criteria::IN)->find()->getData();
 
-            if(null === $category) {
+            if (null === $category) {
                 $category = $productCategories;
             } else {
                 $category = array_merge($category, $productCategories);
             }
         }
 
-        if(null !== $category) {
+        if (null !== $category) {
             $search->filterByCategory(
                 CategoryQuery::create()->filterById($category)->find(),
                 Criteria::IN
@@ -121,7 +119,7 @@ class Feature extends BaseLoop
 
         $orders  = $this->getOrder();
 
-        foreach($orders as $order) {
+        foreach ($orders as $order) {
             switch ($order) {
                 case "alpha":
                     $search->addAscendingOrderByColumn(\Thelia\Model\Map\FeatureI18nTableMap::TITLE);

core/lib/Thelia/Core/Template/Loop/FeatureAvailable.php

@@ -24,14 +24,12 @@
 namespace Thelia\Core\Template\Loop;
 
 use Propel\Runtime\ActiveQuery\Criteria;
-use Propel\Runtime\ActiveQuery\Join;
 use Thelia\Core\Template\Element\BaseLoop;
 use Thelia\Core\Template\Element\LoopResult;
 use Thelia\Core\Template\Element\LoopResultRow;
 
 use Thelia\Core\Template\Loop\Argument\ArgumentCollection;
 use Thelia\Core\Template\Loop\Argument\Argument;
-use Thelia\Log\Tlog;
 
 use Thelia\Model\Base\FeatureAvQuery;
 use Thelia\Model\ConfigQuery;
@@ -91,13 +89,13 @@ class FeatureAvailable extends BaseLoop
 
         $feature = $this->getFeature();
 
-        if(null !== $feature) {
+        if (null !== $feature) {
             $search->filterByFeatureId($feature, Criteria::IN);
         }
 
         $orders  = $this->getOrder();
 
-        foreach($orders as $order) {
+        foreach ($orders as $order) {
             switch ($order) {
                 case "alpha":
                     $search->addAscendingOrderByColumn(\Thelia\Model\Map\FeatureAvI18nTableMap::TITLE);

core/lib/Thelia/Core/Template/Loop/FeatureValue.php

@@ -24,14 +24,12 @@
 namespace Thelia\Core\Template\Loop;
 
 use Propel\Runtime\ActiveQuery\Criteria;
-use Propel\Runtime\ActiveQuery\Join;
 use Thelia\Core\Template\Element\BaseLoop;
 use Thelia\Core\Template\Element\LoopResult;
 use Thelia\Core\Template\Element\LoopResultRow;
 
 use Thelia\Core\Template\Loop\Argument\ArgumentCollection;
 use Thelia\Core\Template\Loop\Argument\Argument;
-use Thelia\Log\Tlog;
 
 use Thelia\Model\Base\FeatureProductQuery;
 use Thelia\Model\ConfigQuery;
@@ -94,18 +92,18 @@ class FeatureValue extends BaseLoop
         }
 
         $excludeFeatureAvailable = $this->getExclude_feature_available();
-        if($excludeFeatureAvailable == true) {
+        if ($excludeFeatureAvailable == true) {
             $search->filterByFeatureAvId(null, Criteria::NULL);
         }
 
         $excludeDefaultValues = $this->getExclude_default_values();
-        if($excludeDefaultValues == true) {
+        if ($excludeDefaultValues == true) {
             $search->filterByByDefault(null, Criteria::NULL);
         }
 
         $orders  = $this->getOrder();
 
-        foreach($orders as $order) {
+        foreach ($orders as $order) {
             switch ($order) {
                 case "alpha":
                     $search->addAscendingOrderByColumn(\Thelia\Model\Map\FeatureI18nTableMap::TITLE);

core/lib/Thelia/Core/Template/Loop/Feed.php

@@ -30,9 +30,6 @@ use Thelia\Core\Template\Element\LoopResultRow;
 use Thelia\Core\Template\Loop\Argument\ArgumentCollection;
 use Thelia\Core\Template\Loop\Argument\Argument;
 
-use Thelia\Type\TypeCollection;
-use Thelia\Type;
-
 /**
  *
  * @package Thelia\Core\Template\Loop
@@ -78,7 +75,7 @@ class Feed extends BaseLoop
 
         $loopResult = new LoopResult();
 
-        for($idx = 0; $idx < $limit; $idx++) {
+        for ($idx = 0; $idx < $limit; $idx++) {
 
             $item = $items[$idx];
 

core/lib/Thelia/Core/Template/Loop/Folder.php

@@ -30,7 +30,6 @@ use Thelia\Core\Template\Element\LoopResultRow;
 
 use Thelia\Core\Template\Loop\Argument\ArgumentCollection;
 use Thelia\Core\Template\Loop\Argument\Argument;
-use Thelia\Log\Tlog;
 
 use Thelia\Model\FolderQuery;
 use Thelia\Model\ConfigQuery;
@@ -89,7 +88,6 @@ class Folder extends BaseLoop
             $search->filterByParent($parent);
         }
 
-
         $current = $this->getCurrent();
 
         if ($current === true) {
@@ -98,7 +96,6 @@ class Folder extends BaseLoop
             $search->filterById($this->request->get("folder_id"), Criteria::NOT_IN);
         }
 
-
          $exclude = $this->getExclude();
 
         if (!is_null($exclude)) {
@@ -111,7 +108,7 @@ class Folder extends BaseLoop
 
         $orders  = $this->getOrder();
 
-        foreach($orders as $order) {
+        foreach ($orders as $order) {
             switch ($order) {
                 case "alpha":
                     $search->addAscendingOrderByColumn(\Thelia\Model\Map\FolderI18nTableMap::TITLE);

core/lib/Thelia/Core/Template/Loop/Lang.php

@@ -30,8 +30,6 @@ use Thelia\Core\Template\Element\LoopResultRow;
 
 use Thelia\Core\Template\Loop\Argument\Argument;
 
-use Thelia\Type\TypeCollection;
-use Thelia\Type;
 use Thelia\Model\LangQuery;
 use Thelia\Core\Template\Loop\Argument\ArgumentCollection;
 

core/lib/Thelia/Core/Template/Loop/Order.php

@@ -25,14 +25,10 @@ namespace Thelia\Core\Template\Loop;
 
 use Thelia\Core\Template\Element\BaseLoop;
 use Thelia\Core\Template\Element\LoopResult;
-use Thelia\Core\Template\Element\LoopResultRow;
 
 use Thelia\Core\Template\Loop\Argument\ArgumentCollection;
 use Thelia\Core\Template\Loop\Argument\Argument;
 
-use Thelia\Type\TypeCollection;
-use Thelia\Type;
-
 /**
  *
  * @package Thelia\Core\Template\Loop

core/lib/Thelia/Core/Template/Loop/OrderStatus.php

@@ -25,14 +25,10 @@ namespace Thelia\Core\Template\Loop;
 
 use Thelia\Core\Template\Element\BaseLoop;
 use Thelia\Core\Template\Element\LoopResult;
-use Thelia\Core\Template\Element\LoopResultRow;
 
 use Thelia\Core\Template\Loop\Argument\ArgumentCollection;
 use Thelia\Core\Template\Loop\Argument\Argument;
 
-use Thelia\Type\TypeCollection;
-use Thelia\Type;
-
 /**
  *
  * @package Thelia\Core\Template\Loop

core/lib/Thelia/Core/Template/Loop/Product.php

@@ -24,20 +24,14 @@
 namespace Thelia\Core\Template\Loop;
 
 use Propel\Runtime\ActiveQuery\Criteria;
-use Propel\Runtime\ActiveQuery\Join;
 use Thelia\Core\Template\Element\BaseLoop;
 use Thelia\Core\Template\Element\LoopResult;
 use Thelia\Core\Template\Element\LoopResultRow;
 
 use Thelia\Core\Template\Loop\Argument\ArgumentCollection;
 use Thelia\Core\Template\Loop\Argument\Argument;
-use Thelia\Log\Tlog;
 
-use Thelia\Model\Base\FeatureProductQuery;
 use Thelia\Model\CategoryQuery;
-use Thelia\Model\FeatureAvQuery;
-use Thelia\Model\FeatureQuery;
-use Thelia\Model\Map\FeatureProductTableMap;
 use Thelia\Model\Map\ProductTableMap;
 use Thelia\Model\ProductCategoryQuery;
 use Thelia\Model\ProductQuery;
@@ -137,8 +131,8 @@ class Product extends BaseLoop
 
             $depth = $this->getDepth();
 
-            if(null !== $depth) {
+            if (null !== $depth) {
-                foreach(CategoryQuery::findAllChild($category, $depth) as $subCategory) {
+                foreach (CategoryQuery::findAllChild($category, $depth) as $subCategory) {
                     $categories->prepend($subCategory);
                 }
             }
@@ -153,7 +147,7 @@ class Product extends BaseLoop
 
         if ($new === true) {
             $search->filterByNewness(1, Criteria::EQUAL);
-        } else if($new === false) {
+        } elseif ($new === false) {
             $search->filterByNewness(0, Criteria::EQUAL);
         }
 
@@ -161,7 +155,7 @@ class Product extends BaseLoop
 
         if ($promo === true) {
             $search->filterByPromo(1, Criteria::EQUAL);
-        } else if($promo === false) {
+        } elseif ($promo === false) {
             $search->filterByNewness(0, Criteria::EQUAL);
         }
 
@@ -173,7 +167,7 @@ class Product extends BaseLoop
 
         $min_price = $this->getMin_price();*/
 
-        //if(null !== $min_price) {
+        //if (null !== $min_price) {
             /**
              * Following should work but does not :
              *
@@ -190,7 +184,7 @@ class Product extends BaseLoop
 
         $max_price = $this->getMax_price();*/
 
-        //if(null !== $max_price) {
+        //if (null !== $max_price) {
             /**
              * Following should work but does not :
              *
@@ -207,13 +201,13 @@ class Product extends BaseLoop
 
         /*$min_weight = $this->getMin_weight();
 
-        if(null !== $min_weight) {
+        if (null !== $min_weight) {
             $search->filterByWeight($min_weight, Criteria::GREATER_EQUAL);
         }
 
         $max_weight = $this->getMax_weight();
 
-        if(null !== $max_weight) {
+        if (null !== $max_weight) {
             $search->filterByWeight($max_weight, Criteria::LESS_EQUAL);
         }*/
 
@@ -221,7 +215,7 @@ class Product extends BaseLoop
 
         if ($current === true) {
             $search->filterById($this->request->get("product_id"));
-        } elseif($current === false) {
+        } elseif ($current === false) {
             $search->filterById($this->request->get("product_id"), Criteria::NOT_IN);
         }
 
@@ -238,7 +232,7 @@ class Product extends BaseLoop
                 )->find(),
                 Criteria::IN
             );
-        } elseif($current_category === false) {
+        } elseif ($current_category === false) {
             $search->filterByCategory(
                 CategoryQuery::create()->filterByProduct(
                     ProductCategoryQuery::create()->filterByProductId(
@@ -257,7 +251,7 @@ class Product extends BaseLoop
 
         $orders  = $this->getOrder();
 
-        foreach($orders as $order) {
+        foreach ($orders as $order) {
             switch ($order) {
                 case "alpha":
                     $search->addAscendingOrderByColumn(\Thelia\Model\Map\ProductI18nTableMap::TITLE);
@@ -293,7 +287,7 @@ class Product extends BaseLoop
                 case "given_id":
                     if(null === $id)
                         throw new \InvalidArgumentException('Given_id order cannot be set without `id` argument');
-                    foreach($id as $singleId) {
+                    foreach ($id as $singleId) {
                         $givenIdMatched = 'given_id_matched_' . $singleId;
                         $search->withColumn(ProductTableMap::ID . "='$singleId'", $givenIdMatched);
                         $search->orderBy($givenIdMatched, Criteria::DESC);
@@ -323,9 +317,9 @@ class Product extends BaseLoop
 
         $feature_available = $this->getFeature_available();
 
-        if(null !== $feature_available) {
+        if (null !== $feature_available) {
-            foreach($feature_available as $feature => $feature_choice) {
+            foreach ($feature_available as $feature => $feature_choice) {
-                foreach($feature_choice['values'] as $feature_av) {
+                foreach ($feature_choice['values'] as $feature_av) {
                     $featureAlias = 'fa_' . $feature;
                     if($feature_av != '*')
                         $featureAlias .= '_' . $feature_av;
@@ -337,7 +331,7 @@ class Product extends BaseLoop
 
                 /* format for mysql */
                 $sqlWhereString = $feature_choice['expression'];
-                if($sqlWhereString == '*') {
+                if ($sqlWhereString == '*') {
                     $sqlWhereString = 'NOT ISNULL(`fa_' . $feature . '`.ID)';
                 } else {
                     $sqlWhereString = preg_replace('#([0-9]+)#', 'NOT ISNULL(`fa_' . $feature . '_' . '\1`.ID)', $sqlWhereString);
@@ -351,9 +345,9 @@ class Product extends BaseLoop
 
         $feature_values = $this->getFeature_values();
 
-        if(null !== $feature_values) {
+        if (null !== $feature_values) {
-            foreach($feature_values as $feature => $feature_choice) {
+            foreach ($feature_values as $feature => $feature_choice) {
-                foreach($feature_choice['values'] as $feature_value) {
+                foreach ($feature_choice['values'] as $feature_value) {
                     $featureAlias = 'fv_' . $feature;
                     if($feature_value != '*')
                         $featureAlias .= '_' . $feature_value;
@@ -365,7 +359,7 @@ class Product extends BaseLoop
 
                 /* format for mysql */
                 $sqlWhereString = $feature_choice['expression'];
-                if($sqlWhereString == '*') {
+                if ($sqlWhereString == '*') {
                     $sqlWhereString = 'NOT ISNULL(`fv_' . $feature . '`.ID)';
                 } else {
                     $sqlWhereString = preg_replace('#([a-zA-Z0-9_\-]+)#', 'NOT ISNULL(`fv_' . $feature . '_' . '\1`.ID)', $sqlWhereString);

core/lib/Thelia/Core/Template/Loop/Title.php

@@ -30,12 +30,9 @@ use Thelia\Core\Template\Element\LoopResultRow;
 
 use Thelia\Core\Template\Loop\Argument\ArgumentCollection;
 use Thelia\Core\Template\Loop\Argument\Argument;
-use Thelia\Log\Tlog;
 
 use Thelia\Model\CustomerTitleQuery;
 use Thelia\Model\ConfigQuery;
-use Thelia\Type\TypeCollection;
-use Thelia\Type;
 
 /**
  *

core/lib/Thelia/Core/Template/ParserContext.php

@@ -37,8 +37,8 @@ class ParserContext implements \IteratorAggregate
 {
     private $store = array();
 
-	public function __construct(Request $request) {
+    public function __construct(Request $request)
-
+    {
         // Setup basic variables
         $this
             ->set('BASE_URL'		, ConfigQuery::read('base_url', '/'))

core/lib/Thelia/Core/Template/Smarty/AbstractSmartyPlugin.php

@@ -65,7 +65,6 @@ abstract class AbstractSmartyPlugin
         $value = $this->getParam($params, $name, $default);
 
         if (is_string($value)) $value = strtolower(trim($value));
-
         return $value;
     }
 
@@ -80,13 +79,12 @@ abstract class AbstractSmartyPlugin
     public function getParam($params, $name, $default = null)
     {
         if (is_array($name)) {
-			foreach($name as $test) {
+            foreach ($name as $test) {
                 if (isset($params[$test])) {
                     return $params[$test];
                 }
             }
-		}
+        } elseif (isset($params[$name])) {
-		else if (isset($params[$name])) {
             return $params[$name];
         }
 
@@ -96,5 +94,5 @@ abstract class AbstractSmartyPlugin
     /**
      * @return an array of SmartyPluginDescriptor
      */
-    public abstract function getPluginDescriptors();
+    abstract public function getPluginDescriptors();
 }

core/lib/Thelia/Core/Template/Smarty/Assets/SmartyAssetsManager.php

@@ -24,7 +24,6 @@
 namespace Thelia\Core\Template\Smarty\Assets;
 
 use Thelia\Core\Template\Assets\AsseticHelper;
-use Thelia\Model\ConfigQuery;
 use Thelia\Tools\URL;
 
 class SmartyAssetsManager
@@ -50,7 +49,8 @@ class SmartyAssetsManager
         $this->assetic_manager = new AsseticHelper();
     }
 
-    public function computeAssetUrl($assetType, $params, \Smarty_Internal_Template $template) {
+    public function computeAssetUrl($assetType, $params, \Smarty_Internal_Template $template)
+    {
             $file    = $params['file'];
             $filters = isset($params['filters']) ? $params['filters'] : '';
             $debug   = isset($params['debug']) ? trim(strtolower($params['debug'])) == 'true' : false;

core/lib/Thelia/Core/Template/Smarty/Plugins/DataAccessFunctions.php

@@ -67,7 +67,6 @@ class DataAccessFunctions extends AbstractSmartyPlugin
          return $this->userDataAccess("Customer User", SecurityContext::CONTEXT_FRONT_OFFICE, $params);
      }
 
-
     /**
      * Provides access to user attributes using the accessors.
      *

core/lib/Thelia/Core/Template/Smarty/Plugins/Form.php

@@ -28,7 +28,6 @@ use Thelia\Core\Template\Element\Exception\ElementNotFoundException;
 use Symfony\Component\HttpFoundation\Request;
 use Thelia\Core\Template\Smarty\SmartyPluginDescriptor;
 use Thelia\Core\Template\Smarty\AbstractSmartyPlugin;
-use Thelia\Log\Tlog;
 use Thelia\Core\Template\ParserContext;
 
 /**
@@ -111,8 +110,7 @@ class Form extends AbstractSmartyPlugin
 
             $template->assign("form_error", $instance->hasError() ? true : false);
             $template->assign("form_error_message", $instance->getErrorMessage());
-        }
+        } else {
-        else {
             return $content;
         }
     }
@@ -145,8 +143,7 @@ class Form extends AbstractSmartyPlugin
             $template->assign("attr", implode(" ", $attr));
 
             $formFieldView->setRendered();
-        }
+        } else {
-        else {
             return $content;
         }
     }
@@ -193,8 +190,7 @@ class Form extends AbstractSmartyPlugin
 
         if ($repeat) {
             $this->assignFieldErrorVars($template, $errors);
-        }
+        } else {
-        else {
             return $content;
         }
     }
@@ -212,7 +208,8 @@ class Form extends AbstractSmartyPlugin
         return array_search("hidden", $formView->vars["block_prefixes"]);
     }
 
-    protected function getFormFieldView($params) {
+    protected function getFormFieldView($params)
+    {
         $instance = $this->getInstanceFromParams($params);
 
         $fieldName = $this->getParam($params, 'field');
@@ -227,8 +224,8 @@ class Form extends AbstractSmartyPlugin
         return $instance->getView()[$fieldName];
     }
 
-    protected function getInstanceFromParams($params) {
+    protected function getInstanceFromParams($params)
-
+    {
         $instance = $this->getParam($params, 'form');
 
         if (null == $instance) {

core/lib/Thelia/Core/Template/Smarty/Plugins/Security.php

@@ -25,7 +25,6 @@ namespace Thelia\Core\Template\Smarty\Plugins;
 
 use Thelia\Core\Template\Smarty\SmartyPluginDescriptor;
 use Thelia\Core\Template\Smarty\AbstractSmartyPlugin;
-use Thelia\Core\Template\Smarty\Assets\SmartyAssetsManager;
 use Thelia\Core\Security\SecurityContext;
 use Thelia\Core\Security\Exception\AuthenticationException;
 

core/lib/Thelia/Core/Template/Smarty/Plugins/TheliaLoop.php

@@ -61,7 +61,7 @@ class TheliaLoop extends AbstractSmartyPlugin
      */
     public static function getPagination($loopId)
     {
-        if(!empty(self::$pagination[$loopId])) {
+        if (!empty(self::$pagination[$loopId])) {
             return self::$pagination[$loopId];
         } else {
             return null;
@@ -144,14 +144,14 @@ class TheliaLoop extends AbstractSmartyPlugin
                 $varlist[] = 'LOOP_COUNT';
                 $varlist[] = 'LOOP_TOTAL';
 
-                foreach($varlist as $var) {
+                foreach ($varlist as $var) {
                     $saved_vars[$var] = $template->getTemplateVars($var);
                 }
 
                 $this->varstack[$name] = $saved_vars;
             }
 
-            foreach($loopResultRow->getVarVal() as $var => $val) {
+            foreach ($loopResultRow->getVarVal() as $var => $val) {
                 $template->assign($var, $val);
             }
 
@@ -166,7 +166,7 @@ class TheliaLoop extends AbstractSmartyPlugin
         if (! $repeat) {
             // Restore previous variables values before terminating
             if (isset($this->varstack[$name])) {
-    		    foreach($this->varstack[$name] as $var => $value) {
+                foreach ($this->varstack[$name] as $var => $value) {
                     $template->assign($var, $value);
                 }
 
@@ -248,7 +248,7 @@ class TheliaLoop extends AbstractSmartyPlugin
             throw new \InvalidArgumentException("Loop $loopName  is not defined");
         }
 
-        if($pagination->getNbResults() == 0) {
+        if ($pagination->getNbResults() == 0) {
             return '';
         }
 

core/lib/Thelia/Core/Template/Smarty/Plugins/TheliaSyntax.php

@@ -35,7 +35,7 @@ class TheliaSyntax extends AbstractSmartyPlugin
 {
     public function dieseCancel($value, $diese)
     {
-        if($value === null) {
+        if ($value === null) {
             return $diese;
         }
 

core/lib/Thelia/Core/Template/Smarty/Plugins/Translation.php

@@ -31,7 +31,8 @@ class Translation extends AbstractSmartyPlugin
 {
     protected $translator;
 
-	public function __construct(TranslatorInterface $translator) {
+    public function __construct(TranslatorInterface $translator)
+    {
         $this->translator = $translator;
     }
 
@@ -48,7 +49,7 @@ class Translation extends AbstractSmartyPlugin
         // and pass it to the translator
         $vars = array();
 
-    	foreach($params as $name => $value) {
+        foreach ($params as $name => $value) {
             if ($name != 'l') $vars["%$name"] = $value;
         }
 

core/lib/Thelia/Core/Template/Smarty/Plugins/UrlGenerator.php

@@ -54,7 +54,6 @@ class UrlGenerator extends AbstractSmartyPlugin
            $url = URL::absoluteUrl($path, $this->getArgsFromParam($params, array('path', 'target')));
 
            if ($target != null) $url .= '#'.$target;
-
            return $url;
      }
 
@@ -93,7 +92,6 @@ class UrlGenerator extends AbstractSmartyPlugin
          $args = $this->getArgsFromParam($params, array('view', 'action', 'target'));
 
          if (! empty($action)) $args['action'] = $action;
-
          return $forAdmin ? URL::adminViewUrl($view, $args) : URL::viewUrl($view, $args);
      }
 
@@ -103,11 +101,11 @@ class UrlGenerator extends AbstractSmartyPlugin
       * @param array $params Smarty function params
       * @return array the parameters array (either emply, of valued)
       */
-     private function getArgsFromParam($params, $exclude = array()) {
+     private function getArgsFromParam($params, $exclude = array())
-
+     {
          $pairs = array();
 
-   		foreach($params as $name => $value) {
+           foreach ($params as $name => $value) {
 
                if (in_array($name, $exclude)) continue;
 

core/lib/Thelia/Core/Template/Smarty/SmartyParser.php

@@ -69,7 +69,7 @@ class SmartyParser extends Smarty implements ParserInterface
         $this->error_reporting = E_ALL ^ E_NOTICE;
 
         // Si on n'est pas en mode debug, activer le cache, avec une lifetime de 15mn, et en vérifiant que les templates sources n'ont pas été modifiés.
-        if($debug === false) {
+        if ($debug === false) {
             $this->caching        = Smarty::CACHING_LIFETIME_CURRENT;
             $this->cache_lifetime = 300;
             $this->compile_check  = true;
@@ -120,7 +120,7 @@ class SmartyParser extends Smarty implements ParserInterface
     public function render($realTemplateName, array $parameters = array())
     {
         // Assign the parserContext variables
-    	foreach($this->parserContext as $var => $value) {
+        foreach ($this->parserContext as $var => $value) {
             $this->assign($var, $value);
         }
 
@@ -138,8 +138,7 @@ class SmartyParser extends Smarty implements ParserInterface
     {
         try {
             $templateFile = $this->getTemplateFilePath();
-        }
+        } catch (\RuntimeException $e) {
-        catch(\RuntimeException $e) {
             return new Response($e->getMessage(), "404");
         }
 
@@ -219,7 +218,7 @@ class SmartyParser extends Smarty implements ParserInterface
         if (!file_exists($fileName)) {
             $fileName .= ".html";
 
-            if(!file_exists($fileName)) {
+            if (!file_exists($fileName)) {
                 throw new ResourceNotFoundException(sprintf("%s file not found in %s template", $file, $this->template));
             }
         }

core/lib/Thelia/Core/Thelia.php

@@ -39,7 +39,6 @@ use Symfony\Component\Yaml\Yaml;
 use Symfony\Component\DependencyInjection\ParameterBag\ParameterBag;
 
 use Thelia\Core\Bundle;
-use Thelia\Core\DependencyInjection\Loader\CollectionXmlFileLoader;
 use Thelia\Log\Tlog;
 use Thelia\Config\DatabaseConfiguration;
 use Thelia\Config\DefinePropel;

core/lib/Thelia/Core/TheliaHttpKernel.php

@@ -138,10 +138,10 @@ class TheliaHttpKernel extends HttpKernel
     {
         $lang = null;
         //first priority => lang parameter present in request (get or post)
-        if($request->query->has("lang")) {
+        if ($request->query->has("lang")) {
             $lang = Model\LangQuery::create()->findOneByCode($request->query->get("lang"));
 
-            if(is_null($lang)) {
+            if (is_null($lang)) {
                 return;
             }
 

core/lib/Thelia/Core/Translation/Translator.php

@@ -3,8 +3,8 @@ namespace Thelia\Core\Translation;
 
 use Symfony\Component\Translation\Translator as BaseTranslator;
 
-class Translator extends BaseTranslator {
+class Translator extends BaseTranslator
-
+{
     /**
      * {@inheritdoc}
      *

core/lib/Thelia/Exception/InvalidCartException.php

@@ -21,10 +21,8 @@
 /*                                                                                   */
 /*************************************************************************************/
 
-
 namespace Thelia\Exception;
 
-
+class InvalidCartException extends \RuntimeException
-class InvalidCartException extends \RuntimeException {
+{
-
 }

core/lib/Thelia/Form/AdminLogin.php

@@ -22,13 +22,11 @@
 /*************************************************************************************/
 namespace Thelia\Form;
 
-
 use Symfony\Component\Validator\Constraints\Length;
 use Symfony\Component\Validator\Constraints\NotBlank;
-use Symfony\Component\Validator\Constraints\Choice;
-
-class AdminLogin extends BaseForm {
 
+class AdminLogin extends BaseForm
+{
     protected function buildForm()
     {
         $this->formBuilder

core/lib/Thelia/Form/BaseForm.php

@@ -24,7 +24,6 @@ namespace Thelia\Form;
 
 use Symfony\Component\Form\Extension\Validator\ValidatorExtension;
 use Symfony\Component\Form\Forms;
-use Symfony\Component\HttpFoundation\Session\Session;
 use Symfony\Component\HttpFoundation\Request;
 use Symfony\Component\Form\Extension\HttpFoundation\HttpFoundationExtension;
 use Symfony\Component\Form\Extension\Csrf\CsrfExtension;
@@ -33,7 +32,8 @@ use Symfony\Component\Validator\Validation;
 use Thelia\Model\ConfigQuery;
 use Thelia\Tools\URL;
 
-abstract class BaseForm {
+abstract class BaseForm
+{
     /**
      * @var \Symfony\Component\Form\FormFactoryInterface
      */
@@ -66,13 +66,13 @@ abstract class BaseForm {
 
         $validator = Validation::createValidator();
 
-        if(!isset($options["attr"]["name"])) {
+        if (!isset($options["attr"]["name"])) {
             $options["attr"]["thelia_name"] = $this->getName();
         }
 
         $builder =  Forms::createFormFactoryBuilder()
             ->addExtension(new HttpFoundationExtension());
-        if(!isset($options["csrf_protection"]) || $options["csrf_protection"] !== false) {
+        if (!isset($options["csrf_protection"]) || $options["csrf_protection"] !== false) {
             $builder->addExtension(
                 new CsrfExtension(
                     new SessionCsrfProvider(
@@ -98,7 +98,8 @@ abstract class BaseForm {
         $this->form = $this->formBuilder->getForm();
     }
 
-    public function getRequest() {
+    public function getRequest()
+    {
         return $this->request;
     }
 
@@ -116,8 +117,8 @@ abstract class BaseForm {
      *
      * @return string an absolute URL
      */
-    public function getSuccessUrl($default = null) {
+    public function getSuccessUrl($default = null)
-
+    {
         $successUrl = $this->form->get('success_url')->getData();
 
         if (empty($successUrl)) {
@@ -130,13 +131,14 @@ abstract class BaseForm {
         return URL::absoluteUrl($successUrl);
     }
 
-    public function createView() {
+    public function createView()
+    {
         $this->view = $this->form->createView();
     }
 
-    public function getView() {
+    public function getView()
+    {
         if ($this->view === null) throw new \LogicException("View was not created. Please call BaseForm::createView() first.");
-
         return $this->view;
     }
 
@@ -217,4 +219,3 @@ abstract class BaseForm {
      */
     abstract public function getName();
 }
-

core/lib/Thelia/Form/CartAdd.php

@@ -22,7 +22,6 @@
 /*************************************************************************************/
 namespace Thelia\Form;
 
-use Propel\Runtime\ActiveQuery\Criteria;
 use Symfony\Component\Validator\Constraints;
 use Symfony\Component\Validator\ExecutionContextInterface;
 use Thelia\Action\Exception\StockNotFoundException;

core/lib/Thelia/Form/CategoryCreationForm.php

@@ -22,11 +22,10 @@
 /*************************************************************************************/
 namespace Thelia\Form;
 
-use Symfony\Component\Form\FormBuilderInterface;
 use Symfony\Component\Validator\Constraints\NotBlank;
 
-class CategoryCreationForm extends BaseForm {
+class CategoryCreationForm extends BaseForm
-
+{
     protected function buildForm()
     {
         $this->formBuilder

core/lib/Thelia/Form/CategoryDeletionForm.php

@@ -22,11 +22,10 @@
 /*************************************************************************************/
 namespace Thelia\Form;
 
-use Symfony\Component\Form\FormBuilderInterface;
 use Symfony\Component\Validator\Constraints\NotBlank;
 
-class CategoryDeletionForm extends BaseForm {
+class CategoryDeletionForm extends BaseForm
-
+{
     protected function buildForm()
     {
         $this->formBuilder

core/lib/Thelia/Form/CustomerLogin.php

@@ -22,15 +22,11 @@
 /*************************************************************************************/
 namespace Thelia\Form;
 
-
-use Symfony\Component\Form\FormBuilderInterface;
-use Symfony\Component\Validator\Constraints\Length;
 use Symfony\Component\Validator\Constraints\NotBlank;
-use Symfony\Component\Validator\Constraints\Choice;
 use Symfony\Component\Validator\Constraints\Email;
 
-class CustomerLogin extends BaseForm {
+class CustomerLogin extends BaseForm
-
+{
     protected function buildForm()
     {
         $this->formBuilder

core/lib/Thelia/Form/CustomerModification.php

@@ -24,11 +24,9 @@
 namespace Thelia\Form;
 
 use Symfony\Component\Validator\Constraints;
-use Thelia\Model\Customer;
-
-
-class CustomerModification extends BaseForm {
 
+class CustomerModification extends BaseForm
+{
     /**
      *
      * in this function you add all the fields you need for your Form.

core/lib/Thelia/Log/Tlog.php

@@ -109,7 +109,8 @@ class Tlog Implements LoggerInterface
      *
      * @return \Thelia\Log\Tlog
      */
-    public static function getInstance() {
+    public static function getInstance()
+    {
         if (self::$instance == false) {
             self::$instance = new Tlog();
 
@@ -479,8 +480,10 @@ class Tlog Implements LoggerInterface
      * @param  array  $context
      * @return null
      */
-    public function log($level, $message, array $context = array()) {
+    public function log($level, $message, array $context = array())
+    {
         if($this->level > $level || array_key_exists($level, $this->levels) === false)
+
             return;
 
         $this->out($this->levels[$level], $message, $context);
@@ -586,7 +589,6 @@ class Tlog Implements LoggerInterface
 
     /* -- Methodes privees ---------------------------------------- */
 
-    
     private function findOrigin()
     {
         $origine = array();

core/lib/Thelia/Log/TlogDestinationConfig.php

@@ -24,7 +24,6 @@
 namespace Thelia\Log;
 
 use Thelia\Model\Config;
-use Thelia\Model\ConfigDesc;
 use Thelia\Model\ConfigQuery;
 
 class TlogDestinationConfig
@@ -51,11 +50,9 @@ class TlogDestinationConfig
         $this->load();
     }
 
-    
     public function load()
     {
-        if (null === $config = ConfigQuery::create()->findOneByName($this->name))
+        if (null === $config = ConfigQuery::create()->findOneByName($this->name)) {
-        {
             $config = new Config();
             $config->setName($this->name);
             $config->setValue($this->default);

core/lib/Thelia/Tests/Cart/CartTraitTest.php

@@ -23,13 +23,10 @@
 namespace Thelia\Tests\Cart\CartTraitTest;
 
 use Symfony\Component\HttpFoundation\Session\Storage\MockArraySessionStorage;
-use Thelia\Core\Event\DefaultActionEvent;
 use Thelia\Core\HttpFoundation\Request;
 use Thelia\Core\HttpFoundation\Session\Session;
 use Thelia\Model\Cart;
 use Thelia\Model\Customer;
-use Thelia\Model\ProductQuery;
-use Thelia\Model\ProductSaleElementsQuery;
 
 /**
  * phpunit 3.8 needed for mcking a Trait and there is conflict with php version.
@@ -180,7 +177,6 @@ class CartTraitTest extends \PHPUnit_Framework_TestCase
 
         $request = $this->request;
 
-
         //create a fake customer just for test. If not persists test fails !
         $customer = new Customer();
         $customer->setFirstname("john");
@@ -219,7 +215,6 @@ class CartTraitTest extends \PHPUnit_Framework_TestCase
 
         $request = $this->request;
 
-
         //create a fake customer just for test. If not persists test fails !
         $customer = new Customer();
         $customer->setFirstname("john");

core/lib/Thelia/Tests/Command/BaseCommandTest.php

@@ -22,8 +22,8 @@
 /*************************************************************************************/
 namespace Thelia\Tests\Command;
 
-
+abstract class BaseCommandTest extends \PHPUnit_Framework_TestCase
-abstract class BaseCommandTest extends \PHPUnit_Framework_TestCase {
+{
     public function getKernel()
     {
         $kernel = $this->getMock("Symfony\Component\HttpKernel\KernelInterface");

core/lib/Thelia/Tests/Command/CacheClearTest.php

@@ -62,7 +62,6 @@ class CacheClearTest extends \PHPUnit_Framework_TestCase
 
         $this->assertFalse($fs->exists($this->cache_dir));
 
-
     }
 
     /**

core/lib/Thelia/Tests/Command/ModuleGenerateCommandTest.php

@@ -22,14 +22,13 @@
 /*************************************************************************************/
 namespace Thelia\Tests\Command;
 
-
 use Symfony\Component\Console\Tester\CommandTester;
 use Symfony\Component\Filesystem\Filesystem;
 use Thelia\Core\Application;
 use Thelia\Command\ModuleGenerateCommand;
 
-class ModuleGenerateCommandTest extends BaseCommandTest {
+class ModuleGenerateCommandTest extends BaseCommandTest
-
+{
     protected $command;
     protected $commandTester;
 

core/lib/Thelia/Tests/Core/HttpFoundation/RequestTest.php

@@ -4,7 +4,6 @@ namespace Thelia\Tests\Core\HttpFoundation;
 
 use Thelia\Core\HttpFoundation\Request;
 
-
 class RequestTest extends \PHPUnit_Framework_TestCase
 {
 
@@ -37,7 +36,6 @@ class RequestTest extends \PHPUnit_Framework_TestCase
 
         $this->assertEquals("http://localhost/?test=fu&foo=bar", $result);
 
-
     }
 
 }

core/lib/Thelia/Tests/Core/Template/Element/BaseLoopTestor.php

@@ -46,10 +46,12 @@ abstract class BaseLoopTestor extends \PHPUnit_Framework_TestCase
     abstract public function getTestedInstance();
     abstract public function getMandatoryArguments();
 
-    protected function getMethod($name) {
+    protected function getMethod($name)
+    {
         $class = new \ReflectionClass($this->getTestedClassName());
         $method = $class->getMethod($name);
         $method->setAccessible(true);
+
         return $method;
     }
 

core/lib/Thelia/Tests/Core/Template/Loop/Argument/ArgumentCollectionTest.php

@@ -99,10 +99,9 @@ class ArgumentTest extends \PHPUnit_Framework_TestCase
             )
         );
 
-
         $arguments = \PHPUnit_Framework_Assert::readAttribute($collection, 'arguments');
 
-        foreach($collection as $key => $argument) {
+        foreach ($collection as $key => $argument) {
             $this->assertEquals(
                 $argument,
                 $arguments[$key]

core/lib/Thelia/Tests/Form/CartAddTest.php

@@ -22,7 +22,6 @@
 /*************************************************************************************/
 namespace Thelia\Tests\Form;
 
-
 class CartAddTest extends \PHPUnit_Framework_TestCase
 {
 

core/lib/Thelia/Tests/Log/TlogTest.php

@@ -34,7 +34,6 @@ class TlogTest extends \PHPUnit_Framework_TestCase
     public static function setUpBeforeClass()
     {
 
-        
         self::$logger = Tlog::getInstance();
 
         self::$logger->setDestinations("Thelia\Log\Destination\TlogDestinationText");

core/lib/Thelia/Tests/Type/TypeCollectionTest.php

@@ -63,10 +63,9 @@ class TypeTest extends \PHPUnit_Framework_TestCase
             new Type\FloatType()
         );
 
-
         $types = \PHPUnit_Framework_Assert::readAttribute($collection, 'types');
 
-        foreach($collection as $key => $type) {
+        foreach ($collection as $key => $type) {
             $this->assertEquals(
                 $type,
                 $types[$key]

core/lib/Thelia/Tests/bootstrap.php

@@ -11,7 +11,3 @@ require_once __DIR__ . '/../../../bootstrap.php';
 use Thelia\Core\Thelia;
 
 $thelia = new Thelia("test", true);
-
-
-
-

core/lib/Thelia/Tools/URL.php

@@ -27,7 +27,8 @@ use Thelia\Model\ConfigQuery;
 
 class URL
 {
-	public static function getIndexPage() {
+    public static function getIndexPage()
+    {
         return ConfigQuery::read('base_url', '/') . "index_dev.php"; // FIXME !
     }
 
@@ -50,20 +51,18 @@ class URL
             $root = $path_only ? ConfigQuery::read('base_url', '/') : self::getIndexPage();
 
             $base = $root . '/' . ltrim($path, '/');
-    	}
+        } else
-    	else
             $base = $path;
 
         $queryString = '';
 
-    	foreach($parameters as $name => $value) {
+        foreach ($parameters as $name => $value) {
             $queryString .= sprintf("%s=%s&", urlencode($name), urlencode($value));
         }
 
         $sepChar = strstr($base, '?') === false ? '?' : '&';
 
         if ('' !== $queryString = rtrim($queryString, "&")) $queryString = $sepChar . $queryString;
-
         return $base . $queryString;
     }
 
@@ -75,8 +74,8 @@ class URL
      *
      * @return string The generated URL
      */
-    public static function adminViewUrl($viewName, array $parameters = array()) {
+    public static function adminViewUrl($viewName, array $parameters = array())
-
+    {
         $path = sprintf("%s/admin/%s", self::getIndexPage(), $viewName); // FIXME ! view= should not be required, check routing parameters
 
         return self::absoluteUrl($path, $parameters);
@@ -90,8 +89,8 @@ class URL
      *
      * @return string The generated URL
      */
-     public static function viewUrl($viewName, array $parameters = array()) {
+     public static function viewUrl($viewName, array $parameters = array())
-
+     {
          $path = sprintf("%s?view=%s", self::getIndexPage(), $viewName);
 
          return self::absoluteUrl($path, $parameters);