Merge remote-tracking branch 'upstream/master'

.gitignore

@@ -21,12 +21,23 @@ web/cache/*
 web/tinymce
 web/media
 phpdoc*.log
-php-cs
 xhprof/
 phpunit.phar
 .DS_Store
 phpmyadmin
-templates/default-esi
-local/modules/TemplateEsiModule
 composer.phar
 web/.htaccess
+
+# Ignore everything in the "modules" directory, except the "default modules"
+local/modules/*
+!local/modules/Cheque/
+!local/modules/Front/
+!local/modules/TheliaDebugBar/
+!local/modules/Tinymce/
+
+# Ignore everything in the "templates" directory, except the "default template"
+templates/*
+!templates/backOffice/
+!templates/email/
+!templates/frontOffice/
+!templates/pdf/

CONTRIBUTORS.txt

@@ -2,7 +2,7 @@ If you contributes or contributed to this project and do not appear in this list
 please email us (info@thelia.net) or fork this file on Github and send a pull-request.
 
 Manuel Raynaud - manu@thelia.net
-Etienne Roudeix - etienne@thelia.net
+Etienne Roudeix - etienne.roudeix@gmail.com
 Franck Allimant - franck@allimant.org
 Guillaume Morel - gmorel@openstudio.fr
 Michaël Espeche - mespeche@openstudio.fr

Readme.md

@@ -3,7 +3,7 @@ Readme
 
 Thelia
 ------
-[![Build Status](https://travis-ci.org/thelia/thelia.png?branch=master)](https://travis-ci.org/thelia/thelia) [![License](https://poser.pugx.org/thelia/thelia/license.png)](https://packagist.org/packages/thelia/thelia)
+[![Build Status](https://travis-ci.org/thelia/thelia.png?branch=master)](https://travis-ci.org/thelia/thelia) [![License](https://poser.pugx.org/thelia/thelia/license.png)](https://packagist.org/packages/thelia/thelia) [![Scrutinizer Quality Score](https://scrutinizer-ci.com/g/thelia/thelia/badges/quality-score.png?s=61e3e04a69bffd71c29b08e5392080317a546716)](https://scrutinizer-ci.com/g/thelia/thelia/)
 
 [Thelia](http://thelia.net/v2) is an open source tool for creating e-business websites and managing online content. This software is published under GPL.
 

UPDATE.md

@@ -1,7 +1,7 @@
 #How to update your Thelia
 
-- copy all files from the thelia new version (local/modules/* files too)
 - clear all caches running ```php Thelia cache:clear```
+- copy all files from the thelia new version (local/modules/* files too)
 - run ```php Thelia thelia:update```
 - again clear all caches in all environment :
     - ```php Thelia cache:clear```

core/bootstrap.php

@@ -21,7 +21,6 @@ if (!file_exists(THELIA_CONF_DIR . 'database.yml') && !defined('THELIA_INSTALL_M
         define('THELIA_INSTALL_MODE', true);
     } else {
         $request = \Thelia\Core\HttpFoundation\Request::createFromGlobals();
-        header('location: '.$request->getUriForPath() . '/install');
+        header('location: '.$request->getUriForPath('/install'));
-        exit;
     }
 }

core/lib/Thelia/Action/Customer.php

@@ -147,6 +147,11 @@ class Customer extends BaseAction implements EventSubscriberInterface
 
     public function login(CustomerLoginEvent $event)
     {
+        $customer = $event->getCustomer();
+
+        if (method_exists($customer, 'clearDispatcher')) {
+            $customer->clearDispatcher();
+        }
         $this->securityContext->setCustomerUser($event->getCustomer());
     }
 

core/lib/Thelia/Action/HttpException.php

@@ -30,6 +30,7 @@ use Symfony\Component\HttpKernel\Exception\AccessDeniedHttpException;
 use Symfony\Component\HttpKernel\Exception\NotFoundHttpException;
 use Symfony\Component\HttpKernel\KernelEvents;
 use Thelia\Core\Template\ParserInterface;
+use Thelia\Exception\AdminAccessDenied;
 use Thelia\Model\ConfigQuery;
 use Thelia\Core\Template\TemplateHelper;
 
@@ -53,13 +54,36 @@ class HttpException extends BaseAction implements EventSubscriberInterface
 
     public function checkHttpException(GetResponseForExceptionEvent $event)
     {
-        if ($event->getException() instanceof NotFoundHttpException) {
+        $exception = $event->getException();
+        if ($exception instanceof NotFoundHttpException) {
             $this->display404($event);
         }
 
-        if ($event->getException() instanceof AccessDeniedHttpException) {
+        if ($exception instanceof AccessDeniedHttpException) {
             $this->display403($event);
         }
+
+        if ($exception instanceof AdminAccessDenied) {
+            $this->displayAdminGeneralError($event);
+        }
+    }
+
+    protected function displayAdminGeneralError(GetResponseForExceptionEvent $event)
+    {
+        // Define the template thant shoud be used
+        $this->parser->setTemplateDefinition(TemplateHelper::getInstance()->getActiveAdminTemplate());
+
+        $message = $event->getException()->getMessage();
+
+        $response = Response::create(
+            $this->parser->render('general_error.html',
+                array(
+                    "error_message" => $message
+                )),
+            403
+        ) ;
+
+        $event->setResponse($response);
     }
 
     protected function display404(GetResponseForExceptionEvent $event)
@@ -67,8 +91,6 @@ class HttpException extends BaseAction implements EventSubscriberInterface
         // Define the template thant shoud be used
         $this->parser->setTemplateDefinition(TemplateHelper::getInstance()->getActiveFrontTemplate());
 
-        //$event->getRequest()->attributes->set('_view', ConfigQuery::getPageNotFoundView());
-
         $response = new Response($this->parser->render(ConfigQuery::getPageNotFoundView()), 404);
 
         $event->setResponse($response);

core/lib/Thelia/Action/Image.php

@@ -112,8 +112,6 @@ class Image extends BaseCachedFile implements EventSubscriberInterface
             throw new \InvalidArgumentException("Cache sub-directory and source file path cannot be null");
         }
 
-        // echo basename($source_file).": ";
-
         // Find cached file path
         $cacheFilePath = $this->getCacheFilePath($subdir, $source_file, $event->isOriginalImage(), $event->getOptionsHash());
 
@@ -391,8 +389,6 @@ class Image extends BaseCachedFile implements EventSubscriberInterface
 
             $image->resize(new Box($next_width, $next_height));
 
-            // echo "w=$dest_width, h=$dest_height, nw=$next_width, nh=$next_height, dx=$delta_x, dy=$delta_y, bw=$border_width, bh=$border_height\n";
-
             if ($resize_mode == self::EXACT_RATIO_WITH_BORDERS) {
 
                 $border_width = intval(($dest_width - $next_width) / 2);

core/lib/Thelia/Action/Product.php

@@ -75,7 +75,7 @@ class Product extends BaseAction implements EventSubscriberInterface
             ->setRef($event->getRef())
             ->setLocale($event->getLocale())
             ->setTitle($event->getTitle())
-            ->setVisible($event->getVisible())
+            ->setVisible($event->getVisible() ? 1 : 0)
 
             // Set the default tax rule to this product
             ->setTaxRule(TaxRuleQuery::create()->findOneByIsDefault(true))
@@ -109,7 +109,7 @@ class Product extends BaseAction implements EventSubscriberInterface
                 ->setDescription($event->getDescription())
                 ->setChapo($event->getChapo())
                 ->setPostscriptum($event->getPostscriptum())
-                ->setVisible($event->getVisible())
+                ->setVisible($event->getVisible() ? 1 : 0)
 
                 ->save()
             ;

core/lib/Thelia/Command/CreateAdminUser.php

@@ -83,7 +83,7 @@ class CreateAdminUser extends ContainerAwareCommand
     {
         $output->writeln('Please enter the admin user information:');
 
-        $admin = $this->getAdminInfo($input, $output); // new Admin();
+        $admin = $this->getAdminInfo($input, $output);
 
         $admin->save();
 

core/lib/Thelia/Command/GenerateResources.php

@@ -61,8 +61,7 @@ class GenerateResources extends ContainerAwareCommand
         $constants = $class->getConstants();
 
         if (count($constants) == 0) {
-            $output->writeln('No resources found');
+            throw new \RuntimeException('No resources found');
-            exit;
         }
 
         switch ($input->getOption("output")) {

core/lib/Thelia/Command/Install.php

@@ -163,11 +163,7 @@ class Install extends ContainerAwareCommand
         }
 
         if (false === $isValid) {
-            $output->writeln(array(
+            throw new \RuntimeException('Please put correct permissions and reload install process');
-                "",
-                "<error>Please put correct permissions and reload install process</error>"
-            ));
-            exit;
         }
     }
 
@@ -198,9 +194,6 @@ class Install extends ContainerAwareCommand
 
         file_put_contents($configFile, $configContent);
 
-        // FA - no, as no further install will be possible
-        // $fs->remove($sampleConfigFile);
-
         $fs->remove($this->getContainer()->getParameter("kernel.cache_dir"));
 
     }

core/lib/Thelia/Condition/Implementation/MatchForEveryone.php

@@ -23,8 +23,6 @@
 
 namespace Thelia\Condition\Implementation;
 
-use InvalidArgumentException;
-
 /**
  * Allow every one, perform no check
  *

core/lib/Thelia/Condition/Implementation/MatchForXArticles.php

@@ -23,8 +23,6 @@
 
 namespace Thelia\Condition\Implementation;
 
-use InvalidArgumentException;
-
 use Thelia\Condition\Operators;
 use Thelia\Exception\InvalidConditionOperatorException;
 use Thelia\Exception\InvalidConditionValueException;

core/lib/Thelia/Config/I18n/en_US.php

@@ -6,14 +6,17 @@ return array(
     '%obj modification' => '%obj modification',
     'A currency with code "%name" already exists.' => 'A currency with code "%name" already exists.',
     'A message with name "%name" already exists.' => 'A message with name "%name" already exists.',
+    'A user already exists with this email address. Please login or if you\'ve forgotten your password, go to Reset Your Password.' => 'A user already exists with this email address. Please login or if you\'ve forgotten your password, go to Reset Your Password.',
     'A variable with name "%name" already exists.' => 'A variable with name "%name" already exists.',
     'Activate logs only for these IP Addresses' => 'Activate logs only for these IP Addresses',
     'Activate logs only for these files' => 'Activate logs only for these files',
     'Add to all product templates' => 'Add to all product templates',
     'Additional address' => 'Additional address',
+    'Address ID not found' => 'Address ID not found',
     'Address Line 2' => 'Address Line 2',
     'Address Line 3' => 'Address Line 3',
     'Address label' => 'Address label',
+    'Administrator ID not found' => 'Administrator ID not found',
     'Advertise this product as new' => 'Advertise this product as new',
     'Alerts' => 'Alerts',
     'Alpha code 2 *' => 'Alpha code 2 *',
@@ -25,6 +28,7 @@ return array(
     'Auth mode' => 'Auth mode',
     'Available quantity' => 'Available quantity',
     'Available quantity *' => 'Available quantity *',
+    'Bad tax list JSON' => 'Bad tax list JSON',
     'Business ID' => 'Business ID',
     'Cannot find a default country. Please define one.' => 'Cannot find a default country. Please define one.',
     'Cannot find the shop country. Please select a shop country.' => 'Cannot find the shop country. Please select a shop country.',
@@ -41,6 +45,7 @@ return array(
     'Constant amount found in one of the product\'s feature' => 'Constant amount found in one of the product\'s feature',
     'Content title *' => 'Content title *',
     'Country' => 'Country',
+    'Country ID not found' => 'Country ID not found',
     'Country area' => 'Country area',
     'Country title *' => 'Country title *',
     'Critical' => 'Critical',
@@ -49,6 +54,7 @@ return array(
     'Default folder *' => 'Default folder *',
     'Default product category *' => 'Default product category *',
     'Default product sale element' => 'Default product sale element',
+    'Delivery module ID not found' => 'Delivery module ID not found',
     'Description' => 'Description',
     'Detailed description' => 'Detailed description',
     'Disabled' => 'Disabled',
@@ -73,6 +79,7 @@ return array(
     'ISO 639-1 Code' => 'ISO 639-1 Code',
     'ISO Code *' => 'ISO Code *',
     'If a translation is missing or incomplete :' => 'If a translation is missing or incomplete :',
+    'Impossible to delete a customer who already have orders' => 'Impossible to delete a customer who already have orders',
     'Information' => 'Information',
     'Invalid product_sale_elements' => 'Invalid product_sale_elements',
     'Invalid value for walkMode parameter: %value' => 'Invalid value for walkMode parameter: %value',
@@ -88,6 +95,7 @@ return array(
     'Message subject' => 'Message subject',
     'Meta Description' => 'Meta Description',
     'Meta Keywords' => 'Meta Keywords',
+    'Module ID not found' => 'Module ID not found',
     'Name' => 'Name',
     'Name *' => 'Name *',
     'Name of the HTML layout file' => 'Name of the HTML layout file',
@@ -99,6 +107,7 @@ return array(
     'No %obj was updated.' => 'No %obj was updated.',
     'No, I am a new customer.' => 'No, I am a new customer.',
     'Notices' => 'Notices',
+    'Order address ID not found' => 'Order address ID not found',
     'Page Title' => 'Page Title',
     'Parent category *' => 'Parent category *',
     'Parent folder *' => 'Parent folder *',
@@ -108,6 +117,7 @@ return array(
     'Percentage of the product price' => 'Percentage of the product price',
     'Percentage removed from the cart' => 'Percentage removed from the cart',
     'Phone' => 'Phone',
+    'Please accept the Terms and conditions in order to register.' => 'Please accept the Terms and conditions in order to register.',
     'Please enter your email address' => 'Please enter your email address',
     'Please enter your password' => 'Please enter your password',
     'Please specify either \'path\' or \'file\' parameter in {url} function.' => 'Please specify either \'path\' or \'file\' parameter in {url} function.',
@@ -123,6 +133,7 @@ return array(
     'Product ID' => 'Product ID',
     'Product ID *' => 'Product ID *',
     'Product base price excluding taxes *' => 'Product base price excluding taxes *',
+    'Product base price with taxes' => 'Product base price with taxes',
     'Product price excluding taxes' => 'Product price excluding taxes',
     'Product price excluding taxes *' => 'Product price excluding taxes *',
     'Product price including taxes' => 'Product price including taxes',
@@ -133,6 +144,8 @@ return array(
     'ProductSaleElement modification' => 'ProductSaleElement modification',
     'Profile' => 'Profile',
     'Profile Code' => 'Profile Code',
+    'Profile ID not found' => 'Profile ID not found',
+    'Profile `code` already exists' => 'Profile `code` already exists',
     'Purpose *' => 'Purpose *',
     'Quantity' => 'Quantity',
     'Rate from € *' => 'Rate from € *',
@@ -167,20 +180,31 @@ return array(
     'Summary' => 'Summary',
     'Symbol *' => 'Symbol *',
     'System log configuration failed.' => 'System log configuration failed.',
+    'Tax ID not found in tax list JSON' => 'Tax ID not found in tax list JSON',
+    'Tax list is not valid JSON' => 'Tax list is not valid JSON',
+    'Tax rule ID not found' => 'Tax rule ID not found',
     'Tax rule for this product *' => 'Tax rule for this product *',
     'Template Name *' => 'Template Name *',
     'Template file %file cannot be found.' => 'Template file %file cannot be found.',
     'Text File' => 'Text File',
     'Text Message' => 'Text Message',
+    'The TaxEngine should be passed to this form before using it.' => 'The TaxEngine should be passed to this form before using it.',
     'This category is online.' => 'This category is online.',
     'This content is online.' => 'This content is online.',
+    'This coupon does not exists' => 'This coupon does not exists',
+    'This email already exists.' => 'This email already exists.',
+    'This email does not exists' => 'This email does not exists',
     'This extension must be installed and loaded' => 'This extension must be installed and loaded',
     'This folder is online.' => 'This folder is online.',
+    'This login already exists' => 'This login already exists',
     'This product is on sale' => 'This product is on sale',
     'This product is online' => 'This product is online',
+    'This product_sale_elements_id does not exists for this product : %d' => 'This product_sale_elements_id does not exists for this product : %d',
+    'This value should not be blank.' => 'This value should not be blank.',
     'Timeout' => 'Timeout',
     'Title' => 'Title',
     'Title *' => 'Title *',
+    'Title ID not found' => 'Title ID not found',
     'Type' => 'Type',
     'Username' => 'Username',
     'Username *' => 'Username *',
@@ -190,42 +214,20 @@ return array(
     'Weight' => 'Weight',
     'Weight *' => 'Weight *',
     'Yes, I have a password :' => 'Yes, I have a password :',
+    'You are already registered!' => 'You are already registered!',
     'Your Email Address' => 'Your Email Address',
     'Your Message' => 'Your Message',
+    'Your current password does not match.' => 'Your current password does not match.',
     'Zip code' => 'Zip code',
     'date format' => 'date format',
+    'delivery module %s is not a Thelia\Module\DeliveryModuleInterface' => 'delivery module %s is not a Thelia\Module\DeliveryModuleInterface',
+    'payment module %s is not a Thelia\Module\PaymentModuleInterface' => 'payment module %s is not a Thelia\Module\PaymentModuleInterface',
     'language locale' => 'language locale',
     'mailing system modification' => 'mailing system modification',
-    'shipping area name' => 'shipping area name',
-    'time format' => 'time format',
-    'This value should not be blank.' => 'This value should not be blank.',
-    'A user already exists with this email address. Please login or if you\'ve forgotten your password, go to Reset Your Password.' => 'A user already exists with this email address. Please login or if you\'ve forgotten your password, go to Reset Your Password.',
-    'Administrator ID not found' => 'Administrator ID not found',
-    'This login already exists' => 'This login already exists',
     'password confirmation is not the same as password field' => 'password confirmation is not the same as password field',
     'password must be composed of at least 4 characters' => 'password must be composed of at least 4 characters',
-    'this product id does not exists : %d' => 'this product id does not exists : %d',
-    'This product_sale_elements_id does not exists for this product : %d' => 'This product_sale_elements_id does not exists for this product : %d',
     'quantity value is not valid' => 'quantity value is not valid',
-    'Please accept the Terms and conditions in order to register.' => 'Please accept the Terms and conditions in order to register.',
+    'shipping area name' => 'shipping area name',
-    'This email already exists.' => 'This email already exists.',
+    'this product id does not exists : %d' => 'this product id does not exists : %d',
-    'This email does not exists' => 'This email does not exists',
+    'time format' => 'time format',
-    'Your current password does not match.' => 'Your current password does not match.',
-    'Module ID not found' => 'Module ID not found',
-    'You are already registered!' => 'You are already registered!',
-    'Address ID not found' => 'Address ID not found',
-    'Delivery module ID not found' => 'Delivery module ID not found',
-    'delivery module %s is not a Thelia\Module\DeliveryModuleInterface' => 'delivery module %s is not a Thelia\Module\DeliveryModuleInterface',
-    'Order address ID not found' => 'Order address ID not found',
-    'Title ID not found' => 'Title ID not found',
-    'Country ID not found' => 'Country ID not found',
-    'Profile `code` already exists' => 'Profile `code` already exists',
-    'Profile ID not found' => 'Profile ID not found',
-    'The TaxEngine should be passed to this form before using it.' => 'The TaxEngine should be passed to this form before using it.',
-    'Tax rule ID not found' => 'Tax rule ID not found',
-    'Tax list is not valid JSON' => 'Tax list is not valid JSON',
-    'Bad tax list JSON' => 'Bad tax list JSON',
-    'Tax ID not found in tax list JSON' => 'Tax ID not found in tax list JSON',
-    'Please check your input: %s' => 'Please check your input: %s',
-    'Sorry, an error occured: %s' => 'Sorry, an error occured: %s',
 );

core/lib/Thelia/Config/I18n/fr_FR.php

@@ -6,14 +6,17 @@ return array(
     '%obj modification' => 'Modification de %obj',
     'A currency with code "%name" already exists.' => 'Une devise avec la code "%name" existe déjà',
     'A message with name "%name" already exists.' => 'Un message avec le nom "%name" existe déjà.',
+    'A user already exists with this email address. Please login or if you\'ve forgotten your password, go to Reset Your Password.' => 'Un utilisateur existe déjà avec cette adresse email. Connectez-vous ou demandez une réinitialisation de votre mot de passe.',
     'A variable with name "%name" already exists.' => 'Une variable avec le nom "%name" existe déjà.',
     'Activate logs only for these IP Addresses' => 'Activer les logs uniquement pour ces adresses IP',
     'Activate logs only for these files' => 'Activer les logs uniquement pour ces fichiers',
     'Add to all product templates' => 'Ajouter à tous les templates produit',
     'Additional address' => 'Adresse complémentaire',
+    'Address ID not found' => 'ID de l\'adresse non trouvé',
     'Address Line 2' => 'Adresse 1',
     'Address Line 3' => 'Adresse 2',
     'Address label' => 'Adresse',
+    'Administrator ID not found' => 'ID de l\'administrateur not trouvé',
     'Advertise this product as new' => 'Afficher ce produit comme nouveau',
     'Alerts' => 'Alertes',
     'Alpha code 2 *' => 'Code Alpha 2 *',
@@ -25,6 +28,7 @@ return array(
     'Auth mode' => 'Mode d\'authentification',
     'Available quantity' => 'Quantité disponible',
     'Available quantity *' => 'Quantité disponible *',
+    'Bad tax list JSON' => 'Mauvais JSON de la liste des taxes',
     'Business ID' => 'ID du business',
     'Cannot find a default country. Please define one.' => 'Impossible de trouver un pays par défaut. Veuillez en définir un.',
     'Cannot find the shop country. Please select a shop country.' => 'Impossible de trouver le pays du magasin. Veuillez en sélectionner un.',
@@ -41,6 +45,7 @@ return array(
     'Constant amount found in one of the product\'s feature' => 'Montant fixe trouvé depuis une caractéristique produit',
     'Content title *' => 'Titre du contenu *',
     'Country' => 'Pays',
+    'Country ID not found' => 'ID du pays non trouvé',
     'Country area' => 'Zone du pays',
     'Country title *' => 'Pays *',
     'Critical' => 'Critique',
@@ -49,6 +54,7 @@ return array(
     'Default folder *' => 'Dossier par défaut *',
     'Default product category *' => 'Catégorie du produit par défaut *',
     'Default product sale element' => 'Product Sale Element par défaut',
+    'Delivery module ID not found' => 'Id du module de livraison non trouvé',
     'Description' => 'Description',
     'Detailed description' => 'Description détaillée',
     'Disabled' => 'Désactivé',
@@ -73,6 +79,7 @@ return array(
     'ISO 639-1 Code' => 'Code ISO 639-1',
     'ISO Code *' => 'Code ISO *',
     'If a translation is missing or incomplete :' => 'Si une traduction est manquante ou incomplète :',
+    'Impossible to delete a customer who already have orders' => 'Impossible de supprimer un client si celui-ci a déjà une commande',
     'Information' => 'Information',
     'Invalid product_sale_elements' => 'product_sale_elements invalide',
     'Invalid value for walkMode parameter: %value' => 'Valeur incorrecte pour le paramètre walkMode : %value',
@@ -88,6 +95,7 @@ return array(
     'Message subject' => 'Sujet',
     'Meta Description' => 'Meta description',
     'Meta Keywords' => 'Meta keywords',
+    'Module ID not found' => 'Id du module non trouvé',
     'Name' => 'Nom',
     'Name *' => 'Nom *',
     'Name of the HTML layout file' => 'Nom du layout HTML',
@@ -99,6 +107,7 @@ return array(
     'No %obj was updated.' => 'Aucun %obj mis à jour',
     'No, I am a new customer.' => 'Non, je suis un nouveau client.',
     'Notices' => 'Notices',
+    'Order address ID not found' => 'ID de l\'adresse de la commande non trouvé',
     'Page Title' => 'Titre de la page',
     'Parent category *' => 'Catégorie parente *',
     'Parent folder *' => 'Dossier parent *',
@@ -108,6 +117,7 @@ return array(
     'Percentage of the product price' => 'Pourcentage du prix du produit',
     'Percentage removed from the cart' => 'Pourcentage déduit du panier',
     'Phone' => 'Téléphone',
+    'Please accept the Terms and conditions in order to register.' => 'Veuillez accepter les termes et conditions pour vous inscrire.',
     'Please enter your email address' => 'Renseignez votre adresse mail',
     'Please enter your password' => 'Entrez votre mot de passe.',
     'Please specify either \'path\' or \'file\' parameter in {url} function.' => 'Veuillez spécifier soit le paramètre \'chemin\' ou  \'fichier\' dans la fonction {url}',
@@ -123,6 +133,7 @@ return array(
     'Product ID' => 'ID produit',
     'Product ID *' => 'ID produit *',
     'Product base price excluding taxes *' => 'Prix du produit Hors Taxe *',
+    'Product base price with taxes' => 'Prix du produit TTC',
     'Product price excluding taxes' => 'Prix du produit Hors Taxes',
     'Product price excluding taxes *' => 'prix HT',
     'Product price including taxes' => 'Prix du produit taxes incluses',
@@ -133,6 +144,8 @@ return array(
     'ProductSaleElement modification' => 'Modification de ProductSaleElement.',
     'Profile' => 'Profil',
     'Profile Code' => 'Profil',
+    'Profile ID not found' => 'ID du profil non trouvé',
+    'Profile `code` already exists' => 'Le `code` du profil existe déjà',
     'Purpose *' => 'Objet',
     'Rate from € *' => 'Taux à partie de l\'€ *',
     'Redirecting ...' => 'Redirection ...',
@@ -166,20 +179,31 @@ return array(
     'Summary' => 'Résumé',
     'Symbol *' => 'Symbole *',
     'System log configuration failed.' => 'Erreur du configurateur de log system.',
+    'Tax ID not found in tax list JSON' => 'ID de la taxe non trouvé dans le JSON de la liste des taxes',
+    'Tax list is not valid JSON' => 'Le JSON de la liste des taxes n\'est pas valide',
+    'Tax rule ID not found' => 'ID de la règle de taxe non trouvé',
     'Tax rule for this product *' => 'Règle de taxe pour ce produit *',
     'Template Name *' => 'Nom du template *',
     'Template file %file cannot be found.' => 'Le fichier %file n\'a pas été trouvé dans le template. ',
     'Text File' => 'Fichier texte',
     'Text Message' => 'Message au format texte',
+    'The TaxEngine should be passed to this form before using it.' => 'Le moteur de taxe doit être passé au formulaire avant d\'être utilisé.',
     'This category is online.' => 'Cette catégorie est en ligne.',
     'This content is online.' => 'Ce contenu est en ligne.',
+    'This coupon does not exists' => 'Ce code promo n\'existe pas',
+    'This email already exists.' => 'Cette adresse email existe déjà',
+    'This email does not exists' => 'Cette adresse email n\'existe pas',
     'This extension must be installed and loaded' => 'Cette extension doit être installée et chargée.',
     'This folder is online.' => 'Ce dossier est en ligne.',
+    'This login already exists' => 'Cet identifiant existe déjà',
     'This product is on sale' => 'Ce produit est en promo',
     'This product is online' => 'Ce produit est en ligne',
+    'This product_sale_elements_id does not exists for this product : %d' => 'Le product_sale_elements_id n\'existe pas pour ce produit : %d',
+    'This value should not be blank.' => 'Cette valeur ne doit pas être vide.',
     'Timeout' => 'Délai d\'attente expiré',
     'Title' => 'Titre',
     'Title *' => 'Titre *',
+    'Title ID not found' => 'ID de la civilité non trouvé',
     'Type' => 'Type',
     'Username' => 'Nom d\'utilisateur',
     'Username *' => 'Nom d\'utilisateur *',
@@ -189,42 +213,20 @@ return array(
     'Weight' => 'Poids',
     'Weight *' => 'Poids *',
     'Yes, I have a password :' => 'Oui, j\'ai un mot de passe :',
+    'You are already registered!' => 'Vous êtes déjà enregistré !',
     'Your Email Address' => 'Votre adresse mail',
     'Your Message' => 'Votre message',
+    'Your current password does not match.' => 'Votre mot de passe actuel ne correspond pas',
     'Zip code' => 'Code postal',
     'date format' => 'Format de date',
+    'delivery module %s is not a Thelia\Module\DeliveryModuleInterface' => 'le module de livraison %s n\'est pas un Thelia\Module\DeliveryModuleInterface',
     'language locale' => 'Langue locale',
     'mailing system modification' => 'Modification du système d\'envoi de mail.',
-    'shipping area name' => 'Nom de la zone de livraison',
-    'time format' => 'Format d\'heure',
-    'This value should not be blank.' => 'Cette valeur ne doit pas être vide.',
-    'A user already exists with this email address. Please login or if you\'ve forgotten your password, go to Reset Your Password.' => 'Un utilisateur existe déjà avec cette adresse email. Connectez-vous ou demandez une réinitialisation de votre mot de passe.',
-    'Administrator ID not found' => 'ID de l\'administrateur not trouvé',
-    'This login already exists' => 'Cet identifiant existe déjà',
     'password confirmation is not the same as password field' => 'le mot de passe de confirmation n\'est pas le même que le champ mot de passe',
     'password must be composed of at least 4 characters' => 'le mot de passe doit être composé d\'au moins 4 caractères',
-    'this product id does not exists : %d' => 'l\'id du produit %d n\'existe pas',
+    'payment module %s is not a Thelia\Module\PaymentModuleInterface' => 'Le module de paiement %s n\'est pas une instance de Thelia\Module\PaymentModuleInterface ',
-    'This product_sale_elements_id does not exists for this product : %d' => 'Le product_sale_elements_id n\'existe pas pour ce produit : %d',
     'quantity value is not valid' => 'la valeur de la quantité n\'est pas valide',
-    'Please accept the Terms and conditions in order to register.' => 'Veuillez accepter les termes et conditions pour vous inscrire.',
+    'shipping area name' => 'Nom de la zone de livraison',
-    'This email already exists.' => 'Cette adresse email existe déjà',
+    'this product id does not exists : %d' => 'l\'id du produit %d n\'existe pas',
-    'This email does not exists' => 'Cette adresse email n\'existe pas',
+    'time format' => 'Format d\'heure',
-    'Your current password does not match.' => 'Votre mot de passe actuel ne correspond pas',
-    'Module ID not found' => 'Id du module non trouvé',
-    'You are already registered!' => 'Vous êtes déjà enregistré !',
-    'Address ID not found' => 'ID de l\'adresse non trouvé',
-    'Delivery module ID not found' => 'Id du module de livraison non trouvé',
-    'delivery module %s is not a Thelia\Module\DeliveryModuleInterface' => 'le module de livraison %s n\'est pas un Thelia\Module\DeliveryModuleInterface',
-    'Order address ID not found' => 'ID de l\'adresse de la commande non trouvé',
-    'Title ID not found' => 'ID de la civilité non trouvé',
-    'Country ID not found' => 'ID du pays non trouvé',
-    'Profile `code` already exists' => 'Le `code` du profil existe déjà',
-    'Profile ID not found' => 'ID du profil non trouvé',
-    'The TaxEngine should be passed to this form before using it.' => 'Le moteur de taxe doit être passé au formulaire avant d\'être utilisé.',
-    'Tax rule ID not found' => 'ID de la règle de taxe non trouvé',
-    'Tax list is not valid JSON' => 'Le JSON de la liste des taxes n\'est pas valide',
-    'Bad tax list JSON' => 'Mauvais JSON de la liste des taxes',
-    'Tax ID not found in tax list JSON' => 'ID de la taxe non trouvé dans le JSON de la liste des taxes',
-    'Please check your input: %s' => 'Veuillez vérifier votre saisie: %s',
-    'Sorry, an error occured: %s' => 'Désolé, une erreur est survenue: %s',
 );

core/lib/Thelia/Config/Resources/routing/admin.xml

@@ -7,6 +7,7 @@
     <!-- Route to administration base -->
     <route id="admin" path="/admin">
         <default key="_controller">Thelia\Controller\Admin\AdminController::indexAction</default>
+        <default key="not-logged">1</default>
     </route>
 
     <!-- home -->
@@ -24,6 +25,7 @@
     <!-- Route to the administration login page -->
     <route id="admin.login" path="/admin/login">
         <default key="_controller">Thelia\Controller\Admin\SessionController::showLoginAction</default>
+        <default key="not-logged">1</default>
     </route>
 
     <!-- Route to the administration logout page -->
@@ -34,6 +36,7 @@
     <!-- Route to the login check controller -->
     <route id="admin.checklogin" path="/admin/checklogin">
         <default key="_controller">Thelia\Controller\Admin\SessionController::checkLoginAction</default>
+        <default key="not-logged">1</default>
     </route>
 
     <!-- Route to the catalog controller -->
@@ -337,6 +340,10 @@
         <default key="_controller">Thelia\Controller\Admin\ProductController::priceCaclulator</default>
     </route>
 
+    <route id="admin.product.calculate-raw-price" path="/admin/product/calculate-raw-price">
+        <default key="_controller">Thelia\Controller\Admin\ProductController::calculatePrice</default>
+    </route>
+
     <route id="admin.product.load-converted-prices" path="/admin/product/load-converted-prices">
         <default key="_controller">Thelia\Controller\Admin\ProductController::loadConvertedPrices</default>
     </route>

core/lib/Thelia/Controller/Admin/AbstractCrudController.php

@@ -449,7 +449,6 @@ abstract class AbstractCrudController extends BaseAdminController
     /**
      * Update object position (only for objects whichsupport that)
      *
-     * FIXME: integrate with genericUpdatePositionAction
      */
     public function updatePositionAction()
     {

core/lib/Thelia/Controller/Admin/AbstractSeoCrudController.php

@@ -157,13 +157,14 @@ abstract class AbstractSeoCrudController extends AbstractCrudController
     /**
      * Update SEO modification, and either go back to the object list, or stay on the edition page.
      *
-     * @return Thelia\Core\HttpFoundation\Response the response
+     * @return \Thelia\Core\HttpFoundation\Response the response
      */
     public function processUpdateSeoAction()
     {
         // Check current user authorization
-        if (null !== $response = $this->checkAuth($this->resourceCode, array(), AccessManager::UPDATE))
+        if (null !== $response = $this->checkAuth($this->resourceCode, array(), AccessManager::UPDATE)) {
             return $response;
+        }
 
         // Error (Default: false)
         $error_msg = false;

core/lib/Thelia/Controller/Admin/CategoryController.php

@@ -340,24 +340,6 @@ class CategoryController extends AbstractSeoCrudController
             return $response;
         }
 
-//        $content_id = intval($this->getRequest()->get('content_id'));
-//
-//        if ($content_id > 0) {
-//
-//            $event = new CategoryAddContentEvent(
-//                $this->getExistingObject(),
-//                $content_id
-//            );
-//
-//            try {
-//                $this->dispatch(TheliaEvents::CATEGORY_ADD_CONTENT, $event);
-//            }
-//            catch (\Exception $ex) {
-//                // Any error
-//                return $this->errorPage($ex);
-//            }
-//        }
-
         $this->redirectToEditionTemplate();
     }
 

core/lib/Thelia/Controller/Admin/ProductController.php

@@ -73,6 +73,7 @@ use Thelia\Form\ProductSaleElementUpdateForm;
 use Thelia\Form\ProductDefaultSaleElementUpdateForm;
 use Thelia\Form\ProductCombinationGenerationForm;
 
+use Thelia\Model\TaxRuleQuery;
 use Thelia\TaxEngine\Calculator;
 use Thelia\Tools\NumberFormat;
 
@@ -1155,10 +1156,10 @@ class ProductController extends AbstractSeoCrudController
     {
         $return_price = 0;
 
-        $price      = floatval($this->getRequest()->get('price', 0));
+        $price      = floatval($this->getRequest()->query->get('price', 0));
-        $product_id = intval($this->getRequest()->get('product_id', 0));
+        $product_id = intval($this->getRequest()->query->get('product_id', 0));
-        $action     = $this->getRequest()->get('action', ''); // With ot without tax
+        $action     = $this->getRequest()->query->get('action', ''); // With ot without tax
-        $convert    = intval($this->getRequest()->get('convert_from_default_currency', 0));
+        $convert    = intval($this->getRequest()->query->get('convert_from_default_currency', 0));
 
         if (null !== $product = ProductQuery::create()->findPk($product_id)) {
 
@@ -1171,7 +1172,46 @@ class ProductController extends AbstractSeoCrudController
             }
 
             if ($convert != 0) {
-                $return_price = $prix * Currency::getDefaultCurrency()->getRate();
+                $return_price = $price * Currency::getDefaultCurrency()->getRate();
+            }
+        }
+
+        return new JsonResponse(array('result' => $return_price));
+    }
+
+    /**
+     *
+     * Calculate tax or untax price for a non existing product.
+     *
+     * For an existing product, use self::priceCaclulator
+     *
+     * @return JsonResponse
+     */
+    public function calculatePrice()
+    {
+        $return_price = 0;
+
+        $price      = floatval($this->getRequest()->query->get('price'));
+        $tax_rule_id = intval($this->getRequest()->query->get('tax_rule'));
+        $action     = $this->getRequest()->query->get('action'); // With ot without tax
+
+        $taxRule = TaxRuleQuery::create()->findPk($tax_rule_id);
+
+        if (null !== $price && null !== $taxRule) {
+
+            $calculator = new Calculator();
+
+            $calculator->loadTaxRuleWithoutProduct(
+                $taxRule,
+                Country::getShopLocation()
+            );
+
+            if ($action == 'to_tax') {
+                $return_price = $calculator->getTaxedPrice($price);
+            } elseif ($action == 'from_tax') {
+                $return_price = $calculator->getUntaxedPrice($price);
+            } else {
+                $return_price = $price;
             }
         }
 
@@ -1251,7 +1291,7 @@ class ProductController extends AbstractSeoCrudController
         }
 
         if ($convert != 0) {
-            $return_price = $prix * Currency::getDefaultCurrency()->getRate();
+            $return_price = $price * Currency::getDefaultCurrency()->getRate();
         }
 
         // Format the number using '.', to perform further calculation

core/lib/Thelia/Controller/Admin/SessionController.php

@@ -122,7 +122,7 @@ class SessionController extends BaseAdminController
             $this->applyUserLocale($user);
 
             /**
-             * FIXME: we have tou find a way to send cookie
+             * we have tou find a way to send cookie
              */
             if (intval($adminLoginForm->getForm()->get('remember_me')->getData()) > 0) {
                 // If a remember me field if present and set in the form, create

core/lib/Thelia/Controller/Admin/SystemLogController.php

@@ -83,27 +83,13 @@ class SystemLogController extends BaseAdminController
         }
     }
 
+    /**
+     * @return mixed|\Thelia\Core\HttpFoundation\Response
+     */
     public function defaultAction()
     {
         if (null !== $response = $this->checkAuth(AdminResources::SYSTEM_LOG, array(), AccessManager::VIEW)) return $response;
 
-        /*
-        const VAR_LEVEL 		= "tlog_level";
-        const VAR_DESTINATIONS 	= "tlog_destinations";
-        const VAR_PREFIXE 		= "tlog_prefix";
-        const VAR_FILES 		= "tlog_files";
-        const VAR_IP                = "tlog_ip";
-        const VAR_SHOW_REDIRECT     = "tlog_show_redirect";
-
-        const DEFAULT_LEVEL     	= self::DEBUG;
-        const DEFAUT_DESTINATIONS   = "Thelia\Log\Destination\TlogDestinationFile";
-        const DEFAUT_PREFIXE 	= "#NUM: #NIVEAU [#FICHIER:#FONCTION()] {#LIGNE} #DATE #HEURE: ";
-        const DEFAUT_FILES 		= "*";
-        const DEFAUT_IP 		= "";
-        const DEFAUT_SHOW_REDIRECT  = 0;
-
-        */
-
         // Hydrate the general configuration form
         $systemLogForm = new SystemLogConfigurationForm($this->getRequest(), 'form', array(
             'level'             => ConfigQuery::read(Tlog::VAR_LEVEL, Tlog::DEFAULT_LEVEL),

core/lib/Thelia/Controller/Admin/TranslationsController.php

@@ -117,7 +117,7 @@ class TranslationsController extends BaseAdminController
 
                             $translations = $this->getRequest()->get('translation', array());
 
-                            TemplateHelper::getInstance()->write_translation($file, $texts, $translations);
+                            TemplateHelper::getInstance()->writeTranslation($file, $texts, $translations);
 
                             if ($save_mode == 'stay')
                                 $this->redirectToRoute("admin.configuration.translations", $templateArguments);

core/lib/Thelia/Core/Controller/ControllerResolver.php

@@ -27,6 +27,8 @@ use Symfony\Component\HttpKernel\Controller\ControllerResolver as BaseController
 use Symfony\Component\DependencyInjection\ContainerInterface;
 use Symfony\Component\DependencyInjection\ContainerAwareInterface;
 use Psr\Log\LoggerInterface;
+use Thelia\Controller\Admin\BaseAdminController;
+use Thelia\Exception\AdminAccessDenied;
 
 /**
  * ControllerResolver that supports "a:b:c", "service:method" and class::method" notations in routes definition
@@ -90,6 +92,15 @@ class ControllerResolver extends BaseControllerResolver
             $controller->setContainer($this->container);
         }
 
+        //check if an admin is logged in
+        if ($controller instanceof BaseAdminController) {
+            $securityContext = $this->container->get('thelia.securityContext');
+            $request = $this->container->get('request');
+            if (false === $securityContext->hasAdminUser() && $request->attributes->get('not-logged') != 1) {
+            throw new AdminAccessDenied();
+            }
+        }
+
         return array($controller, $method);
     }
 }

core/lib/Thelia/Core/Event/Address/AddressCreateOrUpdateEvent.php

@@ -22,7 +22,7 @@
 /*************************************************************************************/
 
 namespace Thelia\Core\Event\Address;
-use Symfony\Component\EventDispatcher\Event;
+
 use Thelia\Core\Event\ActionEvent;
 use Thelia\Model\Address;
 use Thelia\Model\Customer;

core/lib/Thelia/Core/Event/Address/AddressEvent.php

@@ -22,7 +22,7 @@
 /*************************************************************************************/
 
 namespace Thelia\Core\Event\Address;
-use Symfony\Component\EventDispatcher\Event;
+
 use Thelia\Core\Event\ActionEvent;
 use Thelia\Model\Address;
 

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

@@ -23,7 +23,6 @@
 
 namespace Thelia\Core\Event\Cart;
 
-use Symfony\Component\EventDispatcher\Event;
 use Thelia\Core\Event\ActionEvent;
 use Thelia\Model\Cart;
 

core/lib/Thelia/Core/Event/Customer/CustomerCreateOrUpdateEvent.php

@@ -22,9 +22,6 @@
 /*************************************************************************************/
 namespace Thelia\Core\Event\Customer;
 
-use Symfony\Component\EventDispatcher\Event;
-use Thelia\Model\Customer;
-
 /**
  * Class CustomerCreateOrUpdateEvent
  * @package Thelia\Core\Event

core/lib/Thelia/Core/Event/Customer/CustomerLoginEvent.php

@@ -23,8 +23,6 @@
 
 namespace Thelia\Core\Event\Customer;
 
-use Thelia\Model\Customer;
-
 class CustomerLoginEvent extends CustomerEvent
 {
     // Nothing specific :)

core/lib/Thelia/Core/Event/FeatureProduct/FeatureProductDeleteEvent.php

@@ -22,7 +22,6 @@
 /*************************************************************************************/
 
 namespace Thelia\Core\Event\FeatureProduct;
-use Thelia\Model\FeatureProduct;
 
 class FeatureProductDeleteEvent extends FeatureProductEvent
 {

core/lib/Thelia/Core/Event/FeatureProduct/FeatureProductUpdateEvent.php

@@ -22,7 +22,6 @@
 /*************************************************************************************/
 
 namespace Thelia\Core\Event\FeatureProduct;
-use Thelia\Model\FeatureProduct;
 
 class FeatureProductUpdateEvent extends FeatureProductEvent
 {

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

@@ -219,7 +219,6 @@ final class TheliaEvents
     const COUNTRY_UPDATE            = "action.updateCountry";
     const COUNTRY_DELETE            = "action.deleteCountry";
     const COUNTRY_TOGGLE_DEFAULT = "action.toggleCountryDefault";
-    //const COUNTRY_UPDATE_POSITION   = "action.updateFolderPosition";
 
     const BEFORE_CREATECOUNTRY = "action.before_createCountry";
     const AFTER_CREATECOUNTRY 	= "action.after_createCountry";

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

@@ -250,7 +250,14 @@ class Session extends BaseSession
      */
     public function getOrder()
     {
-        return $this->get("thelia.order");
+        $order = $this->get("thelia.order");
+
+        if (null === $order) {
+            $order = new Order();
+            $this->setOrder($order);
+        }
+
+        return $order;
     }
 
     /**

core/lib/Thelia/Core/Routing/RewritingRouter.php

@@ -32,7 +32,6 @@ use Symfony\Component\Routing\Matcher\RequestMatcherInterface;
 use Symfony\Component\Routing\RequestContext;
 use Symfony\Component\Routing\RouteCollection;
 use Symfony\Component\Routing\RouterInterface;
-use Thelia\Exception\RedirectException;
 use Thelia\Exception\UrlRewritingException;
 use Thelia\Model\ConfigQuery;
 use Thelia\Tools\Redirect;
@@ -161,7 +160,6 @@ class RewritingRouter implements RouterInterface, RequestMatcherInterface
      *
      * @throws \Exception|\Thelia\Exception\UrlRewritingException
      * @throws \Symfony\Component\Routing\Exception\ResourceNotFoundException
-     * @throws \Thelia\Exception\RedirectException
      * @return array                                                          An array of parameters
      *
      */

core/lib/Thelia/Core/Template/Assets/AsseticAssetManager.php

@@ -171,16 +171,6 @@ class AsseticAssetManager implements AssetManagerInterface
 
             $fs = new Filesystem();
 
-            // FIXME: locking or not locking ?
-            /*
-                        $lock_file = "$web_assets_directory_base/assets-".md5($source_assets_directory)."-generation-lock.txt";
-
-                        if (! $fp = fopen($lock_file, "w")) {
-                            throw new IOException(sprintf('Failed to open lock file %s', $lock_file));
-                        }
-
-                        if (flock($fp, LOCK_EX|LOCK_NB)) { // do an exclusive lock
-            */
             $tmp_dir = "$to_directory.tmp";
 
             $fs->remove($tmp_dir);

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

@@ -30,7 +30,6 @@ use Thelia\Core\Template\Loop\Argument\ArgumentCollection;
 use Thelia\Core\Template\Loop\Argument\Argument;
 
 use Thelia\Model\AccessoryQuery;
-use Thelia\Type;
 
 /**
  *

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

@@ -31,7 +31,6 @@ use Thelia\Core\Template\Loop\Argument\Argument;
 
 use Thelia\Model\ProductAssociatedContentQuery;
 use Thelia\Model\CategoryAssociatedContentQuery;
-use Thelia\Type;
 
 /**
  *
@@ -57,8 +56,8 @@ class AssociatedContent extends Content
         $argumentCollection
             ->addArgument(Argument::createIntTypeArgument('product'))
             ->addArgument(Argument::createIntTypeArgument('category'))
-            ->addArgument(Argument::createIntTypeArgument('exclude_product'))
+            ->addArgument(Argument::createIntListTypeArgument('exclude_product'))
-            ->addArgument(Argument::createIntTypeArgument('exclude_category'))
+            ->addArgument(Argument::createIntListTypeArgument('exclude_category'))
             ;
 
         $argumentCollection->get('order')->default = "associated_content";

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

@@ -71,8 +71,7 @@ class Auth extends BaseLoop implements ArraySearchLoopInterface
                 new TypeCollection(
                     new EnumListType(array(AccessManager::VIEW, AccessManager::CREATE, AccessManager::UPDATE, AccessManager::DELETE))
                 )
-            ),
+            )
-            Argument::createAnyTypeArgument('context', 'front', false)
          );
     }
 

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

@@ -90,7 +90,6 @@ class Cart extends BaseLoop implements ArraySearchLoopInterface
             $loopResultRow->set("TITLE", $product->getTitle());
             $loopResultRow->set("REF", $product->getRef());
             $loopResultRow->set("QUANTITY", $cartItem->getQuantity());
-            $loopResultRow->set("PRICE", $cartItem->getPrice());
             $loopResultRow->set("PRODUCT_ID", $product->getId());
             $loopResultRow->set("PRODUCT_URL", $product->getUrl($this->request->getSession()->getLang()->getLocale()))
                 ->set("STOCK", $productSaleElement->getQuantity())

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

@@ -65,7 +65,6 @@ class CategoryPath extends BaseI18nLoop  implements ArraySearchLoopInterface
         return new ArgumentCollection(
             Argument::createIntTypeArgument('category', null, true),
             Argument::createIntTypeArgument('depth'),
-            Argument::createIntTypeArgument('level'),
             Argument::createBooleanOrBothTypeArgument('visible', true, false)
         );
     }

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

@@ -36,7 +36,6 @@ use Thelia\Core\Template\Loop\Argument\ArgumentCollection;
 use Thelia\Coupon\Type\CouponInterface;
 use Thelia\Model\Coupon as MCoupon;
 use Thelia\Model\CouponQuery;
-use Thelia\Type;
 
 /**
  * Coupon Loop

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

@@ -67,19 +67,26 @@ class Customer extends BaseLoop implements SearchLoopInterface, PropelSearchLoop
             Argument::createBooleanTypeArgument('reseller'),
             Argument::createIntTypeArgument('sponsor'),
             new Argument(
-                    'order',
+                'order',
-                    new TypeCollection(
+                new TypeCollection(
-                            new Type\EnumListType(array(
+                    new Type\EnumListType(array(
-                                    'id', 'id_reverse',
+                        'id',
-                                    'reference', 'reference_reverse',
+                        'id_reverse',
-                                    'firstname', 'firstname_reverse',
+                        'reference',
-                                    'lastname', 'lastname_reverse',
+                        'reference_reverse',
-                                    'last_order', 'last_order_reverse',
+                        'firstname',
-                                    'order_amount', 'order_amount_reverse',
+                        'firstname_reverse',
-                                    'registration_date', 'registration_date_reverse'
+                        'lastname',
-                            ))
+                        'lastname_reverse',
-                    ),
+                        'last_order',
-                    'lastname'
+                        'last_order_reverse',
+                        'order_amount',
+                        'order_amount_reverse',
+                        'registration_date',
+                        'registration_date_reverse'
+                    ))
+                ),
+                'lastname'
             )
         );
     }
@@ -166,7 +173,7 @@ class Customer extends BaseLoop implements SearchLoopInterface, PropelSearchLoop
             $search->filterBySponsor($sponsor, Criteria::EQUAL);
         }
 
-        $orders  = $this->getOrder();
+        $orders = $this->getOrder();
 
         foreach ($orders as $order) {
             switch ($order) {
@@ -219,19 +226,15 @@ class Customer extends BaseLoop implements SearchLoopInterface, PropelSearchLoop
             $loopResultRow = new LoopResultRow($customer);
 
             $loopResultRow
-                ->set("ID"        , $customer->getId())
+                ->set("ID", $customer->getId())
-                ->set("REF"       , $customer->getRef())
+                ->set("REF", $customer->getRef())
-                ->set("TITLE"     , $customer->getTitleId())
+                ->set("TITLE", $customer->getTitleId())
-                ->set("FIRSTNAME" , $customer->getFirstname())
+                ->set("FIRSTNAME", $customer->getFirstname())
-                ->set("LASTNAME"  , $customer->getLastname())
+                ->set("LASTNAME", $customer->getLastname())
-                ->set("EMAIL"     , $customer->getEmail())
+                ->set("EMAIL", $customer->getEmail())
-                ->set("RESELLER"  , $customer->getReseller())
+                ->set("RESELLER", $customer->getReseller())
-                ->set("SPONSOR"   , $customer->getSponsor())
+                ->set("SPONSOR", $customer->getSponsor())
-                ->set("DISCOUNT"  , $customer->getDiscount())
+                ->set("DISCOUNT", $customer->getDiscount())
-
-                ->set("LAST_ORDER_DATE"     , $lastOrder != null ? $lastOrder->getCreatedAt() : '')
-                ->set("LAST_ORDER_AMOUNT"   , $lastOrder != null ? $lastOrder->getCreatedAt() : '')
-                ->set("LAST_ORDER_CURRENCY" , $lastOrder != null ? $lastOrder->getCreatedAt() : '')
             ;
 
             $loopResult->addRow($loopResultRow);

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

@@ -165,8 +165,6 @@ class Document extends BaseI18nLoop implements PropelSearchLoopInterface
             $source_id = $this->getSourceId();
             $id = $this->getId();
 
-            // echo "source = ".$this->getSource().", id=".$source_id." - ".$this->getArg('source_id')->getValue()."<br />";
-
             if (is_null($source_id) && is_null($id)) {
                             throw new \InvalidArgumentException("If 'source' argument is specified, 'id' or 'source_id' argument should be specified");
             }
@@ -264,7 +262,7 @@ class Document extends BaseI18nLoop implements PropelSearchLoopInterface
                 $loopResult->addRow($loopResultRow);
             } catch (\Exception $ex) {
                 // Ignore the result and log an error
-                Tlog::getInstance()->addError(sprintf("Failed to process document in document loop: %s", $ex->getMessage()), $this->args);
+                Tlog::getInstance()->addError(sprintf("Failed to process document in document loop: %s", $ex->getMessage()));
             }
         }
 

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

@@ -82,7 +82,7 @@ class Feed extends BaseLoop  implements ArraySearchLoopInterface
                 ->set("TITLE"       , $item->get_title())
                 ->set("AUTHOR"      , $item->get_author())
                 ->set("DESCRIPTION" , $item->get_description())
-                ->set("DATE"        , $item->get_date('U')) // FIXME - date format should be an intl parameter
+                ->set("DATE"        , $item->get_date('U'))
             ;
 
             $loopResult->addRow($loopResultRow);

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

@@ -75,7 +75,6 @@ class FolderPath extends BaseI18nLoop implements ArraySearchLoopInterface
         return new ArgumentCollection(
             Argument::createIntTypeArgument('folder', null, true),
             Argument::createIntTypeArgument('depth'),
-            Argument::createIntTypeArgument('level'),
             Argument::createBooleanOrBothTypeArgument('visible', true, false)
         );
     }

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

@@ -180,8 +180,6 @@ class Image extends BaseI18nLoop implements PropelSearchLoopInterface
             $source_id = $this->getSourceId();
             $id = $this->getId();
 
-            //echo "source = ".$this->getSourceId()."source_id=$source_id, id=$id<br />";
-
             if (is_null($source_id) && is_null($id)) {
                 throw new \InvalidArgumentException("If 'source' argument is specified, 'id' or 'source_id' argument should be specified");
             }
@@ -235,7 +233,6 @@ class Image extends BaseI18nLoop implements PropelSearchLoopInterface
         if (!is_null($exclude))
             $search->filterById($exclude, Criteria::NOT_IN);
 
-        // echo "sql=".$search->toString();
         return $search;
 
     }
@@ -273,10 +270,6 @@ class Image extends BaseI18nLoop implements PropelSearchLoopInterface
         }
 
         foreach ($loopResult->getResultDataCollection() as $result) {
-            // Create image processing event
-
-            // ERO : following is duplicated, guess it's useless at this point
-            //$event = new ImageEvent($this->request);
 
             // Setup required transformations
             if (! is_null($width)) $event->setWidth($width);
@@ -323,7 +316,7 @@ class Image extends BaseI18nLoop implements PropelSearchLoopInterface
                 $loopResult->addRow($loopResultRow);
             } catch (\Exception $ex) {
                 // Ignore the result and log an error
-                Tlog::getInstance()->addError("Failed to process image in image loop: ", $this->args);
+                Tlog::getInstance()->addError(sprintf("Failed to process image in image loop: %s", $ex->getMessage()));
             }
         }
 

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

@@ -78,19 +78,11 @@ class OrderCoupon extends BaseLoop implements PropelSearchLoopInterface
         /** @var OrderCoupon $orderCoupon */
         foreach ($loopResult->getResultDataCollection() as $orderCoupon) {
             $loopResultRow = new LoopResultRow($orderCoupon);
-            /*$conditions = $conditionFactory->unserializeConditionCollection(
-                $orderCoupon->getSerializedConditions()
-            );*/
 
             $now = time();
             $datediff = $orderCoupon->getExpirationDate()->getTimestamp() - $now;
             $daysLeftBeforeExpiration = floor($datediff/(60*60*24));
 
-            /*$cleanedConditions = array();
-
-            foreach ($conditions->getConditions() as $condition) {
-                $cleanedConditions[] = $condition->getToolTip();
-            }*/
             $loopResultRow->set("ID", $orderCoupon->getId())
                 ->set("CODE", $orderCoupon->getCode())
                 ->set("TITLE", $orderCoupon->getTitle())
@@ -100,8 +92,6 @@ class OrderCoupon extends BaseLoop implements PropelSearchLoopInterface
                 ->set("IS_CUMULATIVE", $orderCoupon->getIsCumulative())
                 ->set("IS_REMOVING_POSTAGE", $orderCoupon->getIsRemovingPostage())
                 ->set("IS_AVAILABLE_ON_SPECIAL_OFFERS", $orderCoupon->getIsAvailableOnSpecialOffers())
-                //->set("AMOUNT", $orderCoupon->getAmount())
-                //->set("APPLICATION_CONDITIONS", $cleanedConditions)
                 ->set("DAY_LEFT_BEFORE_EXPIRATION", $daysLeftBeforeExpiration)
             ;
             $loopResult->addRow($loopResultRow);

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

@@ -83,6 +83,7 @@ class Product extends BaseI18nLoop implements PropelSearchLoopInterface, SearchL
             Argument::createIntTypeArgument('min_stock'),
             Argument::createFloatTypeArgument('min_weight'),
             Argument::createFloatTypeArgument('max_weight'),
+            Argument::createBooleanTypeArgument('with_prev_next_info', false),
             Argument::createBooleanTypeArgument('current'),
             Argument::createBooleanTypeArgument('current_category'),
             Argument::createIntTypeArgument('depth', 1),
@@ -494,35 +495,10 @@ class Product extends BaseI18nLoop implements PropelSearchLoopInterface, SearchL
             // Find previous and next product, in the default category.
             $default_category_id = $product->getDefaultCategoryId();
 
-            $previous = ProductQuery::create()
-                ->joinProductCategory()
-                ->where('ProductCategory.category_id = ?', $default_category_id)
-                ->filterByPosition($product->getPosition(), Criteria::LESS_THAN)
-                ->orderByPosition(Criteria::DESC)
-                ->findOne()
-            ;
-
-            $next = ProductQuery::create()
-                ->joinProductCategory()
-                ->where('ProductCategory.category_id = ?', $default_category_id)
-                ->filterByPosition($product->getPosition(), Criteria::GREATER_THAN)
-                ->orderByPosition(Criteria::ASC)
-                ->findOne()
-            ;
-
             $loopResultRow
-                ->set("ID"                      , $product->getId())
+                ->set("WEIGHT"                  , $product->getVirtualColumn('weight'))
-                ->set("REF"                     , $product->getRef())
+                ->set("QUANTITY"                , $product->getVirtualColumn('quantity'))
-                ->set("IS_TRANSLATED"           , $product->getVirtualColumn('IS_TRANSLATED'))
+                ->set("EAN_CODE"                , $product->getVirtualColumn('ean_code'))
-                ->set("LOCALE"                  , $this->locale)
-                ->set("TITLE"                   , $product->getVirtualColumn('i18n_TITLE'))
-                ->set("CHAPO"                   , $product->getVirtualColumn('i18n_CHAPO'))
-                ->set("DESCRIPTION"             , $product->getVirtualColumn('i18n_DESCRIPTION'))
-                ->set("POSTSCRIPTUM"            , $product->getVirtualColumn('i18n_POSTSCRIPTUM'))
-                ->set("URL"                     , $product->getUrl($this->locale))
-                ->set("META_TITLE"              , $product->getVirtualColumn('i18n_META_TITLE'))
-                ->set("META_DESCRIPTION"        , $product->getVirtualColumn('i18n_META_DESCRIPTION'))
-                ->set("META_KEYWORDS"            , $product->getVirtualColumn('i18n_META_KEYWORDS'))
                 ->set("BEST_PRICE"              , $product->getVirtualColumn('is_promo') ? $promoPrice : $price)
                 ->set("BEST_PRICE_TAX"          , $taxedPrice - $product->getVirtualColumn('is_promo') ? $taxedPromoPrice - $promoPrice : $taxedPrice - $price)
                 ->set("BEST_TAXED_PRICE"        , $product->getVirtualColumn('is_promo') ? $taxedPromoPrice : $taxedPrice)
@@ -532,25 +508,13 @@ class Product extends BaseI18nLoop implements PropelSearchLoopInterface, SearchL
                 ->set("PROMO_PRICE"             , $promoPrice)
                 ->set("PROMO_PRICE_TAX"         , $taxedPromoPrice - $promoPrice)
                 ->set("TAXED_PROMO_PRICE"       , $taxedPromoPrice)
-                ->set("PRODUCT_SALE_ELEMENT"    , $product->getVirtualColumn('pse_id'))
-                ->set("WEIGHT"                  , $product->getVirtualColumn('weight'))
-                ->set("QUANTITY"                , $product->getVirtualColumn('quantity'))
-                ->set("EAN_CODE"                , $product->getVirtualColumn('ean_code'))
                 ->set("IS_PROMO"                , $product->getVirtualColumn('is_promo'))
                 ->set("IS_NEW"                  , $product->getVirtualColumn('is_new'))
-                ->set("POSITION"                , $product->getPosition())
-                ->set("VISIBLE"                 , $product->getVisible() ? "1" : "0")
-                ->set("TEMPLATE"                , $product->getTemplateId())
-                ->set("HAS_PREVIOUS"            , $previous != null ? 1 : 0)
-                ->set("HAS_NEXT"                , $next != null ? 1 : 0)
-                ->set("PREVIOUS"                , $previous != null ? $previous->getId() : -1)
-                ->set("NEXT"                    , $next != null ? $next->getId() : -1)
-                ->set("DEFAULT_CATEGORY"        , $default_category_id)
-                ->set("TAX_RULE_ID"             , $product->getTaxRuleId())
 
             ;
 
-            $loopResult->addRow($loopResultRow);
+
+            $loopResult->addRow($this->associateValues($loopResultRow, $product, $default_category_id));
         }
 
         return $loopResult;
@@ -1004,6 +968,48 @@ class Product extends BaseI18nLoop implements PropelSearchLoopInterface, SearchL
             // Find previous and next product, in the default category.
             $default_category_id = $product->getDefaultCategoryId();
 
+            $loopResultRow
+                ->set("BEST_PRICE"       , $price)
+                ->set("BEST_PRICE_TAX"   , $taxedPrice - $price)
+                ->set("BEST_TAXED_PRICE" , $taxedPrice)
+                ->set("IS_PROMO"                , $product->getVirtualColumn('is_promo'))
+                ->set("IS_NEW"                  , $product->getVirtualColumn('is_new'))
+            ;
+
+
+            $loopResult->addRow($this->associateValues($loopResultRow, $product, $default_category_id));
+        }
+
+        return $loopResult;
+    }
+
+    private function associateValues($loopResultRow, $product, $default_category_id)
+    {
+        $loopResultRow
+            ->set("ID"                      , $product->getId())
+            ->set("REF"                     , $product->getRef())
+            ->set("IS_TRANSLATED"           , $product->getVirtualColumn('IS_TRANSLATED'))
+            ->set("LOCALE"                  , $this->locale)
+            ->set("TITLE"                   , $product->getVirtualColumn('i18n_TITLE'))
+            ->set("CHAPO"                   , $product->getVirtualColumn('i18n_CHAPO'))
+            ->set("DESCRIPTION"             , $product->getVirtualColumn('i18n_DESCRIPTION'))
+            ->set("POSTSCRIPTUM"            , $product->getVirtualColumn('i18n_POSTSCRIPTUM'))
+            ->set("URL"                     , $product->getUrl($this->locale))
+            ->set("META_TITLE"              , $product->getVirtualColumn('i18n_META_TITLE'))
+            ->set("META_DESCRIPTION"        , $product->getVirtualColumn('i18n_META_DESCRIPTION'))
+            ->set("META_KEYWORDS"            , $product->getVirtualColumn('i18n_META_KEYWORDS'))
+            ->set("PRODUCT_SALE_ELEMENT"    , $product->getVirtualColumn('pse_id'))
+            ->set("POSITION"                , $product->getPosition())
+            ->set("VISIBLE"                 , $product->getVisible() ? "1" : "0")
+            ->set("TEMPLATE"                , $product->getTemplateId())
+            ->set("DEFAULT_CATEGORY"        , $default_category_id)
+            ->set("TAX_RULE_ID"             , $product->getTaxRuleId())
+
+        ;
+
+
+        if ($this->getBackend_context() || $this->getWithPrevNextInfo()) {
+            // Find previous and next category
             $previous = ProductQuery::create()
                 ->joinProductCategory()
                 ->where('ProductCategory.category_id = ?', $default_category_id)
@@ -1021,39 +1027,14 @@ class Product extends BaseI18nLoop implements PropelSearchLoopInterface, SearchL
             ;
 
             $loopResultRow
-                ->set("ID"               , $product->getId())
-                ->set("REF"              , $product->getRef())
-                ->set("IS_TRANSLATED"    , $product->getVirtualColumn('IS_TRANSLATED'))
-                ->set("LOCALE"           , $this->locale)
-                ->set("TITLE"            , $product->getVirtualColumn('i18n_TITLE'))
-                ->set("CHAPO"            , $product->getVirtualColumn('i18n_CHAPO'))
-                ->set("DESCRIPTION"      , $product->getVirtualColumn('i18n_DESCRIPTION'))
-                ->set("POSTSCRIPTUM"     , $product->getVirtualColumn('i18n_POSTSCRIPTUM'))
-                ->set("URL"              , $product->getUrl($this->locale))
-                ->set("META_TITLE"       , $product->getVirtualColumn('i18n_META_TITLE'))
-                ->set("META_DESCRIPTION" , $product->getVirtualColumn('i18n_META_DESCRIPTION'))
-                ->set("META_KEYWORDS"     , $product->getVirtualColumn('i18n_META_KEYWORDS'))
-                ->set("BEST_PRICE"       , $price)
-                ->set("BEST_PRICE_TAX"   , $taxedPrice - $price)
-                ->set("BEST_TAXED_PRICE" , $taxedPrice)
-                ->set("IS_PROMO"         , $product->getVirtualColumn('main_product_is_promo'))
-                ->set("IS_NEW"           , $product->getVirtualColumn('main_product_is_new'))
-                ->set("POSITION"         , $product->getPosition())
-                ->set("VISIBLE"          , $product->getVisible() ? "1" : "0")
-                ->set("TEMPLATE"         , $product->getTemplateId())
                 ->set("HAS_PREVIOUS"     , $previous != null ? 1 : 0)
                 ->set("HAS_NEXT"         , $next != null ? 1 : 0)
                 ->set("PREVIOUS"         , $previous != null ? $previous->getId() : -1)
                 ->set("NEXT"             , $next != null ? $next->getId() : -1)
-                ->set("DEFAULT_CATEGORY" , $default_category_id)
-                ->set("TAX_RULE_ID"      , $product->getTaxRuleId())
-
             ;
-
-            $loopResult->addRow($loopResultRow);
         }
 
-        return $loopResult;
+        return $loopResultRow;
     }
 
     protected function manageFeatureAv(&$search, $feature_availability)

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

@@ -35,10 +35,10 @@ abstract class AbstractSmartyPlugin
     /**
      * Explode a comma separated list in a array, trimming all array elements
      *
-     * @param  unknown    $commaSeparatedValues
+     * @param  mixed  $commaSeparatedValues
-     * @return multitype:
+     * @return mixed:
      */
-    protected function _explode($commaSeparatedValues)
+    protected function explode($commaSeparatedValues)
     {
         if (null === $commaSeparatedValues) {
             return array();

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

@@ -43,7 +43,7 @@ class AdminUtilities extends AbstractSmartyPlugin
         $this->securityContext = $securityContext;
     }
 
-    protected function fetch_snippet($smarty, $templateName, $variablesArray)
+    protected function fetchSnippet($smarty, $templateName, $variablesArray)
     {
         $data = '';
 
@@ -97,7 +97,7 @@ class AdminUtilities extends AbstractSmartyPlugin
                 $module === null ? array() : array($module),
                 array($access))
         ) {
-            return $this->fetch_snippet($smarty, 'includes/admin-utilities-position-block', array(
+            return $this->fetchSnippet($smarty, 'includes/admin-utilities-position-block', array(
                     'admin_utilities_go_up_url'           => URL::getInstance()->absoluteUrl($path, array('mode' => 'up', $url_parameter => $id)),
                     'admin_utilities_in_place_edit_class' => $in_place_edit_class,
                     'admin_utilities_object_id'           => $id,
@@ -146,7 +146,7 @@ class AdminUtilities extends AbstractSmartyPlugin
             $order_change = $order;
         }
 
-        return $this->fetch_snippet($smarty, 'includes/admin-utilities-sortable-column-header', array(
+        return $this->fetchSnippet($smarty, 'includes/admin-utilities-sortable-column-header', array(
                 'admin_utilities_sort_direction' => $sort_direction,
                 'admin_utilities_sorting_url'    => URL::getInstance()->absoluteUrl($path, array($request_parameter_name => $order_change)),
                 'admin_utilities_header_text'    => $label

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

@@ -170,12 +170,6 @@ class DataAccessFunctions extends AbstractSmartyPlugin
     {
         switch ($params["ask"]) {
             case "default":
-                /*if (array_key_exists('defaultCountry', self::$dataAccessCache)) {
-                    $defaultCountry = self::$dataAccessCache['defaultCountry'];
-                } else {
-                    $defaultCountry = CountryQuery::create()->findOneByByDefault(1);
-                    self::$dataAccessCache['defaultCountry'] = $defaultCountry;
-                }*/
                 $defaultCountry = CountryQuery::create()->filterByByDefault(1)->limit(1);
 
                 return $this->dataAccessWithI18n("defaultCountry", $params, $defaultCountry);

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

@@ -63,7 +63,7 @@ class Module extends AbstractSmartyPlugin
     public function theliaModule($params, \Smarty_Internal_Template $template)
     {
         $content = null;
-
+        $count = 0;
         if (false !== $location = $this->getParam($params, 'location', false)) {
 
             if ($this->debug === true && $this->request->get('SHOW_INCLUDE')) {
@@ -74,8 +74,6 @@ class Module extends AbstractSmartyPlugin
 
             $modules = ModuleQuery::getActivated();
 
-            $count = 0;
-
             foreach ($modules as $module) {
 
                 if (null !== $moduleLimit && $moduleLimit != $module->getCode()) {
@@ -92,14 +90,14 @@ class Module extends AbstractSmartyPlugin
             }
         }
 
-        if (! empty($content)) {
-            return $template->fetch(sprintf("string:%s", $content));
-        }
-
         if (false !== $countvarname = $this->getParam($params, 'countvar', false)) {
             $template->assign($countvarname, $count);
         }
 
+        if (! empty($content)) {
+            return $template->fetch(sprintf("string:%s", $content));
+        }
+
         return "";
     }
 

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

@@ -53,16 +53,16 @@ class Security extends AbstractSmartyPlugin
      */
     public function checkAuthFunction($params, &$smarty)
     {
-        $roles = $this->_explode($this->getParam($params, 'role'));
+        $roles = $this->explode($this->getParam($params, 'role'));
-        $resources = $this->_explode($this->getParam($params, 'resource'));
+        $resources = $this->explode($this->getParam($params, 'resource'));
-        $modules = $this->_explode($this->getParam($params, 'module'));
+        $modules = $this->explode($this->getParam($params, 'module'));
-        $accesses = $this->_explode($this->getParam($params, 'access'));
+        $accesses = $this->explode($this->getParam($params, 'access'));
 
         if (! $this->securityContext->isGranted($roles, $resources, $modules, $accesses)) {
 
             $ex = new AuthenticationException(
-                sprintf("User not granted for roles '%s', to access resources '%s' with %s in context '%s'.",
+                sprintf("User not granted for roles '%s', to access resources '%s' with %s.",
-                    implode(',', $roles), implode(',', $resources), implode(',', $accesses), $context
+                    implode(',', $roles), implode(',', $resources), implode(',', $accesses)
                 )
             );
 

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

@@ -186,7 +186,6 @@ class UrlGenerator extends AbstractSmartyPlugin
 
     protected function getCurrentUrl()
     {
-        //return URL::getInstance()->retrieveCurrent($this->request)->toString();
         return $this->request->getUri();
     }
 

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

@@ -82,8 +82,6 @@ class SmartyParser extends Smarty implements ParserInterface
             $this->setForceCompile(false);
         }
 
-        //$this->enableSecurity();
-
         // The default HTTP status
         $this->status = 200;
 

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

@@ -139,7 +139,7 @@ class TemplateHelper
         }
     }
 
-    protected function normalize_path($path)
+    protected function normalizePath($path)
     {
         $path = str_replace(
             str_replace('\\', '/', THELIA_ROOT),
@@ -203,7 +203,7 @@ class TemplateHelper
 
                         if ($content = file_get_contents($fileInfo->getPathName())) {
 
-                            $short_path = $this->normalize_path($fileInfo->getPathName());
+                            $short_path = $this->normalizePath($fileInfo->getPathName());
 
                             Tlog::getInstance()->debug("Examining file $short_path\n");
 
@@ -249,7 +249,7 @@ class TemplateHelper
     }
 
 
-    public function write_translation($file, $texts, $translations)
+    public function writeTranslation($file, $texts, $translations)
     {
         if ($fp = @fopen($file, 'w')) {
 

core/lib/Thelia/Core/Thelia.php

@@ -63,9 +63,6 @@ class Thelia extends Kernel
     public function init()
     {
         parent::init();
-        if ($this->debug) {
-            ini_set('display_errors', 1);
-        }
         $this->initPropel();
     }
 

core/lib/Thelia/Core/TheliaHttpKernel.php

@@ -79,7 +79,6 @@ class TheliaHttpKernel extends HttpKernel
      */
     public function handle(Request $request, $type = HttpKernelInterface::MASTER_REQUEST, $catch = true)
     {
-        //$request->headers->set('X-Php-Ob-Level', ob_get_level());
         if ($type == HttpKernelInterface::MASTER_REQUEST) {
             $request = $this->initSession($request);
             $this->initParam($request);
@@ -189,7 +188,6 @@ class TheliaHttpKernel extends HttpKernel
                     // TODO : search if http status 302 is the good one.
                     $redirect = new RedirectResponse($lang->getUrl(), 302);
                     $redirect->send();
-                    exit;
                 } else {
                     //the user is actually on the good domain, nothing to change
                     return null;

core/lib/Thelia/Exception/AdminAccessDenied.php

@@ -20,53 +20,15 @@
 /*	    along with this program. If not, see <http://www.gnu.org/licenses/>.         */
 /*                                                                                   */
 /*************************************************************************************/
-namespace Thelia\Core\EventListener;
 
-use Symfony\Component\EventDispatcher\EventSubscriberInterface;
+namespace Thelia\Exception;
-use Symfony\Component\HttpKernel\KernelEvents;
-use Symfony\Component\HttpKernel\Event\FilterControllerEvent;
-use Thelia\Core\Factory\ActionEventFactory;
-use Thelia\Core\Template\ParserContext;
 
 /**
- *
+ * Class AdminAccessDenied
- * Action are dispatched here.
+ * @package Thelia\Exception
- *
- * A factory is used for creating appropriate action object
- *
- * Class ControllerListener
- * @package Thelia\Core\EventListener
  * @author Manuel Raynaud <mraynaud@openstudio.fr>
  */
-class ControllerListener implements EventSubscriberInterface
+class AdminAccessDenied extends \RuntimeException
 {
-    /**
-     * @var ParserContext the parser context
-     */
-    protected $parserContext;
 
-    public function __construct(ParserContext $parserContext)
-    {
-        $this->parserContext = $parserContext;
-    }
-
-    public function onKernelController(FilterControllerEvent $event)
-    {
-        $dispatcher = $event->getDispatcher();
-        $request = $event->getRequest();
-
-        if (false !== $action = $request->get("action")) {
-           //search corresponding action
-            $event = new ActionEventFactory($request, $action, $event->getKernel()->getContainer()->getParameter("thelia.actionEvent"));
-            $actionEvent = $event->createActionEvent();
-            $dispatcher->dispatch("action.".$action, $actionEvent);
-         }
-    }
-
-   public static function getSubscribedEvents()
-   {
-        return array(
-            KernelEvents::CONTROLLER => array('onKernelController', 0)
-        );
-   }
 }

core/lib/Thelia/Form/AttributeModificationForm.php

@@ -39,12 +39,6 @@ class AttributeModificationForm extends AttributeCreationForm
                         )
                     )
             ))
-/* FIXME: doesn't work
-            ->add('attribute_values', 'collection', array(
-                    'type'   => 'text',
-                    'options'  => array('required'  => false)
-            ))
-*/
         ;
 
         // Add standard description fields

core/lib/Thelia/Form/FeatureCreationForm.php

@@ -46,9 +46,6 @@ class FeatureCreationForm extends BaseForm
                 ))
             )
             ->add("add_to_all"   , "checkbox"  , array(
-                "constraints" => array(
-                    new NotBlank()
-                ),
                 "label" => Translator::getInstance()->trans("Add to all product templates"),
                 "label_attr" => array(
                     "for" => "add_to_all"

core/lib/Thelia/Form/FeatureModificationForm.php

@@ -39,13 +39,7 @@ class FeatureModificationForm extends FeatureCreationForm
                         )
                     )
             ))
-/* FIXME: doesn't work
+     ;
-            ->add('feature_values', 'collection', array(
-                    'type'   => 'text',
-                    'options'  => array('required'  => false)
-            ))
-*/
-        ;
 
         // Add standard description fields
         $this->addStandardDescFields();

core/lib/Thelia/Form/OrderPayment.php

@@ -88,7 +88,7 @@ class OrderPayment extends BaseForm
         $moduleReflection = new \ReflectionClass($module->getFullNamespace());
         if ($moduleReflection->isSubclassOf("Thelia\Module\PaymentModuleInterface") === false) {
             $context->addViolation(
-                sprintf(Translator::getInstance()->trans("delivery module %s is not a Thelia\Module\PaymentModuleInterface"), $module->getCode())
+                sprintf(Translator::getInstance()->trans("payment module %s is not a Thelia\Module\PaymentModuleInterface"), $module->getCode())
             );
         }
     }

core/lib/Thelia/Form/ProductCreationForm.php

@@ -70,8 +70,12 @@ class ProductCreationForm extends BaseForm
                 ->add("price", "number", array(
                     "constraints" => array(new NotBlank()),
                     "label"      => Translator::getInstance()->trans("Product base price excluding taxes *"),
-                    "label_attr" => array("for" => "price_field")
+                    "label_attr" => array("for" => "price_without_tax")
                 ))
+               ->add("tax_price", "number", array(
+                       "label"      => Translator::getInstance()->trans("Product base price with taxes"),
+                       "label_attr" => array("for" => "price_with_tax")
+                   ))
                 ->add("currency", "integer", array(
                     "constraints" => array(new NotBlank()),
                     "label"      => Translator::getInstance()->trans("Price currency *"),
@@ -83,8 +87,7 @@ class ProductCreationForm extends BaseForm
                     "label_attr" => array("for" => "tax_rule_field")
                 ))
                 ->add("weight", "number", array(
-                    "constraints" => array(new NotBlank()),
+                    "label"      => Translator::getInstance()->trans("Weight"),
-                    "label"      => Translator::getInstance()->trans("Weight *"),
                     "label_attr" => array("for" => "weight_field")
                 ))
             ;

core/lib/Thelia/Form/ProductDefaultSaleElementUpdateForm.php

@@ -65,8 +65,7 @@ class ProductDefaultSaleElementUpdateForm extends ProductSaleElementUpdateForm
                 "label_attr" => array("for" => "tax_rule_field")
         ))
         ->add("weight", "number", array(
-                "constraints" => array(new NotBlank()),
+                "label"      => Translator::getInstance()->trans("Weight"),
-                "label"      => Translator::getInstance()->trans("Weight *"),
                 "label_attr" => array("for" => "weight_field")
         ))
         ->add("quantity", "number", array(

core/lib/Thelia/Form/ProductSaleElementUpdateForm.php

@@ -91,13 +91,10 @@ class ProductSaleElementUpdateForm extends BaseForm
             ))
             ->add('weight', 'collection', array(
                 'type'         => 'number',
-                'label'        => Translator::getInstance()->trans('Weight *'),
+                'label'        => Translator::getInstance()->trans('Weight'),
                 'label_attr'   => array('for' => 'weight_field'),
                 'allow_add'    => true,
-                'allow_delete' => true,
+                'allow_delete' => true
-                'options'      => array(
-                    'constraints' => array(new NotBlank()),
-                )
             ))
             ->add('quantity', 'collection', array(
                 'type'         => 'number',

core/lib/Thelia/Form/TemplateModificationForm.php

@@ -41,18 +41,6 @@ class TemplateModificationForm extends TemplateCreationForm
                         )
                     )
             ))
-/*
-            ->add('attributes', 'collection', array(
-                    'type'   => 'text',
-                    'options'  => array('required'  => false)
-            ))
-*/
-/* FIXME: doesn't work
-            ->add('features', 'collection', array(
-                    'type'   => 'text',
-                    'options'  => array('required'  => false)
-            ))
-*/
             ;
     }
 

core/lib/Thelia/Install/Database.php

@@ -66,8 +66,8 @@ class Database
                 );
             }
         }
-
+        $size = count($sql);
-        for ($i = 0; $i < count($sql); $i ++) {
+        for ($i = 0; $i < $size; $i ++) {
             if (!empty($sql[$i])) {
                 $this->connection->query($sql[$i]);
             }
@@ -87,8 +87,8 @@ class Database
         $query = array();
 
         $tab = explode(";\n", $sql);
-
+        $size = count($tab);
-        for ($i=0; $i<count($tab); $i++) {
+        for ($i=0; $i<$size; $i++) {
             $queryTemp = str_replace("-CODE-", ";',", $tab[$i]);
             $queryTemp = str_replace("|", ";", $queryTemp);
             $query[] = $queryTemp;

core/lib/Thelia/Install/Update.php

@@ -73,7 +73,8 @@ class Update
         $logger->debug("begin transaction");
         $database = new Database($con->getWrappedConnection());
         try {
-            for ($i = ++$index; $i < count(self::$version); $i++) {
+            $size = count(self::$version);
+            for ($i = ++$index; $i < $size; $i++) {
                 $this->updateToVersion(self::$version[$i], $database, $logger);
                 $updatedVersions[] = self::$version[$i];
             }

core/lib/Thelia/Log/Tlog.php

@@ -620,7 +620,7 @@ class Tlog Implements LoggerInterface
                     // we are sometimes in functions = no class available: avoid php warning here
                     $className = $hop['class'];
 
-                    if (! empty($className) and ($className == ltrim(__CLASS__,'\\') or strtolower(get_parent_class($className)) == ltrim(__CLASS__,'\\'))) {
+                    if (! empty($className) && ($className == ltrim(__CLASS__,'\\') || strtolower(get_parent_class($className)) == ltrim(__CLASS__,'\\'))) {
                             $origine['line'] = $hop['line'];
                             $origine['file'] = $hop['file'];
                             break;
@@ -632,10 +632,10 @@ class Tlog Implements LoggerInterface
 
             $origine['class'] = isset($prevHop['class']) ? $prevHop['class'] : 'main';
 
-            if(isset($prevHop['function']) and
+            if(isset($prevHop['function']) &&
-                $prevHop['function'] !== 'include' and
+                $prevHop['function'] !== 'include' &&
-                $prevHop['function'] !== 'include_once' and
+                $prevHop['function'] !== 'include_once' &&
-                $prevHop['function'] !== 'require' and
+                $prevHop['function'] !== 'require' &&
                 $prevHop['function'] !== 'require_once') {
 
                 $origine['function'] = $prevHop['function'];

core/lib/Thelia/Model/Admin.php

@@ -27,6 +27,11 @@ class Admin extends BaseAdmin implements UserInterface
 {
     use ModelEventDispatcherTrait;
 
+    /**
+     * Retrieve all permissions for the current admin
+     *
+     * @return array|string
+     */
     public function getPermissions()
     {
         $profileId = $this->getProfileId();
@@ -105,7 +110,7 @@ class Admin extends BaseAdmin implements UserInterface
      */
     public function eraseCredentials()
     {
-        $this->setPassword(null);
+        parent::setPassword(null);
     }
 
     /**

core/lib/Thelia/Model/AreaDeliveryModule.php

@@ -4,7 +4,7 @@ namespace Thelia\Model;
 
 use Thelia\Model\Base\AreaDeliveryModule as BaseAreaDeliveryModule;
 
-        class AreaDeliveryModule extends BaseAreaDeliveryModule
+class AreaDeliveryModule extends BaseAreaDeliveryModule
 {
 
 }

core/lib/Thelia/Model/Base/Accessory.php

@@ -29,6 +29,7 @@ abstract class Accessory implements ActiveRecordInterface
      */
     const TABLE_MAP = '\\Thelia\\Model\\Map\\AccessoryTableMap';
 
+
     /**
      * attribute to determine if this object has previously been saved.
      * @var boolean
@@ -318,9 +319,9 @@ abstract class Accessory implements ActiveRecordInterface
      * $book->importFrom('JSON', '{"Id":9012,"Title":"Don Juan","ISBN":"0140422161","Price":12.99,"PublisherId":1234,"AuthorId":5678}');
      * </code>
      *
-     * @param mixed  $parser A AbstractParser instance,
+     * @param mixed $parser A AbstractParser instance,
      *                       or a format name ('XML', 'YAML', 'JSON', 'CSV')
-     * @param string $data   The source data to import from
+     * @param string $data The source data to import from
      *
      * @return Accessory The current object, for fluid interface
      */
@@ -370,40 +371,44 @@ abstract class Accessory implements ActiveRecordInterface
     /**
      * Get the [id] column value.
      *
-     * @return int
+     * @return   int
      */
     public function getId()
     {
+
         return $this->id;
     }
 
     /**
      * Get the [product_id] column value.
      *
-     * @return int
+     * @return   int
      */
     public function getProductId()
     {
+
         return $this->product_id;
     }
 
     /**
      * Get the [accessory] column value.
      *
-     * @return int
+     * @return   int
      */
     public function getAccessory()
     {
+
         return $this->accessory;
     }
 
     /**
      * Get the [position] column value.
      *
-     * @return int
+     * @return   int
      */
     public function getPosition()
     {
+
         return $this->position;
     }
 
@@ -411,8 +416,8 @@ abstract class Accessory implements ActiveRecordInterface
      * Get the [optionally formatted] temporal [created_at] column value.
      *
      *
-     * @param string $format The date/time format string (either date()-style or strftime()-style).
+     * @param      string $format The date/time format string (either date()-style or strftime()-style).
-     *                       If format is NULL, then the raw \DateTime object will be returned.
+     *                            If format is NULL, then the raw \DateTime object will be returned.
      *
      * @return mixed Formatted date/time value as string or \DateTime object (if format is NULL), NULL if column is NULL, and 0 if column value is 0000-00-00 00:00:00
      *
@@ -431,8 +436,8 @@ abstract class Accessory implements ActiveRecordInterface
      * Get the [optionally formatted] temporal [updated_at] column value.
      *
      *
-     * @param string $format The date/time format string (either date()-style or strftime()-style).
+     * @param      string $format The date/time format string (either date()-style or strftime()-style).
-     *                       If format is NULL, then the raw \DateTime object will be returned.
+     *                            If format is NULL, then the raw \DateTime object will be returned.
      *
      * @return mixed Formatted date/time value as string or \DateTime object (if format is NULL), NULL if column is NULL, and 0 if column value is 0000-00-00 00:00:00
      *
@@ -450,8 +455,8 @@ abstract class Accessory implements ActiveRecordInterface
     /**
      * Set the value of [id] column.
      *
-     * @param  int                     $v new value
+     * @param      int $v new value
-     * @return \Thelia\Model\Accessory The current object (for fluent API support)
+     * @return   \Thelia\Model\Accessory The current object (for fluent API support)
      */
     public function setId($v)
     {
@@ -464,14 +469,15 @@ abstract class Accessory implements ActiveRecordInterface
             $this->modifiedColumns[AccessoryTableMap::ID] = true;
         }
 
+
         return $this;
     } // setId()
 
     /**
      * Set the value of [product_id] column.
      *
-     * @param  int                     $v new value
+     * @param      int $v new value
-     * @return \Thelia\Model\Accessory The current object (for fluent API support)
+     * @return   \Thelia\Model\Accessory The current object (for fluent API support)
      */
     public function setProductId($v)
     {
@@ -488,14 +494,15 @@ abstract class Accessory implements ActiveRecordInterface
             $this->aProductRelatedByProductId = null;
         }
 
+
         return $this;
     } // setProductId()
 
     /**
      * Set the value of [accessory] column.
      *
-     * @param  int                     $v new value
+     * @param      int $v new value
-     * @return \Thelia\Model\Accessory The current object (for fluent API support)
+     * @return   \Thelia\Model\Accessory The current object (for fluent API support)
      */
     public function setAccessory($v)
     {
@@ -512,14 +519,15 @@ abstract class Accessory implements ActiveRecordInterface
             $this->aProductRelatedByAccessory = null;
         }
 
+
         return $this;
     } // setAccessory()
 
     /**
      * Set the value of [position] column.
      *
-     * @param  int                     $v new value
+     * @param      int $v new value
-     * @return \Thelia\Model\Accessory The current object (for fluent API support)
+     * @return   \Thelia\Model\Accessory The current object (for fluent API support)
      */
     public function setPosition($v)
     {
@@ -532,15 +540,16 @@ abstract class Accessory implements ActiveRecordInterface
             $this->modifiedColumns[AccessoryTableMap::POSITION] = true;
         }
 
+
         return $this;
     } // setPosition()
 
     /**
      * Sets the value of [created_at] column to a normalized version of the date/time value specified.
      *
-     * @param  mixed                   $v string, integer (timestamp), or \DateTime value.
+     * @param      mixed $v string, integer (timestamp), or \DateTime value.
-     *                                    Empty strings are treated as NULL.
+     *               Empty strings are treated as NULL.
-     * @return \Thelia\Model\Accessory The current object (for fluent API support)
+     * @return   \Thelia\Model\Accessory The current object (for fluent API support)
      */
     public function setCreatedAt($v)
     {
@@ -552,15 +561,16 @@ abstract class Accessory implements ActiveRecordInterface
             }
         } // if either are not null
 
+
         return $this;
     } // setCreatedAt()
 
     /**
      * Sets the value of [updated_at] column to a normalized version of the date/time value specified.
      *
-     * @param  mixed                   $v string, integer (timestamp), or \DateTime value.
+     * @param      mixed $v string, integer (timestamp), or \DateTime value.
-     *                                    Empty strings are treated as NULL.
+     *               Empty strings are treated as NULL.
-     * @return \Thelia\Model\Accessory The current object (for fluent API support)
+     * @return   \Thelia\Model\Accessory The current object (for fluent API support)
      */
     public function setUpdatedAt($v)
     {
@@ -572,6 +582,7 @@ abstract class Accessory implements ActiveRecordInterface
             }
         } // if either are not null
 
+
         return $this;
     } // setUpdatedAt()
 
@@ -678,10 +689,10 @@ abstract class Accessory implements ActiveRecordInterface
      *
      * This will only work if the object has been saved and has a valid primary key set.
      *
-     * @param  boolean             $deep (optional) Whether to also de-associated any related objects.
+     * @param      boolean $deep (optional) Whether to also de-associated any related objects.
-     * @param  ConnectionInterface $con  (optional) The ConnectionInterface connection to use.
+     * @param      ConnectionInterface $con (optional) The ConnectionInterface connection to use.
      * @return void
-     * @throws PropelException     - if this object is deleted, unsaved or doesn't have pk match in db
+     * @throws PropelException - if this object is deleted, unsaved or doesn't have pk match in db
      */
     public function reload($deep = false, ConnectionInterface $con = null)
     {
@@ -718,7 +729,7 @@ abstract class Accessory implements ActiveRecordInterface
     /**
      * Removes this object from datastore and sets delete attribute.
      *
-     * @param  ConnectionInterface $con
+     * @param      ConnectionInterface $con
      * @return void
      * @throws PropelException
      * @see Accessory::setDeleted()
@@ -761,8 +772,8 @@ abstract class Accessory implements ActiveRecordInterface
      * method.  This method wraps all precipitate database operations in a
      * single transaction.
      *
-     * @param  ConnectionInterface $con
+     * @param      ConnectionInterface $con
-     * @return int                 The number of rows affected by this insert/update and any referring fk objects' save() operations.
+     * @return int             The number of rows affected by this insert/update and any referring fk objects' save() operations.
      * @throws PropelException
      * @see doSave()
      */
@@ -823,8 +834,8 @@ abstract class Accessory implements ActiveRecordInterface
      * If the object is new, it inserts it; otherwise an update is performed.
      * All related objects are also updated in this method.
      *
-     * @param  ConnectionInterface $con
+     * @param      ConnectionInterface $con
-     * @return int                 The number of rows affected by this insert/update and any referring fk objects' save() operations.
+     * @return int             The number of rows affected by this insert/update and any referring fk objects' save() operations.
      * @throws PropelException
      * @see save()
      */
@@ -874,7 +885,7 @@ abstract class Accessory implements ActiveRecordInterface
     /**
      * Insert the row in the database.
      *
-     * @param ConnectionInterface $con
+     * @param      ConnectionInterface $con
      *
      * @throws PropelException
      * @see doSave()
@@ -958,7 +969,7 @@ abstract class Accessory implements ActiveRecordInterface
     /**
      * Update the row in the database.
      *
-     * @param ConnectionInterface $con
+     * @param      ConnectionInterface $con
      *
      * @return Integer Number of updated rows
      * @see doSave()
@@ -974,12 +985,12 @@ abstract class Accessory implements ActiveRecordInterface
     /**
      * Retrieves a field from the object by name passed in as a string.
      *
-     * @param  string $name name
+     * @param      string $name name
-     * @param  string $type The type of fieldname the $name is of:
+     * @param      string $type The type of fieldname the $name is of:
-     *                      one of the class type constants TableMap::TYPE_PHPNAME, TableMap::TYPE_STUDLYPHPNAME
+     *                     one of the class type constants TableMap::TYPE_PHPNAME, TableMap::TYPE_STUDLYPHPNAME
-     *                      TableMap::TYPE_COLNAME, TableMap::TYPE_FIELDNAME, TableMap::TYPE_NUM.
+     *                     TableMap::TYPE_COLNAME, TableMap::TYPE_FIELDNAME, TableMap::TYPE_NUM.
-     *                      Defaults to TableMap::TYPE_PHPNAME.
+     *                     Defaults to TableMap::TYPE_PHPNAME.
-     * @return mixed  Value of field.
+     * @return mixed Value of field.
      */
     public function getByName($name, $type = TableMap::TYPE_PHPNAME)
     {
@@ -993,7 +1004,7 @@ abstract class Accessory implements ActiveRecordInterface
      * Retrieves a field from the object by Position as specified in the xml schema.
      * Zero-based.
      *
-     * @param  int   $pos position in xml schema
+     * @param      int $pos position in xml schema
      * @return mixed Value of field at $pos
      */
     public function getByPosition($pos)
@@ -1029,12 +1040,12 @@ abstract class Accessory implements ActiveRecordInterface
      * You can specify the key type of the array by passing one of the class
      * type constants.
      *
-     * @param string  $keyType                (optional) One of the class type constants TableMap::TYPE_PHPNAME, TableMap::TYPE_STUDLYPHPNAME,
+     * @param     string  $keyType (optional) One of the class type constants TableMap::TYPE_PHPNAME, TableMap::TYPE_STUDLYPHPNAME,
-     *                                        TableMap::TYPE_COLNAME, TableMap::TYPE_FIELDNAME, TableMap::TYPE_NUM.
+     *                    TableMap::TYPE_COLNAME, TableMap::TYPE_FIELDNAME, TableMap::TYPE_NUM.
-     *                                        Defaults to TableMap::TYPE_PHPNAME.
+     *                    Defaults to TableMap::TYPE_PHPNAME.
-     * @param boolean $includeLazyLoadColumns (optional) Whether to include lazy loaded columns. Defaults to TRUE.
+     * @param     boolean $includeLazyLoadColumns (optional) Whether to include lazy loaded columns. Defaults to TRUE.
-     * @param array   $alreadyDumpedObjects   List of objects to skip to avoid recursion
+     * @param     array $alreadyDumpedObjects List of objects to skip to avoid recursion
-     * @param boolean $includeForeignObjects  (optional) Whether to include hydrated related objects. Default to FALSE.
+     * @param     boolean $includeForeignObjects (optional) Whether to include hydrated related objects. Default to FALSE.
      *
      * @return array an associative array containing the field names (as keys) and field values
      */
@@ -1073,12 +1084,12 @@ abstract class Accessory implements ActiveRecordInterface
     /**
      * Sets a field from the object by name passed in as a string.
      *
-     * @param  string $name
+     * @param      string $name
-     * @param  mixed  $value field value
+     * @param      mixed  $value field value
-     * @param  string $type  The type of fieldname the $name is of:
+     * @param      string $type The type of fieldname the $name is of:
-     *                       one of the class type constants TableMap::TYPE_PHPNAME, TableMap::TYPE_STUDLYPHPNAME
+     *                     one of the class type constants TableMap::TYPE_PHPNAME, TableMap::TYPE_STUDLYPHPNAME
-     *                       TableMap::TYPE_COLNAME, TableMap::TYPE_FIELDNAME, TableMap::TYPE_NUM.
+     *                     TableMap::TYPE_COLNAME, TableMap::TYPE_FIELDNAME, TableMap::TYPE_NUM.
-     *                       Defaults to TableMap::TYPE_PHPNAME.
+     *                     Defaults to TableMap::TYPE_PHPNAME.
      * @return void
      */
     public function setByName($name, $value, $type = TableMap::TYPE_PHPNAME)
@@ -1092,8 +1103,8 @@ abstract class Accessory implements ActiveRecordInterface
      * Sets a field from the object by Position as specified in the xml schema.
      * Zero-based.
      *
-     * @param  int   $pos   position in xml schema
+     * @param      int $pos position in xml schema
-     * @param  mixed $value field value
+     * @param      mixed $value field value
      * @return void
      */
     public function setByPosition($pos, $value)
@@ -1133,8 +1144,8 @@ abstract class Accessory implements ActiveRecordInterface
      * TableMap::TYPE_COLNAME, TableMap::TYPE_FIELDNAME, TableMap::TYPE_NUM.
      * The default key type is the column's TableMap::TYPE_PHPNAME.
      *
-     * @param  array  $arr     An array to populate the object from.
+     * @param      array  $arr     An array to populate the object from.
-     * @param  string $keyType The type of keys the array uses.
+     * @param      string $keyType The type of keys the array uses.
      * @return void
      */
     public function fromArray($arr, $keyType = TableMap::TYPE_PHPNAME)
@@ -1164,6 +1175,7 @@ abstract class Accessory implements ActiveRecordInterface
         if ($this->isColumnModified(AccessoryTableMap::POSITION)) $criteria->add(AccessoryTableMap::POSITION, $this->position);
         if ($this->isColumnModified(AccessoryTableMap::CREATED_AT)) $criteria->add(AccessoryTableMap::CREATED_AT, $this->created_at);
         if ($this->isColumnModified(AccessoryTableMap::UPDATED_AT)) $criteria->add(AccessoryTableMap::UPDATED_AT, $this->updated_at);
+
         return $criteria;
     }
 
@@ -1185,7 +1197,7 @@ abstract class Accessory implements ActiveRecordInterface
 
     /**
      * Returns the primary key for this object (row).
-     * @return int
+     * @return   int
      */
     public function getPrimaryKey()
     {
@@ -1195,7 +1207,7 @@ abstract class Accessory implements ActiveRecordInterface
     /**
      * Generic method to set the primary key (id column).
      *
-     * @param  int  $key Primary key.
+     * @param       int $key Primary key.
      * @return void
      */
     public function setPrimaryKey($key)
@@ -1209,6 +1221,7 @@ abstract class Accessory implements ActiveRecordInterface
      */
     public function isPrimaryKeyNull()
     {
+
         return null === $this->getId();
     }
 
@@ -1218,9 +1231,9 @@ abstract class Accessory implements ActiveRecordInterface
      * If desired, this method can also make copies of all associated (fkey referrers)
      * objects.
      *
-     * @param  object          $copyObj  An object of \Thelia\Model\Accessory (or compatible) type.
+     * @param      object $copyObj An object of \Thelia\Model\Accessory (or compatible) type.
-     * @param  boolean         $deepCopy Whether to also copy all rows that refer (by fkey) to the current row.
+     * @param      boolean $deepCopy Whether to also copy all rows that refer (by fkey) to the current row.
-     * @param  boolean         $makeNew  Whether to reset autoincrement PKs and make the object new.
+     * @param      boolean $makeNew Whether to reset autoincrement PKs and make the object new.
      * @throws PropelException
      */
     public function copyInto($copyObj, $deepCopy = false, $makeNew = true)
@@ -1244,8 +1257,8 @@ abstract class Accessory implements ActiveRecordInterface
      * If desired, this method can also make copies of all associated (fkey referrers)
      * objects.
      *
-     * @param  boolean                 $deepCopy Whether to also copy all rows that refer (by fkey) to the current row.
+     * @param      boolean $deepCopy Whether to also copy all rows that refer (by fkey) to the current row.
-     * @return \Thelia\Model\Accessory Clone of current object.
+     * @return                 \Thelia\Model\Accessory Clone of current object.
      * @throws PropelException
      */
     public function copy($deepCopy = false)
@@ -1261,8 +1274,8 @@ abstract class Accessory implements ActiveRecordInterface
     /**
      * Declares an association between this object and a ChildProduct object.
      *
-     * @param  ChildProduct            $v
+     * @param                  ChildProduct $v
-     * @return \Thelia\Model\Accessory The current object (for fluent API support)
+     * @return                 \Thelia\Model\Accessory The current object (for fluent API support)
      * @throws PropelException
      */
     public function setProductRelatedByProductId(ChildProduct $v = null)
@@ -1281,6 +1294,7 @@ abstract class Accessory implements ActiveRecordInterface
             $v->addAccessoryRelatedByProductId($this);
         }
 
+
         return $this;
     }
 
@@ -1288,8 +1302,8 @@ abstract class Accessory implements ActiveRecordInterface
     /**
      * Get the associated ChildProduct object
      *
-     * @param  ConnectionInterface $con Optional Connection object.
+     * @param      ConnectionInterface $con Optional Connection object.
-     * @return ChildProduct        The associated ChildProduct object.
+     * @return                 ChildProduct The associated ChildProduct object.
      * @throws PropelException
      */
     public function getProductRelatedByProductId(ConnectionInterface $con = null)
@@ -1311,8 +1325,8 @@ abstract class Accessory implements ActiveRecordInterface
     /**
      * Declares an association between this object and a ChildProduct object.
      *
-     * @param  ChildProduct            $v
+     * @param                  ChildProduct $v
-     * @return \Thelia\Model\Accessory The current object (for fluent API support)
+     * @return                 \Thelia\Model\Accessory The current object (for fluent API support)
      * @throws PropelException
      */
     public function setProductRelatedByAccessory(ChildProduct $v = null)
@@ -1331,6 +1345,7 @@ abstract class Accessory implements ActiveRecordInterface
             $v->addAccessoryRelatedByAccessory($this);
         }
 
+
         return $this;
     }
 
@@ -1338,8 +1353,8 @@ abstract class Accessory implements ActiveRecordInterface
     /**
      * Get the associated ChildProduct object
      *
-     * @param  ConnectionInterface $con Optional Connection object.
+     * @param      ConnectionInterface $con Optional Connection object.
-     * @return ChildProduct        The associated ChildProduct object.
+     * @return                 ChildProduct The associated ChildProduct object.
      * @throws PropelException
      */
     public function getProductRelatedByAccessory(ConnectionInterface $con = null)
@@ -1383,7 +1398,7 @@ abstract class Accessory implements ActiveRecordInterface
      * objects with circular references (even in PHP 5.3). This is currently necessary
      * when using Propel in certain daemon or large-volume/high-memory operations.
      *
-     * @param boolean $deep Whether to also clear the references on all referrer objects.
+     * @param      boolean $deep Whether to also clear the references on all referrer objects.
      */
     public function clearAllReferences($deep = false)
     {
@@ -1409,7 +1424,7 @@ abstract class Accessory implements ActiveRecordInterface
     /**
      * Mark the current object so that the update date doesn't get updated during next save
      *
-     * @return ChildAccessory The current object (for fluent API support)
+     * @return     ChildAccessory The current object (for fluent API support)
      */
     public function keepUpdateDateUnchanged()
     {

core/lib/Thelia/Model/Base/AccessoryQuery.php

@@ -71,9 +71,9 @@ abstract class AccessoryQuery extends ModelCriteria
     /**
      * Initializes internal state of \Thelia\Model\Base\AccessoryQuery object.
      *
-     * @param string $dbName     The database name
+     * @param     string $dbName The database name
-     * @param string $modelName  The phpName of a model, e.g. 'Book'
+     * @param     string $modelName The phpName of a model, e.g. 'Book'
-     * @param string $modelAlias The alias for the model in this query, e.g. 'b'
+     * @param     string $modelAlias The alias for the model in this query, e.g. 'b'
      */
     public function __construct($dbName = 'thelia', $modelName = '\\Thelia\\Model\\Accessory', $modelAlias = null)
     {
@@ -83,8 +83,8 @@ abstract class AccessoryQuery extends ModelCriteria
     /**
      * Returns a new ChildAccessoryQuery object.
      *
-     * @param string   $modelAlias The alias of a model in the query
+     * @param     string $modelAlias The alias of a model in the query
-     * @param Criteria $criteria   Optional Criteria to build the query from
+     * @param     Criteria $criteria Optional Criteria to build the query from
      *
      * @return ChildAccessoryQuery
      */
@@ -113,7 +113,7 @@ abstract class AccessoryQuery extends ModelCriteria
      * $obj  = $c->findPk(12, $con);
      * </code>
      *
-     * @param mixed               $key Primary key to use for the query
+     * @param mixed $key Primary key to use for the query
      * @param ConnectionInterface $con an optional connection object
      *
      * @return ChildAccessory|array|mixed the result, formatted by the current formatter
@@ -144,10 +144,10 @@ abstract class AccessoryQuery extends ModelCriteria
      * Find object by primary key using raw SQL to go fast.
      * Bypass doSelect() and the object formatter by using generated code.
      *
-     * @param mixed               $key Primary key to use for the query
+     * @param     mixed $key Primary key to use for the query
-     * @param ConnectionInterface $con A connection object
+     * @param     ConnectionInterface $con A connection object
      *
-     * @return ChildAccessory A model object, or null if the key is not found
+     * @return   ChildAccessory A model object, or null if the key is not found
      */
     protected function findPkSimple($key, $con)
     {
@@ -174,8 +174,8 @@ abstract class AccessoryQuery extends ModelCriteria
     /**
      * Find object by primary key.
      *
-     * @param mixed               $key Primary key to use for the query
+     * @param     mixed $key Primary key to use for the query
-     * @param ConnectionInterface $con A connection object
+     * @param     ConnectionInterface $con A connection object
      *
      * @return ChildAccessory|array|mixed the result, formatted by the current formatter
      */
@@ -195,8 +195,8 @@ abstract class AccessoryQuery extends ModelCriteria
      * <code>
      * $objs = $c->findPks(array(12, 56, 832), $con);
      * </code>
-     * @param array               $keys Primary keys to use for the query
+     * @param     array $keys Primary keys to use for the query
-     * @param ConnectionInterface $con  an optional connection object
+     * @param     ConnectionInterface $con an optional connection object
      *
      * @return ObjectCollection|array|mixed the list of results, formatted by the current formatter
      */
@@ -217,24 +217,26 @@ abstract class AccessoryQuery extends ModelCriteria
     /**
      * Filter the query by primary key
      *
-     * @param mixed $key Primary key to use for the query
+     * @param     mixed $key Primary key to use for the query
      *
      * @return ChildAccessoryQuery The current query, for fluid interface
      */
     public function filterByPrimaryKey($key)
     {
+
         return $this->addUsingAlias(AccessoryTableMap::ID, $key, Criteria::EQUAL);
     }
 
     /**
      * Filter the query by a list of primary keys
      *
-     * @param array $keys The list of primary key to use for the query
+     * @param     array $keys The list of primary key to use for the query
      *
      * @return ChildAccessoryQuery The current query, for fluid interface
      */
     public function filterByPrimaryKeys($keys)
     {
+
         return $this->addUsingAlias(AccessoryTableMap::ID, $keys, Criteria::IN);
     }
 
@@ -248,11 +250,11 @@ abstract class AccessoryQuery extends ModelCriteria
      * $query->filterById(array('min' => 12)); // WHERE id > 12
      * </code>
      *
-     * @param mixed  $id         The value to use as filter.
+     * @param     mixed $id The value to use as filter.
-     *                           Use scalar values for equality.
+     *              Use scalar values for equality.
-     *                           Use array values for in_array() equivalent.
+     *              Use array values for in_array() equivalent.
-     *                           Use associative array('min' => $minValue, 'max' => $maxValue) for intervals.
+     *              Use associative array('min' => $minValue, 'max' => $maxValue) for intervals.
-     * @param string $comparison Operator to use for the column comparison, defaults to Criteria::EQUAL
+     * @param     string $comparison Operator to use for the column comparison, defaults to Criteria::EQUAL
      *
      * @return ChildAccessoryQuery The current query, for fluid interface
      */
@@ -291,11 +293,11 @@ abstract class AccessoryQuery extends ModelCriteria
      *
      * @see       filterByProductRelatedByProductId()
      *
-     * @param mixed  $productId  The value to use as filter.
+     * @param     mixed $productId The value to use as filter.
-     *                           Use scalar values for equality.
+     *              Use scalar values for equality.
-     *                           Use array values for in_array() equivalent.
+     *              Use array values for in_array() equivalent.
-     *                           Use associative array('min' => $minValue, 'max' => $maxValue) for intervals.
+     *              Use associative array('min' => $minValue, 'max' => $maxValue) for intervals.
-     * @param string $comparison Operator to use for the column comparison, defaults to Criteria::EQUAL
+     * @param     string $comparison Operator to use for the column comparison, defaults to Criteria::EQUAL
      *
      * @return ChildAccessoryQuery The current query, for fluid interface
      */
@@ -334,11 +336,11 @@ abstract class AccessoryQuery extends ModelCriteria
      *
      * @see       filterByProductRelatedByAccessory()
      *
-     * @param mixed  $accessory  The value to use as filter.
+     * @param     mixed $accessory The value to use as filter.
-     *                           Use scalar values for equality.
+     *              Use scalar values for equality.
-     *                           Use array values for in_array() equivalent.
+     *              Use array values for in_array() equivalent.
-     *                           Use associative array('min' => $minValue, 'max' => $maxValue) for intervals.
+     *              Use associative array('min' => $minValue, 'max' => $maxValue) for intervals.
-     * @param string $comparison Operator to use for the column comparison, defaults to Criteria::EQUAL
+     * @param     string $comparison Operator to use for the column comparison, defaults to Criteria::EQUAL
      *
      * @return ChildAccessoryQuery The current query, for fluid interface
      */
@@ -375,11 +377,11 @@ abstract class AccessoryQuery extends ModelCriteria
      * $query->filterByPosition(array('min' => 12)); // WHERE position > 12
      * </code>
      *
-     * @param mixed  $position   The value to use as filter.
+     * @param     mixed $position The value to use as filter.
-     *                           Use scalar values for equality.
+     *              Use scalar values for equality.
-     *                           Use array values for in_array() equivalent.
+     *              Use array values for in_array() equivalent.
-     *                           Use associative array('min' => $minValue, 'max' => $maxValue) for intervals.
+     *              Use associative array('min' => $minValue, 'max' => $maxValue) for intervals.
-     * @param string $comparison Operator to use for the column comparison, defaults to Criteria::EQUAL
+     * @param     string $comparison Operator to use for the column comparison, defaults to Criteria::EQUAL
      *
      * @return ChildAccessoryQuery The current query, for fluid interface
      */
@@ -416,13 +418,13 @@ abstract class AccessoryQuery extends ModelCriteria
      * $query->filterByCreatedAt(array('max' => 'yesterday')); // WHERE created_at > '2011-03-13'
      * </code>
      *
-     * @param mixed  $createdAt  The value to use as filter.
+     * @param     mixed $createdAt The value to use as filter.
-     *                           Values can be integers (unix timestamps), DateTime objects, or strings.
+     *              Values can be integers (unix timestamps), DateTime objects, or strings.
-     *                           Empty strings are treated as NULL.
+     *              Empty strings are treated as NULL.
-     *                           Use scalar values for equality.
+     *              Use scalar values for equality.
-     *                           Use array values for in_array() equivalent.
+     *              Use array values for in_array() equivalent.
-     *                           Use associative array('min' => $minValue, 'max' => $maxValue) for intervals.
+     *              Use associative array('min' => $minValue, 'max' => $maxValue) for intervals.
-     * @param string $comparison Operator to use for the column comparison, defaults to Criteria::EQUAL
+     * @param     string $comparison Operator to use for the column comparison, defaults to Criteria::EQUAL
      *
      * @return ChildAccessoryQuery The current query, for fluid interface
      */
@@ -459,13 +461,13 @@ abstract class AccessoryQuery extends ModelCriteria
      * $query->filterByUpdatedAt(array('max' => 'yesterday')); // WHERE updated_at > '2011-03-13'
      * </code>
      *
-     * @param mixed  $updatedAt  The value to use as filter.
+     * @param     mixed $updatedAt The value to use as filter.
-     *                           Values can be integers (unix timestamps), DateTime objects, or strings.
+     *              Values can be integers (unix timestamps), DateTime objects, or strings.
-     *                           Empty strings are treated as NULL.
+     *              Empty strings are treated as NULL.
-     *                           Use scalar values for equality.
+     *              Use scalar values for equality.
-     *                           Use array values for in_array() equivalent.
+     *              Use array values for in_array() equivalent.
-     *                           Use associative array('min' => $minValue, 'max' => $maxValue) for intervals.
+     *              Use associative array('min' => $minValue, 'max' => $maxValue) for intervals.
-     * @param string $comparison Operator to use for the column comparison, defaults to Criteria::EQUAL
+     * @param     string $comparison Operator to use for the column comparison, defaults to Criteria::EQUAL
      *
      * @return ChildAccessoryQuery The current query, for fluid interface
      */
@@ -495,8 +497,8 @@ abstract class AccessoryQuery extends ModelCriteria
     /**
      * Filter the query by a related \Thelia\Model\Product object
      *
-     * @param \Thelia\Model\Product|ObjectCollection $product    The related object(s) to use as filter
+     * @param \Thelia\Model\Product|ObjectCollection $product The related object(s) to use as filter
-     * @param string                                 $comparison Operator to use for the column comparison, defaults to Criteria::EQUAL
+     * @param string $comparison Operator to use for the column comparison, defaults to Criteria::EQUAL
      *
      * @return ChildAccessoryQuery The current query, for fluid interface
      */
@@ -520,8 +522,8 @@ abstract class AccessoryQuery extends ModelCriteria
     /**
      * Adds a JOIN clause to the query using the ProductRelatedByProductId relation
      *
-     * @param string $relationAlias optional alias for the relation
+     * @param     string $relationAlias optional alias for the relation
-     * @param string $joinType      Accepted values are null, 'left join', 'right join', 'inner join'
+     * @param     string $joinType Accepted values are null, 'left join', 'right join', 'inner join'
      *
      * @return ChildAccessoryQuery The current query, for fluid interface
      */
@@ -554,11 +556,11 @@ abstract class AccessoryQuery extends ModelCriteria
      *
      * @see useQuery()
      *
-     * @param string $relationAlias optional alias for the relation,
+     * @param     string $relationAlias optional alias for the relation,
-     *                              to be used as main alias in the secondary query
+     *                                   to be used as main alias in the secondary query
-     * @param string $joinType      Accepted values are null, 'left join', 'right join', 'inner join'
+     * @param     string $joinType Accepted values are null, 'left join', 'right join', 'inner join'
      *
-     * @return \Thelia\Model\ProductQuery A secondary query class using the current class as primary query
+     * @return   \Thelia\Model\ProductQuery A secondary query class using the current class as primary query
      */
     public function useProductRelatedByProductIdQuery($relationAlias = null, $joinType = Criteria::INNER_JOIN)
     {
@@ -570,8 +572,8 @@ abstract class AccessoryQuery extends ModelCriteria
     /**
      * Filter the query by a related \Thelia\Model\Product object
      *
-     * @param \Thelia\Model\Product|ObjectCollection $product    The related object(s) to use as filter
+     * @param \Thelia\Model\Product|ObjectCollection $product The related object(s) to use as filter
-     * @param string                                 $comparison Operator to use for the column comparison, defaults to Criteria::EQUAL
+     * @param string $comparison Operator to use for the column comparison, defaults to Criteria::EQUAL
      *
      * @return ChildAccessoryQuery The current query, for fluid interface
      */
@@ -595,8 +597,8 @@ abstract class AccessoryQuery extends ModelCriteria
     /**
      * Adds a JOIN clause to the query using the ProductRelatedByAccessory relation
      *
-     * @param string $relationAlias optional alias for the relation
+     * @param     string $relationAlias optional alias for the relation
-     * @param string $joinType      Accepted values are null, 'left join', 'right join', 'inner join'
+     * @param     string $joinType Accepted values are null, 'left join', 'right join', 'inner join'
      *
      * @return ChildAccessoryQuery The current query, for fluid interface
      */
@@ -629,11 +631,11 @@ abstract class AccessoryQuery extends ModelCriteria
      *
      * @see useQuery()
      *
-     * @param string $relationAlias optional alias for the relation,
+     * @param     string $relationAlias optional alias for the relation,
-     *                              to be used as main alias in the secondary query
+     *                                   to be used as main alias in the secondary query
-     * @param string $joinType      Accepted values are null, 'left join', 'right join', 'inner join'
+     * @param     string $joinType Accepted values are null, 'left join', 'right join', 'inner join'
      *
-     * @return \Thelia\Model\ProductQuery A secondary query class using the current class as primary query
+     * @return   \Thelia\Model\ProductQuery A secondary query class using the current class as primary query
      */
     public function useProductRelatedByAccessoryQuery($relationAlias = null, $joinType = Criteria::INNER_JOIN)
     {
@@ -645,7 +647,7 @@ abstract class AccessoryQuery extends ModelCriteria
     /**
      * Exclude object from result
      *
-     * @param ChildAccessory $accessory Object to remove from the list of results
+     * @param   ChildAccessory $accessory Object to remove from the list of results
      *
      * @return ChildAccessoryQuery The current query, for fluid interface
      */
@@ -661,8 +663,8 @@ abstract class AccessoryQuery extends ModelCriteria
     /**
      * Deletes all rows from the accessory table.
      *
-     * @param  ConnectionInterface $con the connection to use
+     * @param ConnectionInterface $con the connection to use
-     * @return int                 The number of affected rows (if supported by underlying database driver).
+     * @return int The number of affected rows (if supported by underlying database driver).
      */
     public function doDeleteAll(ConnectionInterface $con = null)
     {
@@ -693,13 +695,13 @@ abstract class AccessoryQuery extends ModelCriteria
     /**
      * Performs a DELETE on the database, given a ChildAccessory or Criteria object OR a primary key value.
      *
-     * @param  mixed               $values Criteria or ChildAccessory object or primary key or array of primary keys
+     * @param mixed               $values Criteria or ChildAccessory object or primary key or array of primary keys
-     *                                     which is used to create the DELETE statement
+     *              which is used to create the DELETE statement
-     * @param  ConnectionInterface $con    the connection to use
+     * @param ConnectionInterface $con the connection to use
-     * @return int                 The number of affected rows (if supported by underlying database driver).  This includes CASCADE-related rows
+     * @return int The number of affected rows (if supported by underlying database driver).  This includes CASCADE-related rows
-     *                                    if supported by native driver or if emulated using Propel.
+     *                if supported by native driver or if emulated using Propel.
-     * @throws PropelException     Any exceptions caught during processing will be
+     * @throws PropelException Any exceptions caught during processing will be
-     *                                    rethrown wrapped into a PropelException.
+     *         rethrown wrapped into a PropelException.
      */
      public function delete(ConnectionInterface $con = null)
      {
@@ -719,6 +721,7 @@ abstract class AccessoryQuery extends ModelCriteria
             // for more than one table or we could emulating ON DELETE CASCADE, etc.
             $con->beginTransaction();
 
+
         AccessoryTableMap::removeInstanceFromPool($criteria);
 
             $affectedRows += ModelCriteria::delete($con);
@@ -737,9 +740,9 @@ abstract class AccessoryQuery extends ModelCriteria
     /**
      * Filter by the latest updated
      *
-     * @param int $nbDays Maximum age of the latest update in days
+     * @param      int $nbDays Maximum age of the latest update in days
      *
-     * @return ChildAccessoryQuery The current query, for fluid interface
+     * @return     ChildAccessoryQuery The current query, for fluid interface
      */
     public function recentlyUpdated($nbDays = 7)
     {
@@ -749,9 +752,9 @@ abstract class AccessoryQuery extends ModelCriteria
     /**
      * Filter by the latest created
      *
-     * @param int $nbDays Maximum age of in days
+     * @param      int $nbDays Maximum age of in days
      *
-     * @return ChildAccessoryQuery The current query, for fluid interface
+     * @return     ChildAccessoryQuery The current query, for fluid interface
      */
     public function recentlyCreated($nbDays = 7)
     {
@@ -761,7 +764,7 @@ abstract class AccessoryQuery extends ModelCriteria
     /**
      * Order by update date desc
      *
-     * @return ChildAccessoryQuery The current query, for fluid interface
+     * @return     ChildAccessoryQuery The current query, for fluid interface
      */
     public function lastUpdatedFirst()
     {
@@ -771,7 +774,7 @@ abstract class AccessoryQuery extends ModelCriteria
     /**
      * Order by update date asc
      *
-     * @return ChildAccessoryQuery The current query, for fluid interface
+     * @return     ChildAccessoryQuery The current query, for fluid interface
      */
     public function firstUpdatedFirst()
     {
@@ -781,7 +784,7 @@ abstract class AccessoryQuery extends ModelCriteria
     /**
      * Order by create date desc
      *
-     * @return ChildAccessoryQuery The current query, for fluid interface
+     * @return     ChildAccessoryQuery The current query, for fluid interface
      */
     public function lastCreatedFirst()
     {
@@ -791,7 +794,7 @@ abstract class AccessoryQuery extends ModelCriteria
     /**
      * Order by create date asc
      *
-     * @return ChildAccessoryQuery The current query, for fluid interface
+     * @return     ChildAccessoryQuery The current query, for fluid interface
      */
     public function firstCreatedFirst()
     {

core/lib/Thelia/Model/Base/AddressQuery.php

@@ -131,9 +131,9 @@ abstract class AddressQuery extends ModelCriteria
     /**
      * Initializes internal state of \Thelia\Model\Base\AddressQuery object.
      *
-     * @param string $dbName     The database name
+     * @param     string $dbName The database name
-     * @param string $modelName  The phpName of a model, e.g. 'Book'
+     * @param     string $modelName The phpName of a model, e.g. 'Book'
-     * @param string $modelAlias The alias for the model in this query, e.g. 'b'
+     * @param     string $modelAlias The alias for the model in this query, e.g. 'b'
      */
     public function __construct($dbName = 'thelia', $modelName = '\\Thelia\\Model\\Address', $modelAlias = null)
     {
@@ -143,8 +143,8 @@ abstract class AddressQuery extends ModelCriteria
     /**
      * Returns a new ChildAddressQuery object.
      *
-     * @param string   $modelAlias The alias of a model in the query
+     * @param     string $modelAlias The alias of a model in the query
-     * @param Criteria $criteria   Optional Criteria to build the query from
+     * @param     Criteria $criteria Optional Criteria to build the query from
      *
      * @return ChildAddressQuery
      */
@@ -173,7 +173,7 @@ abstract class AddressQuery extends ModelCriteria
      * $obj  = $c->findPk(12, $con);
      * </code>
      *
-     * @param mixed               $key Primary key to use for the query
+     * @param mixed $key Primary key to use for the query
      * @param ConnectionInterface $con an optional connection object
      *
      * @return ChildAddress|array|mixed the result, formatted by the current formatter
@@ -204,10 +204,10 @@ abstract class AddressQuery extends ModelCriteria
      * Find object by primary key using raw SQL to go fast.
      * Bypass doSelect() and the object formatter by using generated code.
      *
-     * @param mixed               $key Primary key to use for the query
+     * @param     mixed $key Primary key to use for the query
-     * @param ConnectionInterface $con A connection object
+     * @param     ConnectionInterface $con A connection object
      *
-     * @return ChildAddress A model object, or null if the key is not found
+     * @return   ChildAddress A model object, or null if the key is not found
      */
     protected function findPkSimple($key, $con)
     {
@@ -234,8 +234,8 @@ abstract class AddressQuery extends ModelCriteria
     /**
      * Find object by primary key.
      *
-     * @param mixed               $key Primary key to use for the query
+     * @param     mixed $key Primary key to use for the query
-     * @param ConnectionInterface $con A connection object
+     * @param     ConnectionInterface $con A connection object
      *
      * @return ChildAddress|array|mixed the result, formatted by the current formatter
      */
@@ -255,8 +255,8 @@ abstract class AddressQuery extends ModelCriteria
      * <code>
      * $objs = $c->findPks(array(12, 56, 832), $con);
      * </code>
-     * @param array               $keys Primary keys to use for the query
+     * @param     array $keys Primary keys to use for the query
-     * @param ConnectionInterface $con  an optional connection object
+     * @param     ConnectionInterface $con an optional connection object
      *
      * @return ObjectCollection|array|mixed the list of results, formatted by the current formatter
      */
@@ -277,24 +277,26 @@ abstract class AddressQuery extends ModelCriteria
     /**
      * Filter the query by primary key
      *
-     * @param mixed $key Primary key to use for the query
+     * @param     mixed $key Primary key to use for the query
      *
      * @return ChildAddressQuery The current query, for fluid interface
      */
     public function filterByPrimaryKey($key)
     {
+
         return $this->addUsingAlias(AddressTableMap::ID, $key, Criteria::EQUAL);
     }
 
     /**
      * Filter the query by a list of primary keys
      *
-     * @param array $keys The list of primary key to use for the query
+     * @param     array $keys The list of primary key to use for the query
      *
      * @return ChildAddressQuery The current query, for fluid interface
      */
     public function filterByPrimaryKeys($keys)
     {
+
         return $this->addUsingAlias(AddressTableMap::ID, $keys, Criteria::IN);
     }
 
@@ -308,11 +310,11 @@ abstract class AddressQuery extends ModelCriteria
      * $query->filterById(array('min' => 12)); // WHERE id > 12
      * </code>
      *
-     * @param mixed  $id         The value to use as filter.
+     * @param     mixed $id The value to use as filter.
-     *                           Use scalar values for equality.
+     *              Use scalar values for equality.
-     *                           Use array values for in_array() equivalent.
+     *              Use array values for in_array() equivalent.
-     *                           Use associative array('min' => $minValue, 'max' => $maxValue) for intervals.
+     *              Use associative array('min' => $minValue, 'max' => $maxValue) for intervals.
-     * @param string $comparison Operator to use for the column comparison, defaults to Criteria::EQUAL
+     * @param     string $comparison Operator to use for the column comparison, defaults to Criteria::EQUAL
      *
      * @return ChildAddressQuery The current query, for fluid interface
      */
@@ -348,9 +350,9 @@ abstract class AddressQuery extends ModelCriteria
      * $query->filterByLabel('%fooValue%'); // WHERE label LIKE '%fooValue%'
      * </code>
      *
-     * @param string $label      The value to use as filter.
+     * @param     string $label The value to use as filter.
-     *                           Accepts wildcards (* and % trigger a LIKE)
+     *              Accepts wildcards (* and % trigger a LIKE)
-     * @param string $comparison Operator to use for the column comparison, defaults to Criteria::EQUAL
+     * @param     string $comparison Operator to use for the column comparison, defaults to Criteria::EQUAL
      *
      * @return ChildAddressQuery The current query, for fluid interface
      */
@@ -380,11 +382,11 @@ abstract class AddressQuery extends ModelCriteria
      *
      * @see       filterByCustomer()
      *
-     * @param mixed  $customerId The value to use as filter.
+     * @param     mixed $customerId The value to use as filter.
-     *                           Use scalar values for equality.
+     *              Use scalar values for equality.
-     *                           Use array values for in_array() equivalent.
+     *              Use array values for in_array() equivalent.
-     *                           Use associative array('min' => $minValue, 'max' => $maxValue) for intervals.
+     *              Use associative array('min' => $minValue, 'max' => $maxValue) for intervals.
-     * @param string $comparison Operator to use for the column comparison, defaults to Criteria::EQUAL
+     * @param     string $comparison Operator to use for the column comparison, defaults to Criteria::EQUAL
      *
      * @return ChildAddressQuery The current query, for fluid interface
      */
@@ -423,11 +425,11 @@ abstract class AddressQuery extends ModelCriteria
      *
      * @see       filterByCustomerTitle()
      *
-     * @param mixed  $titleId    The value to use as filter.
+     * @param     mixed $titleId The value to use as filter.
-     *                           Use scalar values for equality.
+     *              Use scalar values for equality.
-     *                           Use array values for in_array() equivalent.
+     *              Use array values for in_array() equivalent.
-     *                           Use associative array('min' => $minValue, 'max' => $maxValue) for intervals.
+     *              Use associative array('min' => $minValue, 'max' => $maxValue) for intervals.
-     * @param string $comparison Operator to use for the column comparison, defaults to Criteria::EQUAL
+     * @param     string $comparison Operator to use for the column comparison, defaults to Criteria::EQUAL
      *
      * @return ChildAddressQuery The current query, for fluid interface
      */
@@ -463,9 +465,9 @@ abstract class AddressQuery extends ModelCriteria
      * $query->filterByCompany('%fooValue%'); // WHERE company LIKE '%fooValue%'
      * </code>
      *
-     * @param string $company    The value to use as filter.
+     * @param     string $company The value to use as filter.
-     *                           Accepts wildcards (* and % trigger a LIKE)
+     *              Accepts wildcards (* and % trigger a LIKE)
-     * @param string $comparison Operator to use for the column comparison, defaults to Criteria::EQUAL
+     * @param     string $comparison Operator to use for the column comparison, defaults to Criteria::EQUAL
      *
      * @return ChildAddressQuery The current query, for fluid interface
      */
@@ -492,9 +494,9 @@ abstract class AddressQuery extends ModelCriteria
      * $query->filterByFirstname('%fooValue%'); // WHERE firstname LIKE '%fooValue%'
      * </code>
      *
-     * @param string $firstname  The value to use as filter.
+     * @param     string $firstname The value to use as filter.
-     *                           Accepts wildcards (* and % trigger a LIKE)
+     *              Accepts wildcards (* and % trigger a LIKE)
-     * @param string $comparison Operator to use for the column comparison, defaults to Criteria::EQUAL
+     * @param     string $comparison Operator to use for the column comparison, defaults to Criteria::EQUAL
      *
      * @return ChildAddressQuery The current query, for fluid interface
      */
@@ -521,9 +523,9 @@ abstract class AddressQuery extends ModelCriteria
      * $query->filterByLastname('%fooValue%'); // WHERE lastname LIKE '%fooValue%'
      * </code>
      *
-     * @param string $lastname   The value to use as filter.
+     * @param     string $lastname The value to use as filter.
-     *                           Accepts wildcards (* and % trigger a LIKE)
+     *              Accepts wildcards (* and % trigger a LIKE)
-     * @param string $comparison Operator to use for the column comparison, defaults to Criteria::EQUAL
+     * @param     string $comparison Operator to use for the column comparison, defaults to Criteria::EQUAL
      *
      * @return ChildAddressQuery The current query, for fluid interface
      */
@@ -550,9 +552,9 @@ abstract class AddressQuery extends ModelCriteria
      * $query->filterByAddress1('%fooValue%'); // WHERE address1 LIKE '%fooValue%'
      * </code>
      *
-     * @param string $address1   The value to use as filter.
+     * @param     string $address1 The value to use as filter.
-     *                           Accepts wildcards (* and % trigger a LIKE)
+     *              Accepts wildcards (* and % trigger a LIKE)
-     * @param string $comparison Operator to use for the column comparison, defaults to Criteria::EQUAL
+     * @param     string $comparison Operator to use for the column comparison, defaults to Criteria::EQUAL
      *
      * @return ChildAddressQuery The current query, for fluid interface
      */
@@ -579,9 +581,9 @@ abstract class AddressQuery extends ModelCriteria
      * $query->filterByAddress2('%fooValue%'); // WHERE address2 LIKE '%fooValue%'
      * </code>
      *
-     * @param string $address2   The value to use as filter.
+     * @param     string $address2 The value to use as filter.
-     *                           Accepts wildcards (* and % trigger a LIKE)
+     *              Accepts wildcards (* and % trigger a LIKE)
-     * @param string $comparison Operator to use for the column comparison, defaults to Criteria::EQUAL
+     * @param     string $comparison Operator to use for the column comparison, defaults to Criteria::EQUAL
      *
      * @return ChildAddressQuery The current query, for fluid interface
      */
@@ -608,9 +610,9 @@ abstract class AddressQuery extends ModelCriteria
      * $query->filterByAddress3('%fooValue%'); // WHERE address3 LIKE '%fooValue%'
      * </code>
      *
-     * @param string $address3   The value to use as filter.
+     * @param     string $address3 The value to use as filter.
-     *                           Accepts wildcards (* and % trigger a LIKE)
+     *              Accepts wildcards (* and % trigger a LIKE)
-     * @param string $comparison Operator to use for the column comparison, defaults to Criteria::EQUAL
+     * @param     string $comparison Operator to use for the column comparison, defaults to Criteria::EQUAL
      *
      * @return ChildAddressQuery The current query, for fluid interface
      */
@@ -637,9 +639,9 @@ abstract class AddressQuery extends ModelCriteria
      * $query->filterByZipcode('%fooValue%'); // WHERE zipcode LIKE '%fooValue%'
      * </code>
      *
-     * @param string $zipcode    The value to use as filter.
+     * @param     string $zipcode The value to use as filter.
-     *                           Accepts wildcards (* and % trigger a LIKE)
+     *              Accepts wildcards (* and % trigger a LIKE)
-     * @param string $comparison Operator to use for the column comparison, defaults to Criteria::EQUAL
+     * @param     string $comparison Operator to use for the column comparison, defaults to Criteria::EQUAL
      *
      * @return ChildAddressQuery The current query, for fluid interface
      */
@@ -666,9 +668,9 @@ abstract class AddressQuery extends ModelCriteria
      * $query->filterByCity('%fooValue%'); // WHERE city LIKE '%fooValue%'
      * </code>
      *
-     * @param string $city       The value to use as filter.
+     * @param     string $city The value to use as filter.
-     *                           Accepts wildcards (* and % trigger a LIKE)
+     *              Accepts wildcards (* and % trigger a LIKE)
-     * @param string $comparison Operator to use for the column comparison, defaults to Criteria::EQUAL
+     * @param     string $comparison Operator to use for the column comparison, defaults to Criteria::EQUAL
      *
      * @return ChildAddressQuery The current query, for fluid interface
      */
@@ -698,11 +700,11 @@ abstract class AddressQuery extends ModelCriteria
      *
      * @see       filterByCountry()
      *
-     * @param mixed  $countryId  The value to use as filter.
+     * @param     mixed $countryId The value to use as filter.
-     *                           Use scalar values for equality.
+     *              Use scalar values for equality.
-     *                           Use array values for in_array() equivalent.
+     *              Use array values for in_array() equivalent.
-     *                           Use associative array('min' => $minValue, 'max' => $maxValue) for intervals.
+     *              Use associative array('min' => $minValue, 'max' => $maxValue) for intervals.
-     * @param string $comparison Operator to use for the column comparison, defaults to Criteria::EQUAL
+     * @param     string $comparison Operator to use for the column comparison, defaults to Criteria::EQUAL
      *
      * @return ChildAddressQuery The current query, for fluid interface
      */
@@ -738,9 +740,9 @@ abstract class AddressQuery extends ModelCriteria
      * $query->filterByPhone('%fooValue%'); // WHERE phone LIKE '%fooValue%'
      * </code>
      *
-     * @param string $phone      The value to use as filter.
+     * @param     string $phone The value to use as filter.
-     *                           Accepts wildcards (* and % trigger a LIKE)
+     *              Accepts wildcards (* and % trigger a LIKE)
-     * @param string $comparison Operator to use for the column comparison, defaults to Criteria::EQUAL
+     * @param     string $comparison Operator to use for the column comparison, defaults to Criteria::EQUAL
      *
      * @return ChildAddressQuery The current query, for fluid interface
      */
@@ -767,9 +769,9 @@ abstract class AddressQuery extends ModelCriteria
      * $query->filterByCellphone('%fooValue%'); // WHERE cellphone LIKE '%fooValue%'
      * </code>
      *
-     * @param string $cellphone  The value to use as filter.
+     * @param     string $cellphone The value to use as filter.
-     *                           Accepts wildcards (* and % trigger a LIKE)
+     *              Accepts wildcards (* and % trigger a LIKE)
-     * @param string $comparison Operator to use for the column comparison, defaults to Criteria::EQUAL
+     * @param     string $comparison Operator to use for the column comparison, defaults to Criteria::EQUAL
      *
      * @return ChildAddressQuery The current query, for fluid interface
      */
@@ -797,11 +799,11 @@ abstract class AddressQuery extends ModelCriteria
      * $query->filterByIsDefault(array('min' => 12)); // WHERE is_default > 12
      * </code>
      *
-     * @param mixed  $isDefault  The value to use as filter.
+     * @param     mixed $isDefault The value to use as filter.
-     *                           Use scalar values for equality.
+     *              Use scalar values for equality.
-     *                           Use array values for in_array() equivalent.
+     *              Use array values for in_array() equivalent.
-     *                           Use associative array('min' => $minValue, 'max' => $maxValue) for intervals.
+     *              Use associative array('min' => $minValue, 'max' => $maxValue) for intervals.
-     * @param string $comparison Operator to use for the column comparison, defaults to Criteria::EQUAL
+     * @param     string $comparison Operator to use for the column comparison, defaults to Criteria::EQUAL
      *
      * @return ChildAddressQuery The current query, for fluid interface
      */
@@ -838,13 +840,13 @@ abstract class AddressQuery extends ModelCriteria
      * $query->filterByCreatedAt(array('max' => 'yesterday')); // WHERE created_at > '2011-03-13'
      * </code>
      *
-     * @param mixed  $createdAt  The value to use as filter.
+     * @param     mixed $createdAt The value to use as filter.
-     *                           Values can be integers (unix timestamps), DateTime objects, or strings.
+     *              Values can be integers (unix timestamps), DateTime objects, or strings.
-     *                           Empty strings are treated as NULL.
+     *              Empty strings are treated as NULL.
-     *                           Use scalar values for equality.
+     *              Use scalar values for equality.
-     *                           Use array values for in_array() equivalent.
+     *              Use array values for in_array() equivalent.
-     *                           Use associative array('min' => $minValue, 'max' => $maxValue) for intervals.
+     *              Use associative array('min' => $minValue, 'max' => $maxValue) for intervals.
-     * @param string $comparison Operator to use for the column comparison, defaults to Criteria::EQUAL
+     * @param     string $comparison Operator to use for the column comparison, defaults to Criteria::EQUAL
      *
      * @return ChildAddressQuery The current query, for fluid interface
      */
@@ -881,13 +883,13 @@ abstract class AddressQuery extends ModelCriteria
      * $query->filterByUpdatedAt(array('max' => 'yesterday')); // WHERE updated_at > '2011-03-13'
      * </code>
      *
-     * @param mixed  $updatedAt  The value to use as filter.
+     * @param     mixed $updatedAt The value to use as filter.
-     *                           Values can be integers (unix timestamps), DateTime objects, or strings.
+     *              Values can be integers (unix timestamps), DateTime objects, or strings.
-     *                           Empty strings are treated as NULL.
+     *              Empty strings are treated as NULL.
-     *                           Use scalar values for equality.
+     *              Use scalar values for equality.
-     *                           Use array values for in_array() equivalent.
+     *              Use array values for in_array() equivalent.
-     *                           Use associative array('min' => $minValue, 'max' => $maxValue) for intervals.
+     *              Use associative array('min' => $minValue, 'max' => $maxValue) for intervals.
-     * @param string $comparison Operator to use for the column comparison, defaults to Criteria::EQUAL
+     * @param     string $comparison Operator to use for the column comparison, defaults to Criteria::EQUAL
      *
      * @return ChildAddressQuery The current query, for fluid interface
      */
@@ -917,8 +919,8 @@ abstract class AddressQuery extends ModelCriteria
     /**
      * Filter the query by a related \Thelia\Model\Customer object
      *
-     * @param \Thelia\Model\Customer|ObjectCollection $customer   The related object(s) to use as filter
+     * @param \Thelia\Model\Customer|ObjectCollection $customer The related object(s) to use as filter
-     * @param string                                  $comparison Operator to use for the column comparison, defaults to Criteria::EQUAL
+     * @param string $comparison Operator to use for the column comparison, defaults to Criteria::EQUAL
      *
      * @return ChildAddressQuery The current query, for fluid interface
      */
@@ -942,8 +944,8 @@ abstract class AddressQuery extends ModelCriteria
     /**
      * Adds a JOIN clause to the query using the Customer relation
      *
-     * @param string $relationAlias optional alias for the relation
+     * @param     string $relationAlias optional alias for the relation
-     * @param string $joinType      Accepted values are null, 'left join', 'right join', 'inner join'
+     * @param     string $joinType Accepted values are null, 'left join', 'right join', 'inner join'
      *
      * @return ChildAddressQuery The current query, for fluid interface
      */
@@ -976,11 +978,11 @@ abstract class AddressQuery extends ModelCriteria
      *
      * @see useQuery()
      *
-     * @param string $relationAlias optional alias for the relation,
+     * @param     string $relationAlias optional alias for the relation,
-     *                              to be used as main alias in the secondary query
+     *                                   to be used as main alias in the secondary query
-     * @param string $joinType      Accepted values are null, 'left join', 'right join', 'inner join'
+     * @param     string $joinType Accepted values are null, 'left join', 'right join', 'inner join'
      *
-     * @return \Thelia\Model\CustomerQuery A secondary query class using the current class as primary query
+     * @return   \Thelia\Model\CustomerQuery A secondary query class using the current class as primary query
      */
     public function useCustomerQuery($relationAlias = null, $joinType = Criteria::INNER_JOIN)
     {
@@ -993,7 +995,7 @@ abstract class AddressQuery extends ModelCriteria
      * Filter the query by a related \Thelia\Model\CustomerTitle object
      *
      * @param \Thelia\Model\CustomerTitle|ObjectCollection $customerTitle The related object(s) to use as filter
-     * @param string                                       $comparison    Operator to use for the column comparison, defaults to Criteria::EQUAL
+     * @param string $comparison Operator to use for the column comparison, defaults to Criteria::EQUAL
      *
      * @return ChildAddressQuery The current query, for fluid interface
      */
@@ -1017,8 +1019,8 @@ abstract class AddressQuery extends ModelCriteria
     /**
      * Adds a JOIN clause to the query using the CustomerTitle relation
      *
-     * @param string $relationAlias optional alias for the relation
+     * @param     string $relationAlias optional alias for the relation
-     * @param string $joinType      Accepted values are null, 'left join', 'right join', 'inner join'
+     * @param     string $joinType Accepted values are null, 'left join', 'right join', 'inner join'
      *
      * @return ChildAddressQuery The current query, for fluid interface
      */
@@ -1051,11 +1053,11 @@ abstract class AddressQuery extends ModelCriteria
      *
      * @see useQuery()
      *
-     * @param string $relationAlias optional alias for the relation,
+     * @param     string $relationAlias optional alias for the relation,
-     *                              to be used as main alias in the secondary query
+     *                                   to be used as main alias in the secondary query
-     * @param string $joinType      Accepted values are null, 'left join', 'right join', 'inner join'
+     * @param     string $joinType Accepted values are null, 'left join', 'right join', 'inner join'
      *
-     * @return \Thelia\Model\CustomerTitleQuery A secondary query class using the current class as primary query
+     * @return   \Thelia\Model\CustomerTitleQuery A secondary query class using the current class as primary query
      */
     public function useCustomerTitleQuery($relationAlias = null, $joinType = Criteria::INNER_JOIN)
     {
@@ -1067,8 +1069,8 @@ abstract class AddressQuery extends ModelCriteria
     /**
      * Filter the query by a related \Thelia\Model\Country object
      *
-     * @param \Thelia\Model\Country|ObjectCollection $country    The related object(s) to use as filter
+     * @param \Thelia\Model\Country|ObjectCollection $country The related object(s) to use as filter
-     * @param string                                 $comparison Operator to use for the column comparison, defaults to Criteria::EQUAL
+     * @param string $comparison Operator to use for the column comparison, defaults to Criteria::EQUAL
      *
      * @return ChildAddressQuery The current query, for fluid interface
      */
@@ -1092,8 +1094,8 @@ abstract class AddressQuery extends ModelCriteria
     /**
      * Adds a JOIN clause to the query using the Country relation
      *
-     * @param string $relationAlias optional alias for the relation
+     * @param     string $relationAlias optional alias for the relation
-     * @param string $joinType      Accepted values are null, 'left join', 'right join', 'inner join'
+     * @param     string $joinType Accepted values are null, 'left join', 'right join', 'inner join'
      *
      * @return ChildAddressQuery The current query, for fluid interface
      */
@@ -1126,11 +1128,11 @@ abstract class AddressQuery extends ModelCriteria
      *
      * @see useQuery()
      *
-     * @param string $relationAlias optional alias for the relation,
+     * @param     string $relationAlias optional alias for the relation,
-     *                              to be used as main alias in the secondary query
+     *                                   to be used as main alias in the secondary query
-     * @param string $joinType      Accepted values are null, 'left join', 'right join', 'inner join'
+     * @param     string $joinType Accepted values are null, 'left join', 'right join', 'inner join'
      *
-     * @return \Thelia\Model\CountryQuery A secondary query class using the current class as primary query
+     * @return   \Thelia\Model\CountryQuery A secondary query class using the current class as primary query
      */
     public function useCountryQuery($relationAlias = null, $joinType = Criteria::INNER_JOIN)
     {
@@ -1142,8 +1144,8 @@ abstract class AddressQuery extends ModelCriteria
     /**
      * Filter the query by a related \Thelia\Model\Cart object
      *
-     * @param \Thelia\Model\Cart|ObjectCollection $cart       the related object to use as filter
+     * @param \Thelia\Model\Cart|ObjectCollection $cart  the related object to use as filter
-     * @param string                              $comparison Operator to use for the column comparison, defaults to Criteria::EQUAL
+     * @param string $comparison Operator to use for the column comparison, defaults to Criteria::EQUAL
      *
      * @return ChildAddressQuery The current query, for fluid interface
      */
@@ -1165,8 +1167,8 @@ abstract class AddressQuery extends ModelCriteria
     /**
      * Adds a JOIN clause to the query using the CartRelatedByAddressDeliveryId relation
      *
-     * @param string $relationAlias optional alias for the relation
+     * @param     string $relationAlias optional alias for the relation
-     * @param string $joinType      Accepted values are null, 'left join', 'right join', 'inner join'
+     * @param     string $joinType Accepted values are null, 'left join', 'right join', 'inner join'
      *
      * @return ChildAddressQuery The current query, for fluid interface
      */
@@ -1199,11 +1201,11 @@ abstract class AddressQuery extends ModelCriteria
      *
      * @see useQuery()
      *
-     * @param string $relationAlias optional alias for the relation,
+     * @param     string $relationAlias optional alias for the relation,
-     *                              to be used as main alias in the secondary query
+     *                                   to be used as main alias in the secondary query
-     * @param string $joinType      Accepted values are null, 'left join', 'right join', 'inner join'
+     * @param     string $joinType Accepted values are null, 'left join', 'right join', 'inner join'
      *
-     * @return \Thelia\Model\CartQuery A secondary query class using the current class as primary query
+     * @return   \Thelia\Model\CartQuery A secondary query class using the current class as primary query
      */
     public function useCartRelatedByAddressDeliveryIdQuery($relationAlias = null, $joinType = Criteria::LEFT_JOIN)
     {
@@ -1215,8 +1217,8 @@ abstract class AddressQuery extends ModelCriteria
     /**
      * Filter the query by a related \Thelia\Model\Cart object
      *
-     * @param \Thelia\Model\Cart|ObjectCollection $cart       the related object to use as filter
+     * @param \Thelia\Model\Cart|ObjectCollection $cart  the related object to use as filter
-     * @param string                              $comparison Operator to use for the column comparison, defaults to Criteria::EQUAL
+     * @param string $comparison Operator to use for the column comparison, defaults to Criteria::EQUAL
      *
      * @return ChildAddressQuery The current query, for fluid interface
      */
@@ -1238,8 +1240,8 @@ abstract class AddressQuery extends ModelCriteria
     /**
      * Adds a JOIN clause to the query using the CartRelatedByAddressInvoiceId relation
      *
-     * @param string $relationAlias optional alias for the relation
+     * @param     string $relationAlias optional alias for the relation
-     * @param string $joinType      Accepted values are null, 'left join', 'right join', 'inner join'
+     * @param     string $joinType Accepted values are null, 'left join', 'right join', 'inner join'
      *
      * @return ChildAddressQuery The current query, for fluid interface
      */
@@ -1272,11 +1274,11 @@ abstract class AddressQuery extends ModelCriteria
      *
      * @see useQuery()
      *
-     * @param string $relationAlias optional alias for the relation,
+     * @param     string $relationAlias optional alias for the relation,
-     *                              to be used as main alias in the secondary query
+     *                                   to be used as main alias in the secondary query
-     * @param string $joinType      Accepted values are null, 'left join', 'right join', 'inner join'
+     * @param     string $joinType Accepted values are null, 'left join', 'right join', 'inner join'
      *
-     * @return \Thelia\Model\CartQuery A secondary query class using the current class as primary query
+     * @return   \Thelia\Model\CartQuery A secondary query class using the current class as primary query
      */
     public function useCartRelatedByAddressInvoiceIdQuery($relationAlias = null, $joinType = Criteria::LEFT_JOIN)
     {
@@ -1288,7 +1290,7 @@ abstract class AddressQuery extends ModelCriteria
     /**
      * Exclude object from result
      *
-     * @param ChildAddress $address Object to remove from the list of results
+     * @param   ChildAddress $address Object to remove from the list of results
      *
      * @return ChildAddressQuery The current query, for fluid interface
      */
@@ -1304,8 +1306,8 @@ abstract class AddressQuery extends ModelCriteria
     /**
      * Deletes all rows from the address table.
      *
-     * @param  ConnectionInterface $con the connection to use
+     * @param ConnectionInterface $con the connection to use
-     * @return int                 The number of affected rows (if supported by underlying database driver).
+     * @return int The number of affected rows (if supported by underlying database driver).
      */
     public function doDeleteAll(ConnectionInterface $con = null)
     {
@@ -1336,13 +1338,13 @@ abstract class AddressQuery extends ModelCriteria
     /**
      * Performs a DELETE on the database, given a ChildAddress or Criteria object OR a primary key value.
      *
-     * @param  mixed               $values Criteria or ChildAddress object or primary key or array of primary keys
+     * @param mixed               $values Criteria or ChildAddress object or primary key or array of primary keys
-     *                                     which is used to create the DELETE statement
+     *              which is used to create the DELETE statement
-     * @param  ConnectionInterface $con    the connection to use
+     * @param ConnectionInterface $con the connection to use
-     * @return int                 The number of affected rows (if supported by underlying database driver).  This includes CASCADE-related rows
+     * @return int The number of affected rows (if supported by underlying database driver).  This includes CASCADE-related rows
-     *                                    if supported by native driver or if emulated using Propel.
+     *                if supported by native driver or if emulated using Propel.
-     * @throws PropelException     Any exceptions caught during processing will be
+     * @throws PropelException Any exceptions caught during processing will be
-     *                                    rethrown wrapped into a PropelException.
+     *         rethrown wrapped into a PropelException.
      */
      public function delete(ConnectionInterface $con = null)
      {
@@ -1362,6 +1364,7 @@ abstract class AddressQuery extends ModelCriteria
             // for more than one table or we could emulating ON DELETE CASCADE, etc.
             $con->beginTransaction();
 
+
         AddressTableMap::removeInstanceFromPool($criteria);
 
             $affectedRows += ModelCriteria::delete($con);
@@ -1380,9 +1383,9 @@ abstract class AddressQuery extends ModelCriteria
     /**
      * Filter by the latest updated
      *
-     * @param int $nbDays Maximum age of the latest update in days
+     * @param      int $nbDays Maximum age of the latest update in days
      *
-     * @return ChildAddressQuery The current query, for fluid interface
+     * @return     ChildAddressQuery The current query, for fluid interface
      */
     public function recentlyUpdated($nbDays = 7)
     {
@@ -1392,9 +1395,9 @@ abstract class AddressQuery extends ModelCriteria
     /**
      * Filter by the latest created
      *
-     * @param int $nbDays Maximum age of in days
+     * @param      int $nbDays Maximum age of in days
      *
-     * @return ChildAddressQuery The current query, for fluid interface
+     * @return     ChildAddressQuery The current query, for fluid interface
      */
     public function recentlyCreated($nbDays = 7)
     {
@@ -1404,7 +1407,7 @@ abstract class AddressQuery extends ModelCriteria
     /**
      * Order by update date desc
      *
-     * @return ChildAddressQuery The current query, for fluid interface
+     * @return     ChildAddressQuery The current query, for fluid interface
      */
     public function lastUpdatedFirst()
     {
@@ -1414,7 +1417,7 @@ abstract class AddressQuery extends ModelCriteria
     /**
      * Order by update date asc
      *
-     * @return ChildAddressQuery The current query, for fluid interface
+     * @return     ChildAddressQuery The current query, for fluid interface
      */
     public function firstUpdatedFirst()
     {
@@ -1424,7 +1427,7 @@ abstract class AddressQuery extends ModelCriteria
     /**
      * Order by create date desc
      *
-     * @return ChildAddressQuery The current query, for fluid interface
+     * @return     ChildAddressQuery The current query, for fluid interface
      */
     public function lastCreatedFirst()
     {
@@ -1434,7 +1437,7 @@ abstract class AddressQuery extends ModelCriteria
     /**
      * Order by create date asc
      *
-     * @return ChildAddressQuery The current query, for fluid interface
+     * @return     ChildAddressQuery The current query, for fluid interface
      */
     public function firstCreatedFirst()
     {

core/lib/Thelia/Model/Base/Admin.php

@@ -29,6 +29,7 @@ abstract class Admin implements ActiveRecordInterface
      */
     const TABLE_MAP = '\\Thelia\\Model\\Map\\AdminTableMap';
 
+
     /**
      * attribute to determine if this object has previously been saved.
      * @var boolean
@@ -355,9 +356,9 @@ abstract class Admin implements ActiveRecordInterface
      * $book->importFrom('JSON', '{"Id":9012,"Title":"Don Juan","ISBN":"0140422161","Price":12.99,"PublisherId":1234,"AuthorId":5678}');
      * </code>
      *
-     * @param mixed  $parser A AbstractParser instance,
+     * @param mixed $parser A AbstractParser instance,
      *                       or a format name ('XML', 'YAML', 'JSON', 'CSV')
-     * @param string $data   The source data to import from
+     * @param string $data The source data to import from
      *
      * @return Admin The current object, for fluid interface
      */
@@ -407,110 +408,121 @@ abstract class Admin implements ActiveRecordInterface
     /**
      * Get the [id] column value.
      *
-     * @return int
+     * @return   int
      */
     public function getId()
     {
+
         return $this->id;
     }
 
     /**
      * Get the [profile_id] column value.
      *
-     * @return int
+     * @return   int
      */
     public function getProfileId()
     {
+
         return $this->profile_id;
     }
 
     /**
      * Get the [firstname] column value.
      *
-     * @return string
+     * @return   string
      */
     public function getFirstname()
     {
+
         return $this->firstname;
     }
 
     /**
      * Get the [lastname] column value.
      *
-     * @return string
+     * @return   string
      */
     public function getLastname()
     {
+
         return $this->lastname;
     }
 
     /**
      * Get the [login] column value.
      *
-     * @return string
+     * @return   string
      */
     public function getLogin()
     {
+
         return $this->login;
     }
 
     /**
      * Get the [password] column value.
      *
-     * @return string
+     * @return   string
      */
     public function getPassword()
     {
+
         return $this->password;
     }
 
     /**
      * Get the [locale] column value.
      *
-     * @return string
+     * @return   string
      */
     public function getLocale()
     {
+
         return $this->locale;
     }
 
     /**
      * Get the [algo] column value.
      *
-     * @return string
+     * @return   string
      */
     public function getAlgo()
     {
+
         return $this->algo;
     }
 
     /**
      * Get the [salt] column value.
      *
-     * @return string
+     * @return   string
      */
     public function getSalt()
     {
+
         return $this->salt;
     }
 
     /**
      * Get the [remember_me_token] column value.
      *
-     * @return string
+     * @return   string
      */
     public function getRememberMeToken()
     {
+
         return $this->remember_me_token;
     }
 
     /**
      * Get the [remember_me_serial] column value.
      *
-     * @return string
+     * @return   string
      */
     public function getRememberMeSerial()
     {
+
         return $this->remember_me_serial;
     }
 
@@ -518,8 +530,8 @@ abstract class Admin implements ActiveRecordInterface
      * Get the [optionally formatted] temporal [created_at] column value.
      *
      *
-     * @param string $format The date/time format string (either date()-style or strftime()-style).
+     * @param      string $format The date/time format string (either date()-style or strftime()-style).
-     *                       If format is NULL, then the raw \DateTime object will be returned.
+     *                            If format is NULL, then the raw \DateTime object will be returned.
      *
      * @return mixed Formatted date/time value as string or \DateTime object (if format is NULL), NULL if column is NULL, and 0 if column value is 0000-00-00 00:00:00
      *
@@ -538,8 +550,8 @@ abstract class Admin implements ActiveRecordInterface
      * Get the [optionally formatted] temporal [updated_at] column value.
      *
      *
-     * @param string $format The date/time format string (either date()-style or strftime()-style).
+     * @param      string $format The date/time format string (either date()-style or strftime()-style).
-     *                       If format is NULL, then the raw \DateTime object will be returned.
+     *                            If format is NULL, then the raw \DateTime object will be returned.
      *
      * @return mixed Formatted date/time value as string or \DateTime object (if format is NULL), NULL if column is NULL, and 0 if column value is 0000-00-00 00:00:00
      *
@@ -557,8 +569,8 @@ abstract class Admin implements ActiveRecordInterface
     /**
      * Set the value of [id] column.
      *
-     * @param  int                 $v new value
+     * @param      int $v new value
-     * @return \Thelia\Model\Admin The current object (for fluent API support)
+     * @return   \Thelia\Model\Admin The current object (for fluent API support)
      */
     public function setId($v)
     {
@@ -571,14 +583,15 @@ abstract class Admin implements ActiveRecordInterface
             $this->modifiedColumns[AdminTableMap::ID] = true;
         }
 
+
         return $this;
     } // setId()
 
     /**
      * Set the value of [profile_id] column.
      *
-     * @param  int                 $v new value
+     * @param      int $v new value
-     * @return \Thelia\Model\Admin The current object (for fluent API support)
+     * @return   \Thelia\Model\Admin The current object (for fluent API support)
      */
     public function setProfileId($v)
     {
@@ -595,14 +608,15 @@ abstract class Admin implements ActiveRecordInterface
             $this->aProfile = null;
         }
 
+
         return $this;
     } // setProfileId()
 
     /**
      * Set the value of [firstname] column.
      *
-     * @param  string              $v new value
+     * @param      string $v new value
-     * @return \Thelia\Model\Admin The current object (for fluent API support)
+     * @return   \Thelia\Model\Admin The current object (for fluent API support)
      */
     public function setFirstname($v)
     {
@@ -615,14 +629,15 @@ abstract class Admin implements ActiveRecordInterface
             $this->modifiedColumns[AdminTableMap::FIRSTNAME] = true;
         }
 
+
         return $this;
     } // setFirstname()
 
     /**
      * Set the value of [lastname] column.
      *
-     * @param  string              $v new value
+     * @param      string $v new value
-     * @return \Thelia\Model\Admin The current object (for fluent API support)
+     * @return   \Thelia\Model\Admin The current object (for fluent API support)
      */
     public function setLastname($v)
     {
@@ -635,14 +650,15 @@ abstract class Admin implements ActiveRecordInterface
             $this->modifiedColumns[AdminTableMap::LASTNAME] = true;
         }
 
+
         return $this;
     } // setLastname()
 
     /**
      * Set the value of [login] column.
      *
-     * @param  string              $v new value
+     * @param      string $v new value
-     * @return \Thelia\Model\Admin The current object (for fluent API support)
+     * @return   \Thelia\Model\Admin The current object (for fluent API support)
      */
     public function setLogin($v)
     {
@@ -655,14 +671,15 @@ abstract class Admin implements ActiveRecordInterface
             $this->modifiedColumns[AdminTableMap::LOGIN] = true;
         }
 
+
         return $this;
     } // setLogin()
 
     /**
      * Set the value of [password] column.
      *
-     * @param  string              $v new value
+     * @param      string $v new value
-     * @return \Thelia\Model\Admin The current object (for fluent API support)
+     * @return   \Thelia\Model\Admin The current object (for fluent API support)
      */
     public function setPassword($v)
     {
@@ -675,14 +692,15 @@ abstract class Admin implements ActiveRecordInterface
             $this->modifiedColumns[AdminTableMap::PASSWORD] = true;
         }
 
+
         return $this;
     } // setPassword()
 
     /**
      * Set the value of [locale] column.
      *
-     * @param  string              $v new value
+     * @param      string $v new value
-     * @return \Thelia\Model\Admin The current object (for fluent API support)
+     * @return   \Thelia\Model\Admin The current object (for fluent API support)
      */
     public function setLocale($v)
     {
@@ -695,14 +713,15 @@ abstract class Admin implements ActiveRecordInterface
             $this->modifiedColumns[AdminTableMap::LOCALE] = true;
         }
 
+
         return $this;
     } // setLocale()
 
     /**
      * Set the value of [algo] column.
      *
-     * @param  string              $v new value
+     * @param      string $v new value
-     * @return \Thelia\Model\Admin The current object (for fluent API support)
+     * @return   \Thelia\Model\Admin The current object (for fluent API support)
      */
     public function setAlgo($v)
     {
@@ -715,14 +734,15 @@ abstract class Admin implements ActiveRecordInterface
             $this->modifiedColumns[AdminTableMap::ALGO] = true;
         }
 
+
         return $this;
     } // setAlgo()
 
     /**
      * Set the value of [salt] column.
      *
-     * @param  string              $v new value
+     * @param      string $v new value
-     * @return \Thelia\Model\Admin The current object (for fluent API support)
+     * @return   \Thelia\Model\Admin The current object (for fluent API support)
      */
     public function setSalt($v)
     {
@@ -735,14 +755,15 @@ abstract class Admin implements ActiveRecordInterface
             $this->modifiedColumns[AdminTableMap::SALT] = true;
         }
 
+
         return $this;
     } // setSalt()
 
     /**
      * Set the value of [remember_me_token] column.
      *
-     * @param  string              $v new value
+     * @param      string $v new value
-     * @return \Thelia\Model\Admin The current object (for fluent API support)
+     * @return   \Thelia\Model\Admin The current object (for fluent API support)
      */
     public function setRememberMeToken($v)
     {
@@ -755,14 +776,15 @@ abstract class Admin implements ActiveRecordInterface
             $this->modifiedColumns[AdminTableMap::REMEMBER_ME_TOKEN] = true;
         }
 
+
         return $this;
     } // setRememberMeToken()
 
     /**
      * Set the value of [remember_me_serial] column.
      *
-     * @param  string              $v new value
+     * @param      string $v new value
-     * @return \Thelia\Model\Admin The current object (for fluent API support)
+     * @return   \Thelia\Model\Admin The current object (for fluent API support)
      */
     public function setRememberMeSerial($v)
     {
@@ -775,15 +797,16 @@ abstract class Admin implements ActiveRecordInterface
             $this->modifiedColumns[AdminTableMap::REMEMBER_ME_SERIAL] = true;
         }
 
+
         return $this;
     } // setRememberMeSerial()
 
     /**
      * Sets the value of [created_at] column to a normalized version of the date/time value specified.
      *
-     * @param  mixed               $v string, integer (timestamp), or \DateTime value.
+     * @param      mixed $v string, integer (timestamp), or \DateTime value.
-     *                                Empty strings are treated as NULL.
+     *               Empty strings are treated as NULL.
-     * @return \Thelia\Model\Admin The current object (for fluent API support)
+     * @return   \Thelia\Model\Admin The current object (for fluent API support)
      */
     public function setCreatedAt($v)
     {
@@ -795,15 +818,16 @@ abstract class Admin implements ActiveRecordInterface
             }
         } // if either are not null
 
+
         return $this;
     } // setCreatedAt()
 
     /**
      * Sets the value of [updated_at] column to a normalized version of the date/time value specified.
      *
-     * @param  mixed               $v string, integer (timestamp), or \DateTime value.
+     * @param      mixed $v string, integer (timestamp), or \DateTime value.
-     *                                Empty strings are treated as NULL.
+     *               Empty strings are treated as NULL.
-     * @return \Thelia\Model\Admin The current object (for fluent API support)
+     * @return   \Thelia\Model\Admin The current object (for fluent API support)
      */
     public function setUpdatedAt($v)
     {
@@ -815,6 +839,7 @@ abstract class Admin implements ActiveRecordInterface
             }
         } // if either are not null
 
+
         return $this;
     } // setUpdatedAt()
 
@@ -939,10 +964,10 @@ abstract class Admin implements ActiveRecordInterface
      *
      * This will only work if the object has been saved and has a valid primary key set.
      *
-     * @param  boolean             $deep (optional) Whether to also de-associated any related objects.
+     * @param      boolean $deep (optional) Whether to also de-associated any related objects.
-     * @param  ConnectionInterface $con  (optional) The ConnectionInterface connection to use.
+     * @param      ConnectionInterface $con (optional) The ConnectionInterface connection to use.
      * @return void
-     * @throws PropelException     - if this object is deleted, unsaved or doesn't have pk match in db
+     * @throws PropelException - if this object is deleted, unsaved or doesn't have pk match in db
      */
     public function reload($deep = false, ConnectionInterface $con = null)
     {
@@ -978,7 +1003,7 @@ abstract class Admin implements ActiveRecordInterface
     /**
      * Removes this object from datastore and sets delete attribute.
      *
-     * @param  ConnectionInterface $con
+     * @param      ConnectionInterface $con
      * @return void
      * @throws PropelException
      * @see Admin::setDeleted()
@@ -1021,8 +1046,8 @@ abstract class Admin implements ActiveRecordInterface
      * method.  This method wraps all precipitate database operations in a
      * single transaction.
      *
-     * @param  ConnectionInterface $con
+     * @param      ConnectionInterface $con
-     * @return int                 The number of rows affected by this insert/update and any referring fk objects' save() operations.
+     * @return int             The number of rows affected by this insert/update and any referring fk objects' save() operations.
      * @throws PropelException
      * @see doSave()
      */
@@ -1083,8 +1108,8 @@ abstract class Admin implements ActiveRecordInterface
      * If the object is new, it inserts it; otherwise an update is performed.
      * All related objects are also updated in this method.
      *
-     * @param  ConnectionInterface $con
+     * @param      ConnectionInterface $con
-     * @return int                 The number of rows affected by this insert/update and any referring fk objects' save() operations.
+     * @return int             The number of rows affected by this insert/update and any referring fk objects' save() operations.
      * @throws PropelException
      * @see save()
      */
@@ -1127,7 +1152,7 @@ abstract class Admin implements ActiveRecordInterface
     /**
      * Insert the row in the database.
      *
-     * @param ConnectionInterface $con
+     * @param      ConnectionInterface $con
      *
      * @throws PropelException
      * @see doSave()
@@ -1253,7 +1278,7 @@ abstract class Admin implements ActiveRecordInterface
     /**
      * Update the row in the database.
      *
-     * @param ConnectionInterface $con
+     * @param      ConnectionInterface $con
      *
      * @return Integer Number of updated rows
      * @see doSave()
@@ -1269,12 +1294,12 @@ abstract class Admin implements ActiveRecordInterface
     /**
      * Retrieves a field from the object by name passed in as a string.
      *
-     * @param  string $name name
+     * @param      string $name name
-     * @param  string $type The type of fieldname the $name is of:
+     * @param      string $type The type of fieldname the $name is of:
-     *                      one of the class type constants TableMap::TYPE_PHPNAME, TableMap::TYPE_STUDLYPHPNAME
+     *                     one of the class type constants TableMap::TYPE_PHPNAME, TableMap::TYPE_STUDLYPHPNAME
-     *                      TableMap::TYPE_COLNAME, TableMap::TYPE_FIELDNAME, TableMap::TYPE_NUM.
+     *                     TableMap::TYPE_COLNAME, TableMap::TYPE_FIELDNAME, TableMap::TYPE_NUM.
-     *                      Defaults to TableMap::TYPE_PHPNAME.
+     *                     Defaults to TableMap::TYPE_PHPNAME.
-     * @return mixed  Value of field.
+     * @return mixed Value of field.
      */
     public function getByName($name, $type = TableMap::TYPE_PHPNAME)
     {
@@ -1288,7 +1313,7 @@ abstract class Admin implements ActiveRecordInterface
      * Retrieves a field from the object by Position as specified in the xml schema.
      * Zero-based.
      *
-     * @param  int   $pos position in xml schema
+     * @param      int $pos position in xml schema
      * @return mixed Value of field at $pos
      */
     public function getByPosition($pos)
@@ -1345,12 +1370,12 @@ abstract class Admin implements ActiveRecordInterface
      * You can specify the key type of the array by passing one of the class
      * type constants.
      *
-     * @param string  $keyType                (optional) One of the class type constants TableMap::TYPE_PHPNAME, TableMap::TYPE_STUDLYPHPNAME,
+     * @param     string  $keyType (optional) One of the class type constants TableMap::TYPE_PHPNAME, TableMap::TYPE_STUDLYPHPNAME,
-     *                                        TableMap::TYPE_COLNAME, TableMap::TYPE_FIELDNAME, TableMap::TYPE_NUM.
+     *                    TableMap::TYPE_COLNAME, TableMap::TYPE_FIELDNAME, TableMap::TYPE_NUM.
-     *                                        Defaults to TableMap::TYPE_PHPNAME.
+     *                    Defaults to TableMap::TYPE_PHPNAME.
-     * @param boolean $includeLazyLoadColumns (optional) Whether to include lazy loaded columns. Defaults to TRUE.
+     * @param     boolean $includeLazyLoadColumns (optional) Whether to include lazy loaded columns. Defaults to TRUE.
-     * @param array   $alreadyDumpedObjects   List of objects to skip to avoid recursion
+     * @param     array $alreadyDumpedObjects List of objects to skip to avoid recursion
-     * @param boolean $includeForeignObjects  (optional) Whether to include hydrated related objects. Default to FALSE.
+     * @param     boolean $includeForeignObjects (optional) Whether to include hydrated related objects. Default to FALSE.
      *
      * @return array an associative array containing the field names (as keys) and field values
      */
@@ -1393,12 +1418,12 @@ abstract class Admin implements ActiveRecordInterface
     /**
      * Sets a field from the object by name passed in as a string.
      *
-     * @param  string $name
+     * @param      string $name
-     * @param  mixed  $value field value
+     * @param      mixed  $value field value
-     * @param  string $type  The type of fieldname the $name is of:
+     * @param      string $type The type of fieldname the $name is of:
-     *                       one of the class type constants TableMap::TYPE_PHPNAME, TableMap::TYPE_STUDLYPHPNAME
+     *                     one of the class type constants TableMap::TYPE_PHPNAME, TableMap::TYPE_STUDLYPHPNAME
-     *                       TableMap::TYPE_COLNAME, TableMap::TYPE_FIELDNAME, TableMap::TYPE_NUM.
+     *                     TableMap::TYPE_COLNAME, TableMap::TYPE_FIELDNAME, TableMap::TYPE_NUM.
-     *                       Defaults to TableMap::TYPE_PHPNAME.
+     *                     Defaults to TableMap::TYPE_PHPNAME.
      * @return void
      */
     public function setByName($name, $value, $type = TableMap::TYPE_PHPNAME)
@@ -1412,8 +1437,8 @@ abstract class Admin implements ActiveRecordInterface
      * Sets a field from the object by Position as specified in the xml schema.
      * Zero-based.
      *
-     * @param  int   $pos   position in xml schema
+     * @param      int $pos position in xml schema
-     * @param  mixed $value field value
+     * @param      mixed $value field value
      * @return void
      */
     public function setByPosition($pos, $value)
@@ -1474,8 +1499,8 @@ abstract class Admin implements ActiveRecordInterface
      * TableMap::TYPE_COLNAME, TableMap::TYPE_FIELDNAME, TableMap::TYPE_NUM.
      * The default key type is the column's TableMap::TYPE_PHPNAME.
      *
-     * @param  array  $arr     An array to populate the object from.
+     * @param      array  $arr     An array to populate the object from.
-     * @param  string $keyType The type of keys the array uses.
+     * @param      string $keyType The type of keys the array uses.
      * @return void
      */
     public function fromArray($arr, $keyType = TableMap::TYPE_PHPNAME)
@@ -1519,6 +1544,7 @@ abstract class Admin implements ActiveRecordInterface
         if ($this->isColumnModified(AdminTableMap::REMEMBER_ME_SERIAL)) $criteria->add(AdminTableMap::REMEMBER_ME_SERIAL, $this->remember_me_serial);
         if ($this->isColumnModified(AdminTableMap::CREATED_AT)) $criteria->add(AdminTableMap::CREATED_AT, $this->created_at);
         if ($this->isColumnModified(AdminTableMap::UPDATED_AT)) $criteria->add(AdminTableMap::UPDATED_AT, $this->updated_at);
+
         return $criteria;
     }
 
@@ -1540,7 +1566,7 @@ abstract class Admin implements ActiveRecordInterface
 
     /**
      * Returns the primary key for this object (row).
-     * @return int
+     * @return   int
      */
     public function getPrimaryKey()
     {
@@ -1550,7 +1576,7 @@ abstract class Admin implements ActiveRecordInterface
     /**
      * Generic method to set the primary key (id column).
      *
-     * @param  int  $key Primary key.
+     * @param       int $key Primary key.
      * @return void
      */
     public function setPrimaryKey($key)
@@ -1564,6 +1590,7 @@ abstract class Admin implements ActiveRecordInterface
      */
     public function isPrimaryKeyNull()
     {
+
         return null === $this->getId();
     }
 
@@ -1573,9 +1600,9 @@ abstract class Admin implements ActiveRecordInterface
      * If desired, this method can also make copies of all associated (fkey referrers)
      * objects.
      *
-     * @param  object          $copyObj  An object of \Thelia\Model\Admin (or compatible) type.
+     * @param      object $copyObj An object of \Thelia\Model\Admin (or compatible) type.
-     * @param  boolean         $deepCopy Whether to also copy all rows that refer (by fkey) to the current row.
+     * @param      boolean $deepCopy Whether to also copy all rows that refer (by fkey) to the current row.
-     * @param  boolean         $makeNew  Whether to reset autoincrement PKs and make the object new.
+     * @param      boolean $makeNew Whether to reset autoincrement PKs and make the object new.
      * @throws PropelException
      */
     public function copyInto($copyObj, $deepCopy = false, $makeNew = true)
@@ -1606,8 +1633,8 @@ abstract class Admin implements ActiveRecordInterface
      * If desired, this method can also make copies of all associated (fkey referrers)
      * objects.
      *
-     * @param  boolean             $deepCopy Whether to also copy all rows that refer (by fkey) to the current row.
+     * @param      boolean $deepCopy Whether to also copy all rows that refer (by fkey) to the current row.
-     * @return \Thelia\Model\Admin Clone of current object.
+     * @return                 \Thelia\Model\Admin Clone of current object.
      * @throws PropelException
      */
     public function copy($deepCopy = false)
@@ -1623,8 +1650,8 @@ abstract class Admin implements ActiveRecordInterface
     /**
      * Declares an association between this object and a ChildProfile object.
      *
-     * @param  ChildProfile        $v
+     * @param                  ChildProfile $v
-     * @return \Thelia\Model\Admin The current object (for fluent API support)
+     * @return                 \Thelia\Model\Admin The current object (for fluent API support)
      * @throws PropelException
      */
     public function setProfile(ChildProfile $v = null)
@@ -1643,6 +1670,7 @@ abstract class Admin implements ActiveRecordInterface
             $v->addAdmin($this);
         }
 
+
         return $this;
     }
 
@@ -1650,8 +1678,8 @@ abstract class Admin implements ActiveRecordInterface
     /**
      * Get the associated ChildProfile object
      *
-     * @param  ConnectionInterface $con Optional Connection object.
+     * @param      ConnectionInterface $con Optional Connection object.
-     * @return ChildProfile        The associated ChildProfile object.
+     * @return                 ChildProfile The associated ChildProfile object.
      * @throws PropelException
      */
     public function getProfile(ConnectionInterface $con = null)
@@ -1702,7 +1730,7 @@ abstract class Admin implements ActiveRecordInterface
      * objects with circular references (even in PHP 5.3). This is currently necessary
      * when using Propel in certain daemon or large-volume/high-memory operations.
      *
-     * @param boolean $deep Whether to also clear the references on all referrer objects.
+     * @param      boolean $deep Whether to also clear the references on all referrer objects.
      */
     public function clearAllReferences($deep = false)
     {
@@ -1727,7 +1755,7 @@ abstract class Admin implements ActiveRecordInterface
     /**
      * Mark the current object so that the update date doesn't get updated during next save
      *
-     * @return ChildAdmin The current object (for fluent API support)
+     * @return     ChildAdmin The current object (for fluent API support)
      */
     public function keepUpdateDateUnchanged()
     {

core/lib/Thelia/Model/Base/AdminLog.php

@@ -9,6 +9,7 @@ use Propel\Runtime\Propel;
 use Propel\Runtime\ActiveQuery\Criteria;
 use Propel\Runtime\ActiveQuery\ModelCriteria;
 use Propel\Runtime\ActiveRecord\ActiveRecordInterface;
+use Propel\Runtime\Collection\Collection;
 use Propel\Runtime\Connection\ConnectionInterface;
 use Propel\Runtime\Exception\BadMethodCallException;
 use Propel\Runtime\Exception\PropelException;
@@ -26,6 +27,7 @@ abstract class AdminLog implements ActiveRecordInterface
      */
     const TABLE_MAP = '\\Thelia\\Model\\Map\\AdminLogTableMap';
 
+
     /**
      * attribute to determine if this object has previously been saved.
      * @var boolean
@@ -329,9 +331,9 @@ abstract class AdminLog implements ActiveRecordInterface
      * $book->importFrom('JSON', '{"Id":9012,"Title":"Don Juan","ISBN":"0140422161","Price":12.99,"PublisherId":1234,"AuthorId":5678}');
      * </code>
      *
-     * @param mixed  $parser A AbstractParser instance,
+     * @param mixed $parser A AbstractParser instance,
      *                       or a format name ('XML', 'YAML', 'JSON', 'CSV')
-     * @param string $data   The source data to import from
+     * @param string $data The source data to import from
      *
      * @return AdminLog The current object, for fluid interface
      */
@@ -381,80 +383,88 @@ abstract class AdminLog implements ActiveRecordInterface
     /**
      * Get the [id] column value.
      *
-     * @return int
+     * @return   int
      */
     public function getId()
     {
+
         return $this->id;
     }
 
     /**
      * Get the [admin_login] column value.
      *
-     * @return string
+     * @return   string
      */
     public function getAdminLogin()
     {
+
         return $this->admin_login;
     }
 
     /**
      * Get the [admin_firstname] column value.
      *
-     * @return string
+     * @return   string
      */
     public function getAdminFirstname()
     {
+
         return $this->admin_firstname;
     }
 
     /**
      * Get the [admin_lastname] column value.
      *
-     * @return string
+     * @return   string
      */
     public function getAdminLastname()
     {
+
         return $this->admin_lastname;
     }
 
     /**
      * Get the [resource] column value.
      *
-     * @return string
+     * @return   string
      */
     public function getResource()
     {
+
         return $this->resource;
     }
 
     /**
      * Get the [action] column value.
      *
-     * @return string
+     * @return   string
      */
     public function getAction()
     {
+
         return $this->action;
     }
 
     /**
      * Get the [message] column value.
      *
-     * @return string
+     * @return   string
      */
     public function getMessage()
     {
+
         return $this->message;
     }
 
     /**
      * Get the [request] column value.
      *
-     * @return string
+     * @return   string
      */
     public function getRequest()
     {
+
         return $this->request;
     }
 
@@ -462,8 +472,8 @@ abstract class AdminLog implements ActiveRecordInterface
      * Get the [optionally formatted] temporal [created_at] column value.
      *
      *
-     * @param string $format The date/time format string (either date()-style or strftime()-style).
+     * @param      string $format The date/time format string (either date()-style or strftime()-style).
-     *                       If format is NULL, then the raw \DateTime object will be returned.
+     *                            If format is NULL, then the raw \DateTime object will be returned.
      *
      * @return mixed Formatted date/time value as string or \DateTime object (if format is NULL), NULL if column is NULL, and 0 if column value is 0000-00-00 00:00:00
      *
@@ -482,8 +492,8 @@ abstract class AdminLog implements ActiveRecordInterface
      * Get the [optionally formatted] temporal [updated_at] column value.
      *
      *
-     * @param string $format The date/time format string (either date()-style or strftime()-style).
+     * @param      string $format The date/time format string (either date()-style or strftime()-style).
-     *                       If format is NULL, then the raw \DateTime object will be returned.
+     *                            If format is NULL, then the raw \DateTime object will be returned.
      *
      * @return mixed Formatted date/time value as string or \DateTime object (if format is NULL), NULL if column is NULL, and 0 if column value is 0000-00-00 00:00:00
      *
@@ -501,8 +511,8 @@ abstract class AdminLog implements ActiveRecordInterface
     /**
      * Set the value of [id] column.
      *
-     * @param  int                    $v new value
+     * @param      int $v new value
-     * @return \Thelia\Model\AdminLog The current object (for fluent API support)
+     * @return   \Thelia\Model\AdminLog The current object (for fluent API support)
      */
     public function setId($v)
     {
@@ -515,14 +525,15 @@ abstract class AdminLog implements ActiveRecordInterface
             $this->modifiedColumns[AdminLogTableMap::ID] = true;
         }
 
+
         return $this;
     } // setId()
 
     /**
      * Set the value of [admin_login] column.
      *
-     * @param  string                 $v new value
+     * @param      string $v new value
-     * @return \Thelia\Model\AdminLog The current object (for fluent API support)
+     * @return   \Thelia\Model\AdminLog The current object (for fluent API support)
      */
     public function setAdminLogin($v)
     {
@@ -535,14 +546,15 @@ abstract class AdminLog implements ActiveRecordInterface
             $this->modifiedColumns[AdminLogTableMap::ADMIN_LOGIN] = true;
         }
 
+
         return $this;
     } // setAdminLogin()
 
     /**
      * Set the value of [admin_firstname] column.
      *
-     * @param  string                 $v new value
+     * @param      string $v new value
-     * @return \Thelia\Model\AdminLog The current object (for fluent API support)
+     * @return   \Thelia\Model\AdminLog The current object (for fluent API support)
      */
     public function setAdminFirstname($v)
     {
@@ -555,14 +567,15 @@ abstract class AdminLog implements ActiveRecordInterface
             $this->modifiedColumns[AdminLogTableMap::ADMIN_FIRSTNAME] = true;
         }
 
+
         return $this;
     } // setAdminFirstname()
 
     /**
      * Set the value of [admin_lastname] column.
      *
-     * @param  string                 $v new value
+     * @param      string $v new value
-     * @return \Thelia\Model\AdminLog The current object (for fluent API support)
+     * @return   \Thelia\Model\AdminLog The current object (for fluent API support)
      */
     public function setAdminLastname($v)
     {
@@ -575,14 +588,15 @@ abstract class AdminLog implements ActiveRecordInterface
             $this->modifiedColumns[AdminLogTableMap::ADMIN_LASTNAME] = true;
         }
 
+
         return $this;
     } // setAdminLastname()
 
     /**
      * Set the value of [resource] column.
      *
-     * @param  string                 $v new value
+     * @param      string $v new value
-     * @return \Thelia\Model\AdminLog The current object (for fluent API support)
+     * @return   \Thelia\Model\AdminLog The current object (for fluent API support)
      */
     public function setResource($v)
     {
@@ -595,14 +609,15 @@ abstract class AdminLog implements ActiveRecordInterface
             $this->modifiedColumns[AdminLogTableMap::RESOURCE] = true;
         }
 
+
         return $this;
     } // setResource()
 
     /**
      * Set the value of [action] column.
      *
-     * @param  string                 $v new value
+     * @param      string $v new value
-     * @return \Thelia\Model\AdminLog The current object (for fluent API support)
+     * @return   \Thelia\Model\AdminLog The current object (for fluent API support)
      */
     public function setAction($v)
     {
@@ -615,14 +630,15 @@ abstract class AdminLog implements ActiveRecordInterface
             $this->modifiedColumns[AdminLogTableMap::ACTION] = true;
         }
 
+
         return $this;
     } // setAction()
 
     /**
      * Set the value of [message] column.
      *
-     * @param  string                 $v new value
+     * @param      string $v new value
-     * @return \Thelia\Model\AdminLog The current object (for fluent API support)
+     * @return   \Thelia\Model\AdminLog The current object (for fluent API support)
      */
     public function setMessage($v)
     {
@@ -635,14 +651,15 @@ abstract class AdminLog implements ActiveRecordInterface
             $this->modifiedColumns[AdminLogTableMap::MESSAGE] = true;
         }
 
+
         return $this;
     } // setMessage()
 
     /**
      * Set the value of [request] column.
      *
-     * @param  string                 $v new value
+     * @param      string $v new value
-     * @return \Thelia\Model\AdminLog The current object (for fluent API support)
+     * @return   \Thelia\Model\AdminLog The current object (for fluent API support)
      */
     public function setRequest($v)
     {
@@ -655,15 +672,16 @@ abstract class AdminLog implements ActiveRecordInterface
             $this->modifiedColumns[AdminLogTableMap::REQUEST] = true;
         }
 
+
         return $this;
     } // setRequest()
 
     /**
      * Sets the value of [created_at] column to a normalized version of the date/time value specified.
      *
-     * @param  mixed                  $v string, integer (timestamp), or \DateTime value.
+     * @param      mixed $v string, integer (timestamp), or \DateTime value.
-     *                                   Empty strings are treated as NULL.
+     *               Empty strings are treated as NULL.
-     * @return \Thelia\Model\AdminLog The current object (for fluent API support)
+     * @return   \Thelia\Model\AdminLog The current object (for fluent API support)
      */
     public function setCreatedAt($v)
     {
@@ -675,15 +693,16 @@ abstract class AdminLog implements ActiveRecordInterface
             }
         } // if either are not null
 
+
         return $this;
     } // setCreatedAt()
 
     /**
      * Sets the value of [updated_at] column to a normalized version of the date/time value specified.
      *
-     * @param  mixed                  $v string, integer (timestamp), or \DateTime value.
+     * @param      mixed $v string, integer (timestamp), or \DateTime value.
-     *                                   Empty strings are treated as NULL.
+     *               Empty strings are treated as NULL.
-     * @return \Thelia\Model\AdminLog The current object (for fluent API support)
+     * @return   \Thelia\Model\AdminLog The current object (for fluent API support)
      */
     public function setUpdatedAt($v)
     {
@@ -695,6 +714,7 @@ abstract class AdminLog implements ActiveRecordInterface
             }
         } // if either are not null
 
+
         return $this;
     } // setUpdatedAt()
 
@@ -807,10 +827,10 @@ abstract class AdminLog implements ActiveRecordInterface
      *
      * This will only work if the object has been saved and has a valid primary key set.
      *
-     * @param  boolean             $deep (optional) Whether to also de-associated any related objects.
+     * @param      boolean $deep (optional) Whether to also de-associated any related objects.
-     * @param  ConnectionInterface $con  (optional) The ConnectionInterface connection to use.
+     * @param      ConnectionInterface $con (optional) The ConnectionInterface connection to use.
      * @return void
-     * @throws PropelException     - if this object is deleted, unsaved or doesn't have pk match in db
+     * @throws PropelException - if this object is deleted, unsaved or doesn't have pk match in db
      */
     public function reload($deep = false, ConnectionInterface $con = null)
     {
@@ -845,7 +865,7 @@ abstract class AdminLog implements ActiveRecordInterface
     /**
      * Removes this object from datastore and sets delete attribute.
      *
-     * @param  ConnectionInterface $con
+     * @param      ConnectionInterface $con
      * @return void
      * @throws PropelException
      * @see AdminLog::setDeleted()
@@ -888,8 +908,8 @@ abstract class AdminLog implements ActiveRecordInterface
      * method.  This method wraps all precipitate database operations in a
      * single transaction.
      *
-     * @param  ConnectionInterface $con
+     * @param      ConnectionInterface $con
-     * @return int                 The number of rows affected by this insert/update and any referring fk objects' save() operations.
+     * @return int             The number of rows affected by this insert/update and any referring fk objects' save() operations.
      * @throws PropelException
      * @see doSave()
      */
@@ -950,8 +970,8 @@ abstract class AdminLog implements ActiveRecordInterface
      * If the object is new, it inserts it; otherwise an update is performed.
      * All related objects are also updated in this method.
      *
-     * @param  ConnectionInterface $con
+     * @param      ConnectionInterface $con
-     * @return int                 The number of rows affected by this insert/update and any referring fk objects' save() operations.
+     * @return int             The number of rows affected by this insert/update and any referring fk objects' save() operations.
      * @throws PropelException
      * @see save()
      */
@@ -982,7 +1002,7 @@ abstract class AdminLog implements ActiveRecordInterface
     /**
      * Insert the row in the database.
      *
-     * @param ConnectionInterface $con
+     * @param      ConnectionInterface $con
      *
      * @throws PropelException
      * @see doSave()
@@ -1090,7 +1110,7 @@ abstract class AdminLog implements ActiveRecordInterface
     /**
      * Update the row in the database.
      *
-     * @param ConnectionInterface $con
+     * @param      ConnectionInterface $con
      *
      * @return Integer Number of updated rows
      * @see doSave()
@@ -1106,12 +1126,12 @@ abstract class AdminLog implements ActiveRecordInterface
     /**
      * Retrieves a field from the object by name passed in as a string.
      *
-     * @param  string $name name
+     * @param      string $name name
-     * @param  string $type The type of fieldname the $name is of:
+     * @param      string $type The type of fieldname the $name is of:
-     *                      one of the class type constants TableMap::TYPE_PHPNAME, TableMap::TYPE_STUDLYPHPNAME
+     *                     one of the class type constants TableMap::TYPE_PHPNAME, TableMap::TYPE_STUDLYPHPNAME
-     *                      TableMap::TYPE_COLNAME, TableMap::TYPE_FIELDNAME, TableMap::TYPE_NUM.
+     *                     TableMap::TYPE_COLNAME, TableMap::TYPE_FIELDNAME, TableMap::TYPE_NUM.
-     *                      Defaults to TableMap::TYPE_PHPNAME.
+     *                     Defaults to TableMap::TYPE_PHPNAME.
-     * @return mixed  Value of field.
+     * @return mixed Value of field.
      */
     public function getByName($name, $type = TableMap::TYPE_PHPNAME)
     {
@@ -1125,7 +1145,7 @@ abstract class AdminLog implements ActiveRecordInterface
      * Retrieves a field from the object by Position as specified in the xml schema.
      * Zero-based.
      *
-     * @param  int   $pos position in xml schema
+     * @param      int $pos position in xml schema
      * @return mixed Value of field at $pos
      */
     public function getByPosition($pos)
@@ -1173,11 +1193,11 @@ abstract class AdminLog implements ActiveRecordInterface
      * You can specify the key type of the array by passing one of the class
      * type constants.
      *
-     * @param string  $keyType                (optional) One of the class type constants TableMap::TYPE_PHPNAME, TableMap::TYPE_STUDLYPHPNAME,
+     * @param     string  $keyType (optional) One of the class type constants TableMap::TYPE_PHPNAME, TableMap::TYPE_STUDLYPHPNAME,
-     *                                        TableMap::TYPE_COLNAME, TableMap::TYPE_FIELDNAME, TableMap::TYPE_NUM.
+     *                    TableMap::TYPE_COLNAME, TableMap::TYPE_FIELDNAME, TableMap::TYPE_NUM.
-     *                                        Defaults to TableMap::TYPE_PHPNAME.
+     *                    Defaults to TableMap::TYPE_PHPNAME.
-     * @param boolean $includeLazyLoadColumns (optional) Whether to include lazy loaded columns. Defaults to TRUE.
+     * @param     boolean $includeLazyLoadColumns (optional) Whether to include lazy loaded columns. Defaults to TRUE.
-     * @param array   $alreadyDumpedObjects   List of objects to skip to avoid recursion
+     * @param     array $alreadyDumpedObjects List of objects to skip to avoid recursion
      *
      * @return array an associative array containing the field names (as keys) and field values
      */
@@ -1205,18 +1225,19 @@ abstract class AdminLog implements ActiveRecordInterface
             $result[$key] = $virtualColumn;
         }
 
+
         return $result;
     }
 
     /**
      * Sets a field from the object by name passed in as a string.
      *
-     * @param  string $name
+     * @param      string $name
-     * @param  mixed  $value field value
+     * @param      mixed  $value field value
-     * @param  string $type  The type of fieldname the $name is of:
+     * @param      string $type The type of fieldname the $name is of:
-     *                       one of the class type constants TableMap::TYPE_PHPNAME, TableMap::TYPE_STUDLYPHPNAME
+     *                     one of the class type constants TableMap::TYPE_PHPNAME, TableMap::TYPE_STUDLYPHPNAME
-     *                       TableMap::TYPE_COLNAME, TableMap::TYPE_FIELDNAME, TableMap::TYPE_NUM.
+     *                     TableMap::TYPE_COLNAME, TableMap::TYPE_FIELDNAME, TableMap::TYPE_NUM.
-     *                       Defaults to TableMap::TYPE_PHPNAME.
+     *                     Defaults to TableMap::TYPE_PHPNAME.
      * @return void
      */
     public function setByName($name, $value, $type = TableMap::TYPE_PHPNAME)
@@ -1230,8 +1251,8 @@ abstract class AdminLog implements ActiveRecordInterface
      * Sets a field from the object by Position as specified in the xml schema.
      * Zero-based.
      *
-     * @param  int   $pos   position in xml schema
+     * @param      int $pos position in xml schema
-     * @param  mixed $value field value
+     * @param      mixed $value field value
      * @return void
      */
     public function setByPosition($pos, $value)
@@ -1283,8 +1304,8 @@ abstract class AdminLog implements ActiveRecordInterface
      * TableMap::TYPE_COLNAME, TableMap::TYPE_FIELDNAME, TableMap::TYPE_NUM.
      * The default key type is the column's TableMap::TYPE_PHPNAME.
      *
-     * @param  array  $arr     An array to populate the object from.
+     * @param      array  $arr     An array to populate the object from.
-     * @param  string $keyType The type of keys the array uses.
+     * @param      string $keyType The type of keys the array uses.
      * @return void
      */
     public function fromArray($arr, $keyType = TableMap::TYPE_PHPNAME)
@@ -1322,6 +1343,7 @@ abstract class AdminLog implements ActiveRecordInterface
         if ($this->isColumnModified(AdminLogTableMap::REQUEST)) $criteria->add(AdminLogTableMap::REQUEST, $this->request);
         if ($this->isColumnModified(AdminLogTableMap::CREATED_AT)) $criteria->add(AdminLogTableMap::CREATED_AT, $this->created_at);
         if ($this->isColumnModified(AdminLogTableMap::UPDATED_AT)) $criteria->add(AdminLogTableMap::UPDATED_AT, $this->updated_at);
+
         return $criteria;
     }
 
@@ -1343,7 +1365,7 @@ abstract class AdminLog implements ActiveRecordInterface
 
     /**
      * Returns the primary key for this object (row).
-     * @return int
+     * @return   int
      */
     public function getPrimaryKey()
     {
@@ -1353,7 +1375,7 @@ abstract class AdminLog implements ActiveRecordInterface
     /**
      * Generic method to set the primary key (id column).
      *
-     * @param  int  $key Primary key.
+     * @param       int $key Primary key.
      * @return void
      */
     public function setPrimaryKey($key)
@@ -1367,6 +1389,7 @@ abstract class AdminLog implements ActiveRecordInterface
      */
     public function isPrimaryKeyNull()
     {
+
         return null === $this->getId();
     }
 
@@ -1376,9 +1399,9 @@ abstract class AdminLog implements ActiveRecordInterface
      * If desired, this method can also make copies of all associated (fkey referrers)
      * objects.
      *
-     * @param  object          $copyObj  An object of \Thelia\Model\AdminLog (or compatible) type.
+     * @param      object $copyObj An object of \Thelia\Model\AdminLog (or compatible) type.
-     * @param  boolean         $deepCopy Whether to also copy all rows that refer (by fkey) to the current row.
+     * @param      boolean $deepCopy Whether to also copy all rows that refer (by fkey) to the current row.
-     * @param  boolean         $makeNew  Whether to reset autoincrement PKs and make the object new.
+     * @param      boolean $makeNew Whether to reset autoincrement PKs and make the object new.
      * @throws PropelException
      */
     public function copyInto($copyObj, $deepCopy = false, $makeNew = true)
@@ -1406,8 +1429,8 @@ abstract class AdminLog implements ActiveRecordInterface
      * If desired, this method can also make copies of all associated (fkey referrers)
      * objects.
      *
-     * @param  boolean                $deepCopy Whether to also copy all rows that refer (by fkey) to the current row.
+     * @param      boolean $deepCopy Whether to also copy all rows that refer (by fkey) to the current row.
-     * @return \Thelia\Model\AdminLog Clone of current object.
+     * @return                 \Thelia\Model\AdminLog Clone of current object.
      * @throws PropelException
      */
     public function copy($deepCopy = false)
@@ -1449,7 +1472,7 @@ abstract class AdminLog implements ActiveRecordInterface
      * objects with circular references (even in PHP 5.3). This is currently necessary
      * when using Propel in certain daemon or large-volume/high-memory operations.
      *
-     * @param boolean $deep Whether to also clear the references on all referrer objects.
+     * @param      boolean $deep Whether to also clear the references on all referrer objects.
      */
     public function clearAllReferences($deep = false)
     {
@@ -1473,7 +1496,7 @@ abstract class AdminLog implements ActiveRecordInterface
     /**
      * Mark the current object so that the update date doesn't get updated during next save
      *
-     * @return ChildAdminLog The current object (for fluent API support)
+     * @return     ChildAdminLog The current object (for fluent API support)
      */
     public function keepUpdateDateUnchanged()
     {

core/lib/Thelia/Model/Base/AdminLogQuery.php

@@ -76,9 +76,9 @@ abstract class AdminLogQuery extends ModelCriteria
     /**
      * Initializes internal state of \Thelia\Model\Base\AdminLogQuery object.
      *
-     * @param string $dbName     The database name
+     * @param     string $dbName The database name
-     * @param string $modelName  The phpName of a model, e.g. 'Book'
+     * @param     string $modelName The phpName of a model, e.g. 'Book'
-     * @param string $modelAlias The alias for the model in this query, e.g. 'b'
+     * @param     string $modelAlias The alias for the model in this query, e.g. 'b'
      */
     public function __construct($dbName = 'thelia', $modelName = '\\Thelia\\Model\\AdminLog', $modelAlias = null)
     {
@@ -88,8 +88,8 @@ abstract class AdminLogQuery extends ModelCriteria
     /**
      * Returns a new ChildAdminLogQuery object.
      *
-     * @param string   $modelAlias The alias of a model in the query
+     * @param     string $modelAlias The alias of a model in the query
-     * @param Criteria $criteria   Optional Criteria to build the query from
+     * @param     Criteria $criteria Optional Criteria to build the query from
      *
      * @return ChildAdminLogQuery
      */
@@ -118,7 +118,7 @@ abstract class AdminLogQuery extends ModelCriteria
      * $obj  = $c->findPk(12, $con);
      * </code>
      *
-     * @param mixed               $key Primary key to use for the query
+     * @param mixed $key Primary key to use for the query
      * @param ConnectionInterface $con an optional connection object
      *
      * @return ChildAdminLog|array|mixed the result, formatted by the current formatter
@@ -149,10 +149,10 @@ abstract class AdminLogQuery extends ModelCriteria
      * Find object by primary key using raw SQL to go fast.
      * Bypass doSelect() and the object formatter by using generated code.
      *
-     * @param mixed               $key Primary key to use for the query
+     * @param     mixed $key Primary key to use for the query
-     * @param ConnectionInterface $con A connection object
+     * @param     ConnectionInterface $con A connection object
      *
-     * @return ChildAdminLog A model object, or null if the key is not found
+     * @return   ChildAdminLog A model object, or null if the key is not found
      */
     protected function findPkSimple($key, $con)
     {
@@ -179,8 +179,8 @@ abstract class AdminLogQuery extends ModelCriteria
     /**
      * Find object by primary key.
      *
-     * @param mixed               $key Primary key to use for the query
+     * @param     mixed $key Primary key to use for the query
-     * @param ConnectionInterface $con A connection object
+     * @param     ConnectionInterface $con A connection object
      *
      * @return ChildAdminLog|array|mixed the result, formatted by the current formatter
      */
@@ -200,8 +200,8 @@ abstract class AdminLogQuery extends ModelCriteria
      * <code>
      * $objs = $c->findPks(array(12, 56, 832), $con);
      * </code>
-     * @param array               $keys Primary keys to use for the query
+     * @param     array $keys Primary keys to use for the query
-     * @param ConnectionInterface $con  an optional connection object
+     * @param     ConnectionInterface $con an optional connection object
      *
      * @return ObjectCollection|array|mixed the list of results, formatted by the current formatter
      */
@@ -222,24 +222,26 @@ abstract class AdminLogQuery extends ModelCriteria
     /**
      * Filter the query by primary key
      *
-     * @param mixed $key Primary key to use for the query
+     * @param     mixed $key Primary key to use for the query
      *
      * @return ChildAdminLogQuery The current query, for fluid interface
      */
     public function filterByPrimaryKey($key)
     {
+
         return $this->addUsingAlias(AdminLogTableMap::ID, $key, Criteria::EQUAL);
     }
 
     /**
      * Filter the query by a list of primary keys
      *
-     * @param array $keys The list of primary key to use for the query
+     * @param     array $keys The list of primary key to use for the query
      *
      * @return ChildAdminLogQuery The current query, for fluid interface
      */
     public function filterByPrimaryKeys($keys)
     {
+
         return $this->addUsingAlias(AdminLogTableMap::ID, $keys, Criteria::IN);
     }
 
@@ -253,11 +255,11 @@ abstract class AdminLogQuery extends ModelCriteria
      * $query->filterById(array('min' => 12)); // WHERE id > 12
      * </code>
      *
-     * @param mixed  $id         The value to use as filter.
+     * @param     mixed $id The value to use as filter.
-     *                           Use scalar values for equality.
+     *              Use scalar values for equality.
-     *                           Use array values for in_array() equivalent.
+     *              Use array values for in_array() equivalent.
-     *                           Use associative array('min' => $minValue, 'max' => $maxValue) for intervals.
+     *              Use associative array('min' => $minValue, 'max' => $maxValue) for intervals.
-     * @param string $comparison Operator to use for the column comparison, defaults to Criteria::EQUAL
+     * @param     string $comparison Operator to use for the column comparison, defaults to Criteria::EQUAL
      *
      * @return ChildAdminLogQuery The current query, for fluid interface
      */
@@ -293,9 +295,9 @@ abstract class AdminLogQuery extends ModelCriteria
      * $query->filterByAdminLogin('%fooValue%'); // WHERE admin_login LIKE '%fooValue%'
      * </code>
      *
-     * @param string $adminLogin The value to use as filter.
+     * @param     string $adminLogin The value to use as filter.
-     *                           Accepts wildcards (* and % trigger a LIKE)
+     *              Accepts wildcards (* and % trigger a LIKE)
-     * @param string $comparison Operator to use for the column comparison, defaults to Criteria::EQUAL
+     * @param     string $comparison Operator to use for the column comparison, defaults to Criteria::EQUAL
      *
      * @return ChildAdminLogQuery The current query, for fluid interface
      */
@@ -322,9 +324,9 @@ abstract class AdminLogQuery extends ModelCriteria
      * $query->filterByAdminFirstname('%fooValue%'); // WHERE admin_firstname LIKE '%fooValue%'
      * </code>
      *
-     * @param string $adminFirstname The value to use as filter.
+     * @param     string $adminFirstname The value to use as filter.
-     *                               Accepts wildcards (* and % trigger a LIKE)
+     *              Accepts wildcards (* and % trigger a LIKE)
-     * @param string $comparison     Operator to use for the column comparison, defaults to Criteria::EQUAL
+     * @param     string $comparison Operator to use for the column comparison, defaults to Criteria::EQUAL
      *
      * @return ChildAdminLogQuery The current query, for fluid interface
      */
@@ -351,9 +353,9 @@ abstract class AdminLogQuery extends ModelCriteria
      * $query->filterByAdminLastname('%fooValue%'); // WHERE admin_lastname LIKE '%fooValue%'
      * </code>
      *
-     * @param string $adminLastname The value to use as filter.
+     * @param     string $adminLastname The value to use as filter.
-     *                              Accepts wildcards (* and % trigger a LIKE)
+     *              Accepts wildcards (* and % trigger a LIKE)
-     * @param string $comparison    Operator to use for the column comparison, defaults to Criteria::EQUAL
+     * @param     string $comparison Operator to use for the column comparison, defaults to Criteria::EQUAL
      *
      * @return ChildAdminLogQuery The current query, for fluid interface
      */
@@ -380,9 +382,9 @@ abstract class AdminLogQuery extends ModelCriteria
      * $query->filterByResource('%fooValue%'); // WHERE resource LIKE '%fooValue%'
      * </code>
      *
-     * @param string $resource   The value to use as filter.
+     * @param     string $resource The value to use as filter.
-     *                           Accepts wildcards (* and % trigger a LIKE)
+     *              Accepts wildcards (* and % trigger a LIKE)
-     * @param string $comparison Operator to use for the column comparison, defaults to Criteria::EQUAL
+     * @param     string $comparison Operator to use for the column comparison, defaults to Criteria::EQUAL
      *
      * @return ChildAdminLogQuery The current query, for fluid interface
      */
@@ -409,9 +411,9 @@ abstract class AdminLogQuery extends ModelCriteria
      * $query->filterByAction('%fooValue%'); // WHERE action LIKE '%fooValue%'
      * </code>
      *
-     * @param string $action     The value to use as filter.
+     * @param     string $action The value to use as filter.
-     *                           Accepts wildcards (* and % trigger a LIKE)
+     *              Accepts wildcards (* and % trigger a LIKE)
-     * @param string $comparison Operator to use for the column comparison, defaults to Criteria::EQUAL
+     * @param     string $comparison Operator to use for the column comparison, defaults to Criteria::EQUAL
      *
      * @return ChildAdminLogQuery The current query, for fluid interface
      */
@@ -438,9 +440,9 @@ abstract class AdminLogQuery extends ModelCriteria
      * $query->filterByMessage('%fooValue%'); // WHERE message LIKE '%fooValue%'
      * </code>
      *
-     * @param string $message    The value to use as filter.
+     * @param     string $message The value to use as filter.
-     *                           Accepts wildcards (* and % trigger a LIKE)
+     *              Accepts wildcards (* and % trigger a LIKE)
-     * @param string $comparison Operator to use for the column comparison, defaults to Criteria::EQUAL
+     * @param     string $comparison Operator to use for the column comparison, defaults to Criteria::EQUAL
      *
      * @return ChildAdminLogQuery The current query, for fluid interface
      */
@@ -467,9 +469,9 @@ abstract class AdminLogQuery extends ModelCriteria
      * $query->filterByRequest('%fooValue%'); // WHERE request LIKE '%fooValue%'
      * </code>
      *
-     * @param string $request    The value to use as filter.
+     * @param     string $request The value to use as filter.
-     *                           Accepts wildcards (* and % trigger a LIKE)
+     *              Accepts wildcards (* and % trigger a LIKE)
-     * @param string $comparison Operator to use for the column comparison, defaults to Criteria::EQUAL
+     * @param     string $comparison Operator to use for the column comparison, defaults to Criteria::EQUAL
      *
      * @return ChildAdminLogQuery The current query, for fluid interface
      */
@@ -497,13 +499,13 @@ abstract class AdminLogQuery extends ModelCriteria
      * $query->filterByCreatedAt(array('max' => 'yesterday')); // WHERE created_at > '2011-03-13'
      * </code>
      *
-     * @param mixed  $createdAt  The value to use as filter.
+     * @param     mixed $createdAt The value to use as filter.
-     *                           Values can be integers (unix timestamps), DateTime objects, or strings.
+     *              Values can be integers (unix timestamps), DateTime objects, or strings.
-     *                           Empty strings are treated as NULL.
+     *              Empty strings are treated as NULL.
-     *                           Use scalar values for equality.
+     *              Use scalar values for equality.
-     *                           Use array values for in_array() equivalent.
+     *              Use array values for in_array() equivalent.
-     *                           Use associative array('min' => $minValue, 'max' => $maxValue) for intervals.
+     *              Use associative array('min' => $minValue, 'max' => $maxValue) for intervals.
-     * @param string $comparison Operator to use for the column comparison, defaults to Criteria::EQUAL
+     * @param     string $comparison Operator to use for the column comparison, defaults to Criteria::EQUAL
      *
      * @return ChildAdminLogQuery The current query, for fluid interface
      */
@@ -540,13 +542,13 @@ abstract class AdminLogQuery extends ModelCriteria
      * $query->filterByUpdatedAt(array('max' => 'yesterday')); // WHERE updated_at > '2011-03-13'
      * </code>
      *
-     * @param mixed  $updatedAt  The value to use as filter.
+     * @param     mixed $updatedAt The value to use as filter.
-     *                           Values can be integers (unix timestamps), DateTime objects, or strings.
+     *              Values can be integers (unix timestamps), DateTime objects, or strings.
-     *                           Empty strings are treated as NULL.
+     *              Empty strings are treated as NULL.
-     *                           Use scalar values for equality.
+     *              Use scalar values for equality.
-     *                           Use array values for in_array() equivalent.
+     *              Use array values for in_array() equivalent.
-     *                           Use associative array('min' => $minValue, 'max' => $maxValue) for intervals.
+     *              Use associative array('min' => $minValue, 'max' => $maxValue) for intervals.
-     * @param string $comparison Operator to use for the column comparison, defaults to Criteria::EQUAL
+     * @param     string $comparison Operator to use for the column comparison, defaults to Criteria::EQUAL
      *
      * @return ChildAdminLogQuery The current query, for fluid interface
      */
@@ -576,7 +578,7 @@ abstract class AdminLogQuery extends ModelCriteria
     /**
      * Exclude object from result
      *
-     * @param ChildAdminLog $adminLog Object to remove from the list of results
+     * @param   ChildAdminLog $adminLog Object to remove from the list of results
      *
      * @return ChildAdminLogQuery The current query, for fluid interface
      */
@@ -592,8 +594,8 @@ abstract class AdminLogQuery extends ModelCriteria
     /**
      * Deletes all rows from the admin_log table.
      *
-     * @param  ConnectionInterface $con the connection to use
+     * @param ConnectionInterface $con the connection to use
-     * @return int                 The number of affected rows (if supported by underlying database driver).
+     * @return int The number of affected rows (if supported by underlying database driver).
      */
     public function doDeleteAll(ConnectionInterface $con = null)
     {
@@ -624,13 +626,13 @@ abstract class AdminLogQuery extends ModelCriteria
     /**
      * Performs a DELETE on the database, given a ChildAdminLog or Criteria object OR a primary key value.
      *
-     * @param  mixed               $values Criteria or ChildAdminLog object or primary key or array of primary keys
+     * @param mixed               $values Criteria or ChildAdminLog object or primary key or array of primary keys
-     *                                     which is used to create the DELETE statement
+     *              which is used to create the DELETE statement
-     * @param  ConnectionInterface $con    the connection to use
+     * @param ConnectionInterface $con the connection to use
-     * @return int                 The number of affected rows (if supported by underlying database driver).  This includes CASCADE-related rows
+     * @return int The number of affected rows (if supported by underlying database driver).  This includes CASCADE-related rows
-     *                                    if supported by native driver or if emulated using Propel.
+     *                if supported by native driver or if emulated using Propel.
-     * @throws PropelException     Any exceptions caught during processing will be
+     * @throws PropelException Any exceptions caught during processing will be
-     *                                    rethrown wrapped into a PropelException.
+     *         rethrown wrapped into a PropelException.
      */
      public function delete(ConnectionInterface $con = null)
      {
@@ -650,6 +652,7 @@ abstract class AdminLogQuery extends ModelCriteria
             // for more than one table or we could emulating ON DELETE CASCADE, etc.
             $con->beginTransaction();
 
+
         AdminLogTableMap::removeInstanceFromPool($criteria);
 
             $affectedRows += ModelCriteria::delete($con);
@@ -668,9 +671,9 @@ abstract class AdminLogQuery extends ModelCriteria
     /**
      * Filter by the latest updated
      *
-     * @param int $nbDays Maximum age of the latest update in days
+     * @param      int $nbDays Maximum age of the latest update in days
      *
-     * @return ChildAdminLogQuery The current query, for fluid interface
+     * @return     ChildAdminLogQuery The current query, for fluid interface
      */
     public function recentlyUpdated($nbDays = 7)
     {
@@ -680,9 +683,9 @@ abstract class AdminLogQuery extends ModelCriteria
     /**
      * Filter by the latest created
      *
-     * @param int $nbDays Maximum age of in days
+     * @param      int $nbDays Maximum age of in days
      *
-     * @return ChildAdminLogQuery The current query, for fluid interface
+     * @return     ChildAdminLogQuery The current query, for fluid interface
      */
     public function recentlyCreated($nbDays = 7)
     {
@@ -692,7 +695,7 @@ abstract class AdminLogQuery extends ModelCriteria
     /**
      * Order by update date desc
      *
-     * @return ChildAdminLogQuery The current query, for fluid interface
+     * @return     ChildAdminLogQuery The current query, for fluid interface
      */
     public function lastUpdatedFirst()
     {
@@ -702,7 +705,7 @@ abstract class AdminLogQuery extends ModelCriteria
     /**
      * Order by update date asc
      *
-     * @return ChildAdminLogQuery The current query, for fluid interface
+     * @return     ChildAdminLogQuery The current query, for fluid interface
      */
     public function firstUpdatedFirst()
     {
@@ -712,7 +715,7 @@ abstract class AdminLogQuery extends ModelCriteria
     /**
      * Order by create date desc
      *
-     * @return ChildAdminLogQuery The current query, for fluid interface
+     * @return     ChildAdminLogQuery The current query, for fluid interface
      */
     public function lastCreatedFirst()
     {
@@ -722,7 +725,7 @@ abstract class AdminLogQuery extends ModelCriteria
     /**
      * Order by create date asc
      *
-     * @return ChildAdminLogQuery The current query, for fluid interface
+     * @return     ChildAdminLogQuery The current query, for fluid interface
      */
     public function firstCreatedFirst()
     {

core/lib/Thelia/Model/Base/AdminQuery.php

@@ -95,9 +95,9 @@ abstract class AdminQuery extends ModelCriteria
     /**
      * Initializes internal state of \Thelia\Model\Base\AdminQuery object.
      *
-     * @param string $dbName     The database name
+     * @param     string $dbName The database name
-     * @param string $modelName  The phpName of a model, e.g. 'Book'
+     * @param     string $modelName The phpName of a model, e.g. 'Book'
-     * @param string $modelAlias The alias for the model in this query, e.g. 'b'
+     * @param     string $modelAlias The alias for the model in this query, e.g. 'b'
      */
     public function __construct($dbName = 'thelia', $modelName = '\\Thelia\\Model\\Admin', $modelAlias = null)
     {
@@ -107,8 +107,8 @@ abstract class AdminQuery extends ModelCriteria
     /**
      * Returns a new ChildAdminQuery object.
      *
-     * @param string   $modelAlias The alias of a model in the query
+     * @param     string $modelAlias The alias of a model in the query
-     * @param Criteria $criteria   Optional Criteria to build the query from
+     * @param     Criteria $criteria Optional Criteria to build the query from
      *
      * @return ChildAdminQuery
      */
@@ -137,7 +137,7 @@ abstract class AdminQuery extends ModelCriteria
      * $obj  = $c->findPk(12, $con);
      * </code>
      *
-     * @param mixed               $key Primary key to use for the query
+     * @param mixed $key Primary key to use for the query
      * @param ConnectionInterface $con an optional connection object
      *
      * @return ChildAdmin|array|mixed the result, formatted by the current formatter
@@ -168,10 +168,10 @@ abstract class AdminQuery extends ModelCriteria
      * Find object by primary key using raw SQL to go fast.
      * Bypass doSelect() and the object formatter by using generated code.
      *
-     * @param mixed               $key Primary key to use for the query
+     * @param     mixed $key Primary key to use for the query
-     * @param ConnectionInterface $con A connection object
+     * @param     ConnectionInterface $con A connection object
      *
-     * @return ChildAdmin A model object, or null if the key is not found
+     * @return   ChildAdmin A model object, or null if the key is not found
      */
     protected function findPkSimple($key, $con)
     {
@@ -198,8 +198,8 @@ abstract class AdminQuery extends ModelCriteria
     /**
      * Find object by primary key.
      *
-     * @param mixed               $key Primary key to use for the query
+     * @param     mixed $key Primary key to use for the query
-     * @param ConnectionInterface $con A connection object
+     * @param     ConnectionInterface $con A connection object
      *
      * @return ChildAdmin|array|mixed the result, formatted by the current formatter
      */
@@ -219,8 +219,8 @@ abstract class AdminQuery extends ModelCriteria
      * <code>
      * $objs = $c->findPks(array(12, 56, 832), $con);
      * </code>
-     * @param array               $keys Primary keys to use for the query
+     * @param     array $keys Primary keys to use for the query
-     * @param ConnectionInterface $con  an optional connection object
+     * @param     ConnectionInterface $con an optional connection object
      *
      * @return ObjectCollection|array|mixed the list of results, formatted by the current formatter
      */
@@ -241,24 +241,26 @@ abstract class AdminQuery extends ModelCriteria
     /**
      * Filter the query by primary key
      *
-     * @param mixed $key Primary key to use for the query
+     * @param     mixed $key Primary key to use for the query
      *
      * @return ChildAdminQuery The current query, for fluid interface
      */
     public function filterByPrimaryKey($key)
     {
+
         return $this->addUsingAlias(AdminTableMap::ID, $key, Criteria::EQUAL);
     }
 
     /**
      * Filter the query by a list of primary keys
      *
-     * @param array $keys The list of primary key to use for the query
+     * @param     array $keys The list of primary key to use for the query
      *
      * @return ChildAdminQuery The current query, for fluid interface
      */
     public function filterByPrimaryKeys($keys)
     {
+
         return $this->addUsingAlias(AdminTableMap::ID, $keys, Criteria::IN);
     }
 
@@ -272,11 +274,11 @@ abstract class AdminQuery extends ModelCriteria
      * $query->filterById(array('min' => 12)); // WHERE id > 12
      * </code>
      *
-     * @param mixed  $id         The value to use as filter.
+     * @param     mixed $id The value to use as filter.
-     *                           Use scalar values for equality.
+     *              Use scalar values for equality.
-     *                           Use array values for in_array() equivalent.
+     *              Use array values for in_array() equivalent.
-     *                           Use associative array('min' => $minValue, 'max' => $maxValue) for intervals.
+     *              Use associative array('min' => $minValue, 'max' => $maxValue) for intervals.
-     * @param string $comparison Operator to use for the column comparison, defaults to Criteria::EQUAL
+     * @param     string $comparison Operator to use for the column comparison, defaults to Criteria::EQUAL
      *
      * @return ChildAdminQuery The current query, for fluid interface
      */
@@ -315,11 +317,11 @@ abstract class AdminQuery extends ModelCriteria
      *
      * @see       filterByProfile()
      *
-     * @param mixed  $profileId  The value to use as filter.
+     * @param     mixed $profileId The value to use as filter.
-     *                           Use scalar values for equality.
+     *              Use scalar values for equality.
-     *                           Use array values for in_array() equivalent.
+     *              Use array values for in_array() equivalent.
-     *                           Use associative array('min' => $minValue, 'max' => $maxValue) for intervals.
+     *              Use associative array('min' => $minValue, 'max' => $maxValue) for intervals.
-     * @param string $comparison Operator to use for the column comparison, defaults to Criteria::EQUAL
+     * @param     string $comparison Operator to use for the column comparison, defaults to Criteria::EQUAL
      *
      * @return ChildAdminQuery The current query, for fluid interface
      */
@@ -355,9 +357,9 @@ abstract class AdminQuery extends ModelCriteria
      * $query->filterByFirstname('%fooValue%'); // WHERE firstname LIKE '%fooValue%'
      * </code>
      *
-     * @param string $firstname  The value to use as filter.
+     * @param     string $firstname The value to use as filter.
-     *                           Accepts wildcards (* and % trigger a LIKE)
+     *              Accepts wildcards (* and % trigger a LIKE)
-     * @param string $comparison Operator to use for the column comparison, defaults to Criteria::EQUAL
+     * @param     string $comparison Operator to use for the column comparison, defaults to Criteria::EQUAL
      *
      * @return ChildAdminQuery The current query, for fluid interface
      */
@@ -384,9 +386,9 @@ abstract class AdminQuery extends ModelCriteria
      * $query->filterByLastname('%fooValue%'); // WHERE lastname LIKE '%fooValue%'
      * </code>
      *
-     * @param string $lastname   The value to use as filter.
+     * @param     string $lastname The value to use as filter.
-     *                           Accepts wildcards (* and % trigger a LIKE)
+     *              Accepts wildcards (* and % trigger a LIKE)
-     * @param string $comparison Operator to use for the column comparison, defaults to Criteria::EQUAL
+     * @param     string $comparison Operator to use for the column comparison, defaults to Criteria::EQUAL
      *
      * @return ChildAdminQuery The current query, for fluid interface
      */
@@ -413,9 +415,9 @@ abstract class AdminQuery extends ModelCriteria
      * $query->filterByLogin('%fooValue%'); // WHERE login LIKE '%fooValue%'
      * </code>
      *
-     * @param string $login      The value to use as filter.
+     * @param     string $login The value to use as filter.
-     *                           Accepts wildcards (* and % trigger a LIKE)
+     *              Accepts wildcards (* and % trigger a LIKE)
-     * @param string $comparison Operator to use for the column comparison, defaults to Criteria::EQUAL
+     * @param     string $comparison Operator to use for the column comparison, defaults to Criteria::EQUAL
      *
      * @return ChildAdminQuery The current query, for fluid interface
      */
@@ -442,9 +444,9 @@ abstract class AdminQuery extends ModelCriteria
      * $query->filterByPassword('%fooValue%'); // WHERE password LIKE '%fooValue%'
      * </code>
      *
-     * @param string $password   The value to use as filter.
+     * @param     string $password The value to use as filter.
-     *                           Accepts wildcards (* and % trigger a LIKE)
+     *              Accepts wildcards (* and % trigger a LIKE)
-     * @param string $comparison Operator to use for the column comparison, defaults to Criteria::EQUAL
+     * @param     string $comparison Operator to use for the column comparison, defaults to Criteria::EQUAL
      *
      * @return ChildAdminQuery The current query, for fluid interface
      */
@@ -471,9 +473,9 @@ abstract class AdminQuery extends ModelCriteria
      * $query->filterByLocale('%fooValue%'); // WHERE locale LIKE '%fooValue%'
      * </code>
      *
-     * @param string $locale     The value to use as filter.
+     * @param     string $locale The value to use as filter.
-     *                           Accepts wildcards (* and % trigger a LIKE)
+     *              Accepts wildcards (* and % trigger a LIKE)
-     * @param string $comparison Operator to use for the column comparison, defaults to Criteria::EQUAL
+     * @param     string $comparison Operator to use for the column comparison, defaults to Criteria::EQUAL
      *
      * @return ChildAdminQuery The current query, for fluid interface
      */
@@ -500,9 +502,9 @@ abstract class AdminQuery extends ModelCriteria
      * $query->filterByAlgo('%fooValue%'); // WHERE algo LIKE '%fooValue%'
      * </code>
      *
-     * @param string $algo       The value to use as filter.
+     * @param     string $algo The value to use as filter.
-     *                           Accepts wildcards (* and % trigger a LIKE)
+     *              Accepts wildcards (* and % trigger a LIKE)
-     * @param string $comparison Operator to use for the column comparison, defaults to Criteria::EQUAL
+     * @param     string $comparison Operator to use for the column comparison, defaults to Criteria::EQUAL
      *
      * @return ChildAdminQuery The current query, for fluid interface
      */
@@ -529,9 +531,9 @@ abstract class AdminQuery extends ModelCriteria
      * $query->filterBySalt('%fooValue%'); // WHERE salt LIKE '%fooValue%'
      * </code>
      *
-     * @param string $salt       The value to use as filter.
+     * @param     string $salt The value to use as filter.
-     *                           Accepts wildcards (* and % trigger a LIKE)
+     *              Accepts wildcards (* and % trigger a LIKE)
-     * @param string $comparison Operator to use for the column comparison, defaults to Criteria::EQUAL
+     * @param     string $comparison Operator to use for the column comparison, defaults to Criteria::EQUAL
      *
      * @return ChildAdminQuery The current query, for fluid interface
      */
@@ -558,9 +560,9 @@ abstract class AdminQuery extends ModelCriteria
      * $query->filterByRememberMeToken('%fooValue%'); // WHERE remember_me_token LIKE '%fooValue%'
      * </code>
      *
-     * @param string $rememberMeToken The value to use as filter.
+     * @param     string $rememberMeToken The value to use as filter.
-     *                                Accepts wildcards (* and % trigger a LIKE)
+     *              Accepts wildcards (* and % trigger a LIKE)
-     * @param string $comparison      Operator to use for the column comparison, defaults to Criteria::EQUAL
+     * @param     string $comparison Operator to use for the column comparison, defaults to Criteria::EQUAL
      *
      * @return ChildAdminQuery The current query, for fluid interface
      */
@@ -587,9 +589,9 @@ abstract class AdminQuery extends ModelCriteria
      * $query->filterByRememberMeSerial('%fooValue%'); // WHERE remember_me_serial LIKE '%fooValue%'
      * </code>
      *
-     * @param string $rememberMeSerial The value to use as filter.
+     * @param     string $rememberMeSerial The value to use as filter.
-     *                                 Accepts wildcards (* and % trigger a LIKE)
+     *              Accepts wildcards (* and % trigger a LIKE)
-     * @param string $comparison       Operator to use for the column comparison, defaults to Criteria::EQUAL
+     * @param     string $comparison Operator to use for the column comparison, defaults to Criteria::EQUAL
      *
      * @return ChildAdminQuery The current query, for fluid interface
      */
@@ -617,13 +619,13 @@ abstract class AdminQuery extends ModelCriteria
      * $query->filterByCreatedAt(array('max' => 'yesterday')); // WHERE created_at > '2011-03-13'
      * </code>
      *
-     * @param mixed  $createdAt  The value to use as filter.
+     * @param     mixed $createdAt The value to use as filter.
-     *                           Values can be integers (unix timestamps), DateTime objects, or strings.
+     *              Values can be integers (unix timestamps), DateTime objects, or strings.
-     *                           Empty strings are treated as NULL.
+     *              Empty strings are treated as NULL.
-     *                           Use scalar values for equality.
+     *              Use scalar values for equality.
-     *                           Use array values for in_array() equivalent.
+     *              Use array values for in_array() equivalent.
-     *                           Use associative array('min' => $minValue, 'max' => $maxValue) for intervals.
+     *              Use associative array('min' => $minValue, 'max' => $maxValue) for intervals.
-     * @param string $comparison Operator to use for the column comparison, defaults to Criteria::EQUAL
+     * @param     string $comparison Operator to use for the column comparison, defaults to Criteria::EQUAL
      *
      * @return ChildAdminQuery The current query, for fluid interface
      */
@@ -660,13 +662,13 @@ abstract class AdminQuery extends ModelCriteria
      * $query->filterByUpdatedAt(array('max' => 'yesterday')); // WHERE updated_at > '2011-03-13'
      * </code>
      *
-     * @param mixed  $updatedAt  The value to use as filter.
+     * @param     mixed $updatedAt The value to use as filter.
-     *                           Values can be integers (unix timestamps), DateTime objects, or strings.
+     *              Values can be integers (unix timestamps), DateTime objects, or strings.
-     *                           Empty strings are treated as NULL.
+     *              Empty strings are treated as NULL.
-     *                           Use scalar values for equality.
+     *              Use scalar values for equality.
-     *                           Use array values for in_array() equivalent.
+     *              Use array values for in_array() equivalent.
-     *                           Use associative array('min' => $minValue, 'max' => $maxValue) for intervals.
+     *              Use associative array('min' => $minValue, 'max' => $maxValue) for intervals.
-     * @param string $comparison Operator to use for the column comparison, defaults to Criteria::EQUAL
+     * @param     string $comparison Operator to use for the column comparison, defaults to Criteria::EQUAL
      *
      * @return ChildAdminQuery The current query, for fluid interface
      */
@@ -696,8 +698,8 @@ abstract class AdminQuery extends ModelCriteria
     /**
      * Filter the query by a related \Thelia\Model\Profile object
      *
-     * @param \Thelia\Model\Profile|ObjectCollection $profile    The related object(s) to use as filter
+     * @param \Thelia\Model\Profile|ObjectCollection $profile The related object(s) to use as filter
-     * @param string                                 $comparison Operator to use for the column comparison, defaults to Criteria::EQUAL
+     * @param string $comparison Operator to use for the column comparison, defaults to Criteria::EQUAL
      *
      * @return ChildAdminQuery The current query, for fluid interface
      */
@@ -721,8 +723,8 @@ abstract class AdminQuery extends ModelCriteria
     /**
      * Adds a JOIN clause to the query using the Profile relation
      *
-     * @param string $relationAlias optional alias for the relation
+     * @param     string $relationAlias optional alias for the relation
-     * @param string $joinType      Accepted values are null, 'left join', 'right join', 'inner join'
+     * @param     string $joinType Accepted values are null, 'left join', 'right join', 'inner join'
      *
      * @return ChildAdminQuery The current query, for fluid interface
      */
@@ -755,11 +757,11 @@ abstract class AdminQuery extends ModelCriteria
      *
      * @see useQuery()
      *
-     * @param string $relationAlias optional alias for the relation,
+     * @param     string $relationAlias optional alias for the relation,
-     *                              to be used as main alias in the secondary query
+     *                                   to be used as main alias in the secondary query
-     * @param string $joinType      Accepted values are null, 'left join', 'right join', 'inner join'
+     * @param     string $joinType Accepted values are null, 'left join', 'right join', 'inner join'
      *
-     * @return \Thelia\Model\ProfileQuery A secondary query class using the current class as primary query
+     * @return   \Thelia\Model\ProfileQuery A secondary query class using the current class as primary query
      */
     public function useProfileQuery($relationAlias = null, $joinType = Criteria::LEFT_JOIN)
     {
@@ -771,7 +773,7 @@ abstract class AdminQuery extends ModelCriteria
     /**
      * Exclude object from result
      *
-     * @param ChildAdmin $admin Object to remove from the list of results
+     * @param   ChildAdmin $admin Object to remove from the list of results
      *
      * @return ChildAdminQuery The current query, for fluid interface
      */
@@ -787,8 +789,8 @@ abstract class AdminQuery extends ModelCriteria
     /**
      * Deletes all rows from the admin table.
      *
-     * @param  ConnectionInterface $con the connection to use
+     * @param ConnectionInterface $con the connection to use
-     * @return int                 The number of affected rows (if supported by underlying database driver).
+     * @return int The number of affected rows (if supported by underlying database driver).
      */
     public function doDeleteAll(ConnectionInterface $con = null)
     {
@@ -819,13 +821,13 @@ abstract class AdminQuery extends ModelCriteria
     /**
      * Performs a DELETE on the database, given a ChildAdmin or Criteria object OR a primary key value.
      *
-     * @param  mixed               $values Criteria or ChildAdmin object or primary key or array of primary keys
+     * @param mixed               $values Criteria or ChildAdmin object or primary key or array of primary keys
-     *                                     which is used to create the DELETE statement
+     *              which is used to create the DELETE statement
-     * @param  ConnectionInterface $con    the connection to use
+     * @param ConnectionInterface $con the connection to use
-     * @return int                 The number of affected rows (if supported by underlying database driver).  This includes CASCADE-related rows
+     * @return int The number of affected rows (if supported by underlying database driver).  This includes CASCADE-related rows
-     *                                    if supported by native driver or if emulated using Propel.
+     *                if supported by native driver or if emulated using Propel.
-     * @throws PropelException     Any exceptions caught during processing will be
+     * @throws PropelException Any exceptions caught during processing will be
-     *                                    rethrown wrapped into a PropelException.
+     *         rethrown wrapped into a PropelException.
      */
      public function delete(ConnectionInterface $con = null)
      {
@@ -845,6 +847,7 @@ abstract class AdminQuery extends ModelCriteria
             // for more than one table or we could emulating ON DELETE CASCADE, etc.
             $con->beginTransaction();
 
+
         AdminTableMap::removeInstanceFromPool($criteria);
 
             $affectedRows += ModelCriteria::delete($con);
@@ -863,9 +866,9 @@ abstract class AdminQuery extends ModelCriteria
     /**
      * Filter by the latest updated
      *
-     * @param int $nbDays Maximum age of the latest update in days
+     * @param      int $nbDays Maximum age of the latest update in days
      *
-     * @return ChildAdminQuery The current query, for fluid interface
+     * @return     ChildAdminQuery The current query, for fluid interface
      */
     public function recentlyUpdated($nbDays = 7)
     {
@@ -875,9 +878,9 @@ abstract class AdminQuery extends ModelCriteria
     /**
      * Filter by the latest created
      *
-     * @param int $nbDays Maximum age of in days
+     * @param      int $nbDays Maximum age of in days
      *
-     * @return ChildAdminQuery The current query, for fluid interface
+     * @return     ChildAdminQuery The current query, for fluid interface
      */
     public function recentlyCreated($nbDays = 7)
     {
@@ -887,7 +890,7 @@ abstract class AdminQuery extends ModelCriteria
     /**
      * Order by update date desc
      *
-     * @return ChildAdminQuery The current query, for fluid interface
+     * @return     ChildAdminQuery The current query, for fluid interface
      */
     public function lastUpdatedFirst()
     {
@@ -897,7 +900,7 @@ abstract class AdminQuery extends ModelCriteria
     /**
      * Order by update date asc
      *
-     * @return ChildAdminQuery The current query, for fluid interface
+     * @return     ChildAdminQuery The current query, for fluid interface
      */
     public function firstUpdatedFirst()
     {
@@ -907,7 +910,7 @@ abstract class AdminQuery extends ModelCriteria
     /**
      * Order by create date desc
      *
-     * @return ChildAdminQuery The current query, for fluid interface
+     * @return     ChildAdminQuery The current query, for fluid interface
      */
     public function lastCreatedFirst()
     {
@@ -917,7 +920,7 @@ abstract class AdminQuery extends ModelCriteria
     /**
      * Order by create date asc
      *
-     * @return ChildAdminQuery The current query, for fluid interface
+     * @return     ChildAdminQuery The current query, for fluid interface
      */
     public function firstCreatedFirst()
     {

core/lib/Thelia/Model/Base/Area.php

@@ -32,6 +32,7 @@ abstract class Area implements ActiveRecordInterface
      */
     const TABLE_MAP = '\\Thelia\\Model\\Map\\AreaTableMap';
 
+
     /**
      * attribute to determine if this object has previously been saved.
      * @var boolean
@@ -329,9 +330,9 @@ abstract class Area implements ActiveRecordInterface
      * $book->importFrom('JSON', '{"Id":9012,"Title":"Don Juan","ISBN":"0140422161","Price":12.99,"PublisherId":1234,"AuthorId":5678}');
      * </code>
      *
-     * @param mixed  $parser A AbstractParser instance,
+     * @param mixed $parser A AbstractParser instance,
      *                       or a format name ('XML', 'YAML', 'JSON', 'CSV')
-     * @param string $data   The source data to import from
+     * @param string $data The source data to import from
      *
      * @return Area The current object, for fluid interface
      */
@@ -381,30 +382,33 @@ abstract class Area implements ActiveRecordInterface
     /**
      * Get the [id] column value.
      *
-     * @return int
+     * @return   int
      */
     public function getId()
     {
+
         return $this->id;
     }
 
     /**
      * Get the [name] column value.
      *
-     * @return string
+     * @return   string
      */
     public function getName()
     {
+
         return $this->name;
     }
 
     /**
      * Get the [postage] column value.
      *
-     * @return double
+     * @return   double
      */
     public function getPostage()
     {
+
         return $this->postage;
     }
 
@@ -412,8 +416,8 @@ abstract class Area implements ActiveRecordInterface
      * Get the [optionally formatted] temporal [created_at] column value.
      *
      *
-     * @param string $format The date/time format string (either date()-style or strftime()-style).
+     * @param      string $format The date/time format string (either date()-style or strftime()-style).
-     *                       If format is NULL, then the raw \DateTime object will be returned.
+     *                            If format is NULL, then the raw \DateTime object will be returned.
      *
      * @return mixed Formatted date/time value as string or \DateTime object (if format is NULL), NULL if column is NULL, and 0 if column value is 0000-00-00 00:00:00
      *
@@ -432,8 +436,8 @@ abstract class Area implements ActiveRecordInterface
      * Get the [optionally formatted] temporal [updated_at] column value.
      *
      *
-     * @param string $format The date/time format string (either date()-style or strftime()-style).
+     * @param      string $format The date/time format string (either date()-style or strftime()-style).
-     *                       If format is NULL, then the raw \DateTime object will be returned.
+     *                            If format is NULL, then the raw \DateTime object will be returned.
      *
      * @return mixed Formatted date/time value as string or \DateTime object (if format is NULL), NULL if column is NULL, and 0 if column value is 0000-00-00 00:00:00
      *
@@ -451,8 +455,8 @@ abstract class Area implements ActiveRecordInterface
     /**
      * Set the value of [id] column.
      *
-     * @param  int                $v new value
+     * @param      int $v new value
-     * @return \Thelia\Model\Area The current object (for fluent API support)
+     * @return   \Thelia\Model\Area The current object (for fluent API support)
      */
     public function setId($v)
     {
@@ -465,14 +469,15 @@ abstract class Area implements ActiveRecordInterface
             $this->modifiedColumns[AreaTableMap::ID] = true;
         }
 
+
         return $this;
     } // setId()
 
     /**
      * Set the value of [name] column.
      *
-     * @param  string             $v new value
+     * @param      string $v new value
-     * @return \Thelia\Model\Area The current object (for fluent API support)
+     * @return   \Thelia\Model\Area The current object (for fluent API support)
      */
     public function setName($v)
     {
@@ -485,14 +490,15 @@ abstract class Area implements ActiveRecordInterface
             $this->modifiedColumns[AreaTableMap::NAME] = true;
         }
 
+
         return $this;
     } // setName()
 
     /**
      * Set the value of [postage] column.
      *
-     * @param  double             $v new value
+     * @param      double $v new value
-     * @return \Thelia\Model\Area The current object (for fluent API support)
+     * @return   \Thelia\Model\Area The current object (for fluent API support)
      */
     public function setPostage($v)
     {
@@ -505,15 +511,16 @@ abstract class Area implements ActiveRecordInterface
             $this->modifiedColumns[AreaTableMap::POSTAGE] = true;
         }
 
+
         return $this;
     } // setPostage()
 
     /**
      * Sets the value of [created_at] column to a normalized version of the date/time value specified.
      *
-     * @param  mixed              $v string, integer (timestamp), or \DateTime value.
+     * @param      mixed $v string, integer (timestamp), or \DateTime value.
-     *                               Empty strings are treated as NULL.
+     *               Empty strings are treated as NULL.
-     * @return \Thelia\Model\Area The current object (for fluent API support)
+     * @return   \Thelia\Model\Area The current object (for fluent API support)
      */
     public function setCreatedAt($v)
     {
@@ -525,15 +532,16 @@ abstract class Area implements ActiveRecordInterface
             }
         } // if either are not null
 
+
         return $this;
     } // setCreatedAt()
 
     /**
      * Sets the value of [updated_at] column to a normalized version of the date/time value specified.
      *
-     * @param  mixed              $v string, integer (timestamp), or \DateTime value.
+     * @param      mixed $v string, integer (timestamp), or \DateTime value.
-     *                               Empty strings are treated as NULL.
+     *               Empty strings are treated as NULL.
-     * @return \Thelia\Model\Area The current object (for fluent API support)
+     * @return   \Thelia\Model\Area The current object (for fluent API support)
      */
     public function setUpdatedAt($v)
     {
@@ -545,6 +553,7 @@ abstract class Area implements ActiveRecordInterface
             }
         } // if either are not null
 
+
         return $this;
     } // setUpdatedAt()
 
@@ -642,10 +651,10 @@ abstract class Area implements ActiveRecordInterface
      *
      * This will only work if the object has been saved and has a valid primary key set.
      *
-     * @param  boolean             $deep (optional) Whether to also de-associated any related objects.
+     * @param      boolean $deep (optional) Whether to also de-associated any related objects.
-     * @param  ConnectionInterface $con  (optional) The ConnectionInterface connection to use.
+     * @param      ConnectionInterface $con (optional) The ConnectionInterface connection to use.
      * @return void
-     * @throws PropelException     - if this object is deleted, unsaved or doesn't have pk match in db
+     * @throws PropelException - if this object is deleted, unsaved or doesn't have pk match in db
      */
     public function reload($deep = false, ConnectionInterface $con = null)
     {
@@ -684,7 +693,7 @@ abstract class Area implements ActiveRecordInterface
     /**
      * Removes this object from datastore and sets delete attribute.
      *
-     * @param  ConnectionInterface $con
+     * @param      ConnectionInterface $con
      * @return void
      * @throws PropelException
      * @see Area::setDeleted()
@@ -727,8 +736,8 @@ abstract class Area implements ActiveRecordInterface
      * method.  This method wraps all precipitate database operations in a
      * single transaction.
      *
-     * @param  ConnectionInterface $con
+     * @param      ConnectionInterface $con
-     * @return int                 The number of rows affected by this insert/update and any referring fk objects' save() operations.
+     * @return int             The number of rows affected by this insert/update and any referring fk objects' save() operations.
      * @throws PropelException
      * @see doSave()
      */
@@ -789,8 +798,8 @@ abstract class Area implements ActiveRecordInterface
      * If the object is new, it inserts it; otherwise an update is performed.
      * All related objects are also updated in this method.
      *
-     * @param  ConnectionInterface $con
+     * @param      ConnectionInterface $con
-     * @return int                 The number of rows affected by this insert/update and any referring fk objects' save() operations.
+     * @return int             The number of rows affected by this insert/update and any referring fk objects' save() operations.
      * @throws PropelException
      * @see save()
      */
@@ -856,7 +865,7 @@ abstract class Area implements ActiveRecordInterface
     /**
      * Insert the row in the database.
      *
-     * @param ConnectionInterface $con
+     * @param      ConnectionInterface $con
      *
      * @throws PropelException
      * @see doSave()
@@ -934,7 +943,7 @@ abstract class Area implements ActiveRecordInterface
     /**
      * Update the row in the database.
      *
-     * @param ConnectionInterface $con
+     * @param      ConnectionInterface $con
      *
      * @return Integer Number of updated rows
      * @see doSave()
@@ -950,12 +959,12 @@ abstract class Area implements ActiveRecordInterface
     /**
      * Retrieves a field from the object by name passed in as a string.
      *
-     * @param  string $name name
+     * @param      string $name name
-     * @param  string $type The type of fieldname the $name is of:
+     * @param      string $type The type of fieldname the $name is of:
-     *                      one of the class type constants TableMap::TYPE_PHPNAME, TableMap::TYPE_STUDLYPHPNAME
+     *                     one of the class type constants TableMap::TYPE_PHPNAME, TableMap::TYPE_STUDLYPHPNAME
-     *                      TableMap::TYPE_COLNAME, TableMap::TYPE_FIELDNAME, TableMap::TYPE_NUM.
+     *                     TableMap::TYPE_COLNAME, TableMap::TYPE_FIELDNAME, TableMap::TYPE_NUM.
-     *                      Defaults to TableMap::TYPE_PHPNAME.
+     *                     Defaults to TableMap::TYPE_PHPNAME.
-     * @return mixed  Value of field.
+     * @return mixed Value of field.
      */
     public function getByName($name, $type = TableMap::TYPE_PHPNAME)
     {
@@ -969,7 +978,7 @@ abstract class Area implements ActiveRecordInterface
      * Retrieves a field from the object by Position as specified in the xml schema.
      * Zero-based.
      *
-     * @param  int   $pos position in xml schema
+     * @param      int $pos position in xml schema
      * @return mixed Value of field at $pos
      */
     public function getByPosition($pos)
@@ -1002,12 +1011,12 @@ abstract class Area implements ActiveRecordInterface
      * You can specify the key type of the array by passing one of the class
      * type constants.
      *
-     * @param string  $keyType                (optional) One of the class type constants TableMap::TYPE_PHPNAME, TableMap::TYPE_STUDLYPHPNAME,
+     * @param     string  $keyType (optional) One of the class type constants TableMap::TYPE_PHPNAME, TableMap::TYPE_STUDLYPHPNAME,
-     *                                        TableMap::TYPE_COLNAME, TableMap::TYPE_FIELDNAME, TableMap::TYPE_NUM.
+     *                    TableMap::TYPE_COLNAME, TableMap::TYPE_FIELDNAME, TableMap::TYPE_NUM.
-     *                                        Defaults to TableMap::TYPE_PHPNAME.
+     *                    Defaults to TableMap::TYPE_PHPNAME.
-     * @param boolean $includeLazyLoadColumns (optional) Whether to include lazy loaded columns. Defaults to TRUE.
+     * @param     boolean $includeLazyLoadColumns (optional) Whether to include lazy loaded columns. Defaults to TRUE.
-     * @param array   $alreadyDumpedObjects   List of objects to skip to avoid recursion
+     * @param     array $alreadyDumpedObjects List of objects to skip to avoid recursion
-     * @param boolean $includeForeignObjects  (optional) Whether to include hydrated related objects. Default to FALSE.
+     * @param     boolean $includeForeignObjects (optional) Whether to include hydrated related objects. Default to FALSE.
      *
      * @return array an associative array containing the field names (as keys) and field values
      */
@@ -1045,12 +1054,12 @@ abstract class Area implements ActiveRecordInterface
     /**
      * Sets a field from the object by name passed in as a string.
      *
-     * @param  string $name
+     * @param      string $name
-     * @param  mixed  $value field value
+     * @param      mixed  $value field value
-     * @param  string $type  The type of fieldname the $name is of:
+     * @param      string $type The type of fieldname the $name is of:
-     *                       one of the class type constants TableMap::TYPE_PHPNAME, TableMap::TYPE_STUDLYPHPNAME
+     *                     one of the class type constants TableMap::TYPE_PHPNAME, TableMap::TYPE_STUDLYPHPNAME
-     *                       TableMap::TYPE_COLNAME, TableMap::TYPE_FIELDNAME, TableMap::TYPE_NUM.
+     *                     TableMap::TYPE_COLNAME, TableMap::TYPE_FIELDNAME, TableMap::TYPE_NUM.
-     *                       Defaults to TableMap::TYPE_PHPNAME.
+     *                     Defaults to TableMap::TYPE_PHPNAME.
      * @return void
      */
     public function setByName($name, $value, $type = TableMap::TYPE_PHPNAME)
@@ -1064,8 +1073,8 @@ abstract class Area implements ActiveRecordInterface
      * Sets a field from the object by Position as specified in the xml schema.
      * Zero-based.
      *
-     * @param  int   $pos   position in xml schema
+     * @param      int $pos position in xml schema
-     * @param  mixed $value field value
+     * @param      mixed $value field value
      * @return void
      */
     public function setByPosition($pos, $value)
@@ -1102,8 +1111,8 @@ abstract class Area implements ActiveRecordInterface
      * TableMap::TYPE_COLNAME, TableMap::TYPE_FIELDNAME, TableMap::TYPE_NUM.
      * The default key type is the column's TableMap::TYPE_PHPNAME.
      *
-     * @param  array  $arr     An array to populate the object from.
+     * @param      array  $arr     An array to populate the object from.
-     * @param  string $keyType The type of keys the array uses.
+     * @param      string $keyType The type of keys the array uses.
      * @return void
      */
     public function fromArray($arr, $keyType = TableMap::TYPE_PHPNAME)
@@ -1131,6 +1140,7 @@ abstract class Area implements ActiveRecordInterface
         if ($this->isColumnModified(AreaTableMap::POSTAGE)) $criteria->add(AreaTableMap::POSTAGE, $this->postage);
         if ($this->isColumnModified(AreaTableMap::CREATED_AT)) $criteria->add(AreaTableMap::CREATED_AT, $this->created_at);
         if ($this->isColumnModified(AreaTableMap::UPDATED_AT)) $criteria->add(AreaTableMap::UPDATED_AT, $this->updated_at);
+
         return $criteria;
     }
 
@@ -1152,7 +1162,7 @@ abstract class Area implements ActiveRecordInterface
 
     /**
      * Returns the primary key for this object (row).
-     * @return int
+     * @return   int
      */
     public function getPrimaryKey()
     {
@@ -1162,7 +1172,7 @@ abstract class Area implements ActiveRecordInterface
     /**
      * Generic method to set the primary key (id column).
      *
-     * @param  int  $key Primary key.
+     * @param       int $key Primary key.
      * @return void
      */
     public function setPrimaryKey($key)
@@ -1176,6 +1186,7 @@ abstract class Area implements ActiveRecordInterface
      */
     public function isPrimaryKeyNull()
     {
+
         return null === $this->getId();
     }
 
@@ -1185,9 +1196,9 @@ abstract class Area implements ActiveRecordInterface
      * If desired, this method can also make copies of all associated (fkey referrers)
      * objects.
      *
-     * @param  object          $copyObj  An object of \Thelia\Model\Area (or compatible) type.
+     * @param      object $copyObj An object of \Thelia\Model\Area (or compatible) type.
-     * @param  boolean         $deepCopy Whether to also copy all rows that refer (by fkey) to the current row.
+     * @param      boolean $deepCopy Whether to also copy all rows that refer (by fkey) to the current row.
-     * @param  boolean         $makeNew  Whether to reset autoincrement PKs and make the object new.
+     * @param      boolean $makeNew Whether to reset autoincrement PKs and make the object new.
      * @throws PropelException
      */
     public function copyInto($copyObj, $deepCopy = false, $makeNew = true)
@@ -1230,8 +1241,8 @@ abstract class Area implements ActiveRecordInterface
      * If desired, this method can also make copies of all associated (fkey referrers)
      * objects.
      *
-     * @param  boolean            $deepCopy Whether to also copy all rows that refer (by fkey) to the current row.
+     * @param      boolean $deepCopy Whether to also copy all rows that refer (by fkey) to the current row.
-     * @return \Thelia\Model\Area Clone of current object.
+     * @return                 \Thelia\Model\Area Clone of current object.
      * @throws PropelException
      */
     public function copy($deepCopy = false)
@@ -1250,7 +1261,7 @@ abstract class Area implements ActiveRecordInterface
      * Avoids crafting an 'init[$relationName]s' method name
      * that wouldn't work when StandardEnglishPluralizer is used.
      *
-     * @param  string $relationName The name of the relation to initialize
+     * @param      string $relationName The name of the relation to initialize
      * @return void
      */
     public function initRelation($relationName)
@@ -1292,8 +1303,8 @@ abstract class Area implements ActiveRecordInterface
      * however, you may wish to override this method in your stub class to provide setting appropriate
      * to your application -- for example, setting the initial array to the values stored in database.
      *
-     * @param boolean $overrideExisting If set to true, the method call initializes
+     * @param      boolean $overrideExisting If set to true, the method call initializes
-     *                                  the collection even if it is not empty
+     *                                        the collection even if it is not empty
      *
      * @return void
      */
@@ -1315,8 +1326,8 @@ abstract class Area implements ActiveRecordInterface
      * If this ChildArea is new, it will return
      * an empty collection or the current collection; the criteria is ignored on a new object.
      *
-     * @param  Criteria                  $criteria optional Criteria object to narrow the query
+     * @param      Criteria $criteria optional Criteria object to narrow the query
-     * @param  ConnectionInterface       $con      optional connection object
+     * @param      ConnectionInterface $con optional connection object
      * @return Collection|ChildCountry[] List of ChildCountry objects
      * @throws PropelException
      */
@@ -1372,14 +1383,15 @@ abstract class Area implements ActiveRecordInterface
      * It will also schedule objects for deletion based on a diff between old objects (aka persisted)
      * and new objects from the given Propel collection.
      *
-     * @param  Collection          $countries A Propel collection.
+     * @param      Collection $countries A Propel collection.
-     * @param  ConnectionInterface $con       Optional connection object
+     * @param      ConnectionInterface $con Optional connection object
-     * @return ChildArea           The current object (for fluent API support)
+     * @return   ChildArea The current object (for fluent API support)
      */
     public function setCountries(Collection $countries, ConnectionInterface $con = null)
     {
         $countriesToDelete = $this->getCountries(new Criteria(), $con)->diff($countries);
 
+
         $this->countriesScheduledForDeletion = $countriesToDelete;
 
         foreach ($countriesToDelete as $countryRemoved) {
@@ -1400,10 +1412,10 @@ abstract class Area implements ActiveRecordInterface
     /**
      * Returns the number of related Country objects.
      *
-     * @param  Criteria            $criteria
+     * @param      Criteria $criteria
-     * @param  boolean             $distinct
+     * @param      boolean $distinct
-     * @param  ConnectionInterface $con
+     * @param      ConnectionInterface $con
-     * @return int                 Count of related Country objects.
+     * @return int             Count of related Country objects.
      * @throws PropelException
      */
     public function countCountries(Criteria $criteria = null, $distinct = false, ConnectionInterface $con = null)
@@ -1435,8 +1447,8 @@ abstract class Area implements ActiveRecordInterface
      * Method called to associate a ChildCountry object to this object
      * through the ChildCountry foreign key attribute.
      *
-     * @param  ChildCountry       $l ChildCountry
+     * @param    ChildCountry $l ChildCountry
-     * @return \Thelia\Model\Area The current object (for fluent API support)
+     * @return   \Thelia\Model\Area The current object (for fluent API support)
      */
     public function addCountry(ChildCountry $l)
     {
@@ -1462,7 +1474,7 @@ abstract class Area implements ActiveRecordInterface
     }
 
     /**
-     * @param  Country   $country The country object to remove.
+     * @param  Country $country The country object to remove.
      * @return ChildArea The current object (for fluent API support)
      */
     public function removeCountry($country)
@@ -1509,8 +1521,8 @@ abstract class Area implements ActiveRecordInterface
      * however, you may wish to override this method in your stub class to provide setting appropriate
      * to your application -- for example, setting the initial array to the values stored in database.
      *
-     * @param boolean $overrideExisting If set to true, the method call initializes
+     * @param      boolean $overrideExisting If set to true, the method call initializes
-     *                                  the collection even if it is not empty
+     *                                        the collection even if it is not empty
      *
      * @return void
      */
@@ -1532,8 +1544,8 @@ abstract class Area implements ActiveRecordInterface
      * If this ChildArea is new, it will return
      * an empty collection or the current collection; the criteria is ignored on a new object.
      *
-     * @param  Criteria                             $criteria optional Criteria object to narrow the query
+     * @param      Criteria $criteria optional Criteria object to narrow the query
-     * @param  ConnectionInterface                  $con      optional connection object
+     * @param      ConnectionInterface $con optional connection object
      * @return Collection|ChildAreaDeliveryModule[] List of ChildAreaDeliveryModule objects
      * @throws PropelException
      */
@@ -1589,14 +1601,15 @@ abstract class Area implements ActiveRecordInterface
      * It will also schedule objects for deletion based on a diff between old objects (aka persisted)
      * and new objects from the given Propel collection.
      *
-     * @param  Collection          $areaDeliveryModules A Propel collection.
+     * @param      Collection $areaDeliveryModules A Propel collection.
-     * @param  ConnectionInterface $con                 Optional connection object
+     * @param      ConnectionInterface $con Optional connection object
-     * @return ChildArea           The current object (for fluent API support)
+     * @return   ChildArea The current object (for fluent API support)
      */
     public function setAreaDeliveryModules(Collection $areaDeliveryModules, ConnectionInterface $con = null)
     {
         $areaDeliveryModulesToDelete = $this->getAreaDeliveryModules(new Criteria(), $con)->diff($areaDeliveryModules);
 
+
         $this->areaDeliveryModulesScheduledForDeletion = $areaDeliveryModulesToDelete;
 
         foreach ($areaDeliveryModulesToDelete as $areaDeliveryModuleRemoved) {
@@ -1617,10 +1630,10 @@ abstract class Area implements ActiveRecordInterface
     /**
      * Returns the number of related AreaDeliveryModule objects.
      *
-     * @param  Criteria            $criteria
+     * @param      Criteria $criteria
-     * @param  boolean             $distinct
+     * @param      boolean $distinct
-     * @param  ConnectionInterface $con
+     * @param      ConnectionInterface $con
-     * @return int                 Count of related AreaDeliveryModule objects.
+     * @return int             Count of related AreaDeliveryModule objects.
      * @throws PropelException
      */
     public function countAreaDeliveryModules(Criteria $criteria = null, $distinct = false, ConnectionInterface $con = null)
@@ -1652,8 +1665,8 @@ abstract class Area implements ActiveRecordInterface
      * Method called to associate a ChildAreaDeliveryModule object to this object
      * through the ChildAreaDeliveryModule foreign key attribute.
      *
-     * @param  ChildAreaDeliveryModule $l ChildAreaDeliveryModule
+     * @param    ChildAreaDeliveryModule $l ChildAreaDeliveryModule
-     * @return \Thelia\Model\Area      The current object (for fluent API support)
+     * @return   \Thelia\Model\Area The current object (for fluent API support)
      */
     public function addAreaDeliveryModule(ChildAreaDeliveryModule $l)
     {
@@ -1680,7 +1693,7 @@ abstract class Area implements ActiveRecordInterface
 
     /**
      * @param  AreaDeliveryModule $areaDeliveryModule The areaDeliveryModule object to remove.
-     * @return ChildArea          The current object (for fluent API support)
+     * @return ChildArea The current object (for fluent API support)
      */
     public function removeAreaDeliveryModule($areaDeliveryModule)
     {
@@ -1697,6 +1710,7 @@ abstract class Area implements ActiveRecordInterface
         return $this;
     }
 
+
     /**
      * If this collection has already been initialized with
      * an identical criteria, it returns the collection.
@@ -1708,9 +1722,9 @@ abstract class Area implements ActiveRecordInterface
      * api reasonable.  You can provide public methods for those you
      * actually need in Area.
      *
-     * @param  Criteria                             $criteria     optional Criteria object to narrow the query
+     * @param      Criteria $criteria optional Criteria object to narrow the query
-     * @param  ConnectionInterface                  $con          optional connection object
+     * @param      ConnectionInterface $con optional connection object
-     * @param  string                               $joinBehavior optional join type to use (defaults to Criteria::LEFT_JOIN)
+     * @param      string $joinBehavior optional join type to use (defaults to Criteria::LEFT_JOIN)
      * @return Collection|ChildAreaDeliveryModule[] List of ChildAreaDeliveryModule objects
      */
     public function getAreaDeliveryModulesJoinModule($criteria = null, $con = null, $joinBehavior = Criteria::LEFT_JOIN)
@@ -1745,7 +1759,7 @@ abstract class Area implements ActiveRecordInterface
      * objects with circular references (even in PHP 5.3). This is currently necessary
      * when using Propel in certain daemon or large-volume/high-memory operations.
      *
-     * @param boolean $deep Whether to also clear the references on all referrer objects.
+     * @param      boolean $deep Whether to also clear the references on all referrer objects.
      */
     public function clearAllReferences($deep = false)
     {
@@ -1781,7 +1795,7 @@ abstract class Area implements ActiveRecordInterface
     /**
      * Mark the current object so that the update date doesn't get updated during next save
      *
-     * @return ChildArea The current object (for fluent API support)
+     * @return     ChildArea The current object (for fluent API support)
      */
     public function keepUpdateDateUnchanged()
     {
@@ -1866,6 +1880,7 @@ abstract class Area implements ActiveRecordInterface
 
     }
 
+
     /**
      * Derived method to catches calls to undefined methods.
      *

core/lib/Thelia/Model/Base/AreaDeliveryModule.php

@@ -31,6 +31,7 @@ abstract class AreaDeliveryModule implements ActiveRecordInterface
      */
     const TABLE_MAP = '\\Thelia\\Model\\Map\\AreaDeliveryModuleTableMap';
 
+
     /**
      * attribute to determine if this object has previously been saved.
      * @var boolean
@@ -314,9 +315,9 @@ abstract class AreaDeliveryModule implements ActiveRecordInterface
      * $book->importFrom('JSON', '{"Id":9012,"Title":"Don Juan","ISBN":"0140422161","Price":12.99,"PublisherId":1234,"AuthorId":5678}');
      * </code>
      *
-     * @param mixed  $parser A AbstractParser instance,
+     * @param mixed $parser A AbstractParser instance,
      *                       or a format name ('XML', 'YAML', 'JSON', 'CSV')
-     * @param string $data   The source data to import from
+     * @param string $data The source data to import from
      *
      * @return AreaDeliveryModule The current object, for fluid interface
      */
@@ -366,30 +367,33 @@ abstract class AreaDeliveryModule implements ActiveRecordInterface
     /**
      * Get the [id] column value.
      *
-     * @return int
+     * @return   int
      */
     public function getId()
     {
+
         return $this->id;
     }
 
     /**
      * Get the [area_id] column value.
      *
-     * @return int
+     * @return   int
      */
     public function getAreaId()
     {
+
         return $this->area_id;
     }
 
     /**
      * Get the [delivery_module_id] column value.
      *
-     * @return int
+     * @return   int
      */
     public function getDeliveryModuleId()
     {
+
         return $this->delivery_module_id;
     }
 
@@ -397,8 +401,8 @@ abstract class AreaDeliveryModule implements ActiveRecordInterface
      * Get the [optionally formatted] temporal [created_at] column value.
      *
      *
-     * @param string $format The date/time format string (either date()-style or strftime()-style).
+     * @param      string $format The date/time format string (either date()-style or strftime()-style).
-     *                       If format is NULL, then the raw \DateTime object will be returned.
+     *                            If format is NULL, then the raw \DateTime object will be returned.
      *
      * @return mixed Formatted date/time value as string or \DateTime object (if format is NULL), NULL if column is NULL, and 0 if column value is 0000-00-00 00:00:00
      *
@@ -417,8 +421,8 @@ abstract class AreaDeliveryModule implements ActiveRecordInterface
      * Get the [optionally formatted] temporal [updated_at] column value.
      *
      *
-     * @param string $format The date/time format string (either date()-style or strftime()-style).
+     * @param      string $format The date/time format string (either date()-style or strftime()-style).
-     *                       If format is NULL, then the raw \DateTime object will be returned.
+     *                            If format is NULL, then the raw \DateTime object will be returned.
      *
      * @return mixed Formatted date/time value as string or \DateTime object (if format is NULL), NULL if column is NULL, and 0 if column value is 0000-00-00 00:00:00
      *
@@ -436,8 +440,8 @@ abstract class AreaDeliveryModule implements ActiveRecordInterface
     /**
      * Set the value of [id] column.
      *
-     * @param  int                              $v new value
+     * @param      int $v new value
-     * @return \Thelia\Model\AreaDeliveryModule The current object (for fluent API support)
+     * @return   \Thelia\Model\AreaDeliveryModule The current object (for fluent API support)
      */
     public function setId($v)
     {
@@ -450,14 +454,15 @@ abstract class AreaDeliveryModule implements ActiveRecordInterface
             $this->modifiedColumns[AreaDeliveryModuleTableMap::ID] = true;
         }
 
+
         return $this;
     } // setId()
 
     /**
      * Set the value of [area_id] column.
      *
-     * @param  int                              $v new value
+     * @param      int $v new value
-     * @return \Thelia\Model\AreaDeliveryModule The current object (for fluent API support)
+     * @return   \Thelia\Model\AreaDeliveryModule The current object (for fluent API support)
      */
     public function setAreaId($v)
     {
@@ -474,14 +479,15 @@ abstract class AreaDeliveryModule implements ActiveRecordInterface
             $this->aArea = null;
         }
 
+
         return $this;
     } // setAreaId()
 
     /**
      * Set the value of [delivery_module_id] column.
      *
-     * @param  int                              $v new value
+     * @param      int $v new value
-     * @return \Thelia\Model\AreaDeliveryModule The current object (for fluent API support)
+     * @return   \Thelia\Model\AreaDeliveryModule The current object (for fluent API support)
      */
     public function setDeliveryModuleId($v)
     {
@@ -498,15 +504,16 @@ abstract class AreaDeliveryModule implements ActiveRecordInterface
             $this->aModule = null;
         }
 
+
         return $this;
     } // setDeliveryModuleId()
 
     /**
      * Sets the value of [created_at] column to a normalized version of the date/time value specified.
      *
-     * @param  mixed                            $v string, integer (timestamp), or \DateTime value.
+     * @param      mixed $v string, integer (timestamp), or \DateTime value.
-     *                                             Empty strings are treated as NULL.
+     *               Empty strings are treated as NULL.
-     * @return \Thelia\Model\AreaDeliveryModule The current object (for fluent API support)
+     * @return   \Thelia\Model\AreaDeliveryModule The current object (for fluent API support)
      */
     public function setCreatedAt($v)
     {
@@ -518,15 +525,16 @@ abstract class AreaDeliveryModule implements ActiveRecordInterface
             }
         } // if either are not null
 
+
         return $this;
     } // setCreatedAt()
 
     /**
      * Sets the value of [updated_at] column to a normalized version of the date/time value specified.
      *
-     * @param  mixed                            $v string, integer (timestamp), or \DateTime value.
+     * @param      mixed $v string, integer (timestamp), or \DateTime value.
-     *                                             Empty strings are treated as NULL.
+     *               Empty strings are treated as NULL.
-     * @return \Thelia\Model\AreaDeliveryModule The current object (for fluent API support)
+     * @return   \Thelia\Model\AreaDeliveryModule The current object (for fluent API support)
      */
     public function setUpdatedAt($v)
     {
@@ -538,6 +546,7 @@ abstract class AreaDeliveryModule implements ActiveRecordInterface
             }
         } // if either are not null
 
+
         return $this;
     } // setUpdatedAt()
 
@@ -641,10 +650,10 @@ abstract class AreaDeliveryModule implements ActiveRecordInterface
      *
      * This will only work if the object has been saved and has a valid primary key set.
      *
-     * @param  boolean             $deep (optional) Whether to also de-associated any related objects.
+     * @param      boolean $deep (optional) Whether to also de-associated any related objects.
-     * @param  ConnectionInterface $con  (optional) The ConnectionInterface connection to use.
+     * @param      ConnectionInterface $con (optional) The ConnectionInterface connection to use.
      * @return void
-     * @throws PropelException     - if this object is deleted, unsaved or doesn't have pk match in db
+     * @throws PropelException - if this object is deleted, unsaved or doesn't have pk match in db
      */
     public function reload($deep = false, ConnectionInterface $con = null)
     {
@@ -681,7 +690,7 @@ abstract class AreaDeliveryModule implements ActiveRecordInterface
     /**
      * Removes this object from datastore and sets delete attribute.
      *
-     * @param  ConnectionInterface $con
+     * @param      ConnectionInterface $con
      * @return void
      * @throws PropelException
      * @see AreaDeliveryModule::setDeleted()
@@ -724,8 +733,8 @@ abstract class AreaDeliveryModule implements ActiveRecordInterface
      * method.  This method wraps all precipitate database operations in a
      * single transaction.
      *
-     * @param  ConnectionInterface $con
+     * @param      ConnectionInterface $con
-     * @return int                 The number of rows affected by this insert/update and any referring fk objects' save() operations.
+     * @return int             The number of rows affected by this insert/update and any referring fk objects' save() operations.
      * @throws PropelException
      * @see doSave()
      */
@@ -786,8 +795,8 @@ abstract class AreaDeliveryModule implements ActiveRecordInterface
      * If the object is new, it inserts it; otherwise an update is performed.
      * All related objects are also updated in this method.
      *
-     * @param  ConnectionInterface $con
+     * @param      ConnectionInterface $con
-     * @return int                 The number of rows affected by this insert/update and any referring fk objects' save() operations.
+     * @return int             The number of rows affected by this insert/update and any referring fk objects' save() operations.
      * @throws PropelException
      * @see save()
      */
@@ -837,7 +846,7 @@ abstract class AreaDeliveryModule implements ActiveRecordInterface
     /**
      * Insert the row in the database.
      *
-     * @param ConnectionInterface $con
+     * @param      ConnectionInterface $con
      *
      * @throws PropelException
      * @see doSave()
@@ -915,7 +924,7 @@ abstract class AreaDeliveryModule implements ActiveRecordInterface
     /**
      * Update the row in the database.
      *
-     * @param ConnectionInterface $con
+     * @param      ConnectionInterface $con
      *
      * @return Integer Number of updated rows
      * @see doSave()
@@ -931,12 +940,12 @@ abstract class AreaDeliveryModule implements ActiveRecordInterface
     /**
      * Retrieves a field from the object by name passed in as a string.
      *
-     * @param  string $name name
+     * @param      string $name name
-     * @param  string $type The type of fieldname the $name is of:
+     * @param      string $type The type of fieldname the $name is of:
-     *                      one of the class type constants TableMap::TYPE_PHPNAME, TableMap::TYPE_STUDLYPHPNAME
+     *                     one of the class type constants TableMap::TYPE_PHPNAME, TableMap::TYPE_STUDLYPHPNAME
-     *                      TableMap::TYPE_COLNAME, TableMap::TYPE_FIELDNAME, TableMap::TYPE_NUM.
+     *                     TableMap::TYPE_COLNAME, TableMap::TYPE_FIELDNAME, TableMap::TYPE_NUM.
-     *                      Defaults to TableMap::TYPE_PHPNAME.
+     *                     Defaults to TableMap::TYPE_PHPNAME.
-     * @return mixed  Value of field.
+     * @return mixed Value of field.
      */
     public function getByName($name, $type = TableMap::TYPE_PHPNAME)
     {
@@ -950,7 +959,7 @@ abstract class AreaDeliveryModule implements ActiveRecordInterface
      * Retrieves a field from the object by Position as specified in the xml schema.
      * Zero-based.
      *
-     * @param  int   $pos position in xml schema
+     * @param      int $pos position in xml schema
      * @return mixed Value of field at $pos
      */
     public function getByPosition($pos)
@@ -983,12 +992,12 @@ abstract class AreaDeliveryModule implements ActiveRecordInterface
      * You can specify the key type of the array by passing one of the class
      * type constants.
      *
-     * @param string  $keyType                (optional) One of the class type constants TableMap::TYPE_PHPNAME, TableMap::TYPE_STUDLYPHPNAME,
+     * @param     string  $keyType (optional) One of the class type constants TableMap::TYPE_PHPNAME, TableMap::TYPE_STUDLYPHPNAME,
-     *                                        TableMap::TYPE_COLNAME, TableMap::TYPE_FIELDNAME, TableMap::TYPE_NUM.
+     *                    TableMap::TYPE_COLNAME, TableMap::TYPE_FIELDNAME, TableMap::TYPE_NUM.
-     *                                        Defaults to TableMap::TYPE_PHPNAME.
+     *                    Defaults to TableMap::TYPE_PHPNAME.
-     * @param boolean $includeLazyLoadColumns (optional) Whether to include lazy loaded columns. Defaults to TRUE.
+     * @param     boolean $includeLazyLoadColumns (optional) Whether to include lazy loaded columns. Defaults to TRUE.
-     * @param array   $alreadyDumpedObjects   List of objects to skip to avoid recursion
+     * @param     array $alreadyDumpedObjects List of objects to skip to avoid recursion
-     * @param boolean $includeForeignObjects  (optional) Whether to include hydrated related objects. Default to FALSE.
+     * @param     boolean $includeForeignObjects (optional) Whether to include hydrated related objects. Default to FALSE.
      *
      * @return array an associative array containing the field names (as keys) and field values
      */
@@ -1026,12 +1035,12 @@ abstract class AreaDeliveryModule implements ActiveRecordInterface
     /**
      * Sets a field from the object by name passed in as a string.
      *
-     * @param  string $name
+     * @param      string $name
-     * @param  mixed  $value field value
+     * @param      mixed  $value field value
-     * @param  string $type  The type of fieldname the $name is of:
+     * @param      string $type The type of fieldname the $name is of:
-     *                       one of the class type constants TableMap::TYPE_PHPNAME, TableMap::TYPE_STUDLYPHPNAME
+     *                     one of the class type constants TableMap::TYPE_PHPNAME, TableMap::TYPE_STUDLYPHPNAME
-     *                       TableMap::TYPE_COLNAME, TableMap::TYPE_FIELDNAME, TableMap::TYPE_NUM.
+     *                     TableMap::TYPE_COLNAME, TableMap::TYPE_FIELDNAME, TableMap::TYPE_NUM.
-     *                       Defaults to TableMap::TYPE_PHPNAME.
+     *                     Defaults to TableMap::TYPE_PHPNAME.
      * @return void
      */
     public function setByName($name, $value, $type = TableMap::TYPE_PHPNAME)
@@ -1045,8 +1054,8 @@ abstract class AreaDeliveryModule implements ActiveRecordInterface
      * Sets a field from the object by Position as specified in the xml schema.
      * Zero-based.
      *
-     * @param  int   $pos   position in xml schema
+     * @param      int $pos position in xml schema
-     * @param  mixed $value field value
+     * @param      mixed $value field value
      * @return void
      */
     public function setByPosition($pos, $value)
@@ -1083,8 +1092,8 @@ abstract class AreaDeliveryModule implements ActiveRecordInterface
      * TableMap::TYPE_COLNAME, TableMap::TYPE_FIELDNAME, TableMap::TYPE_NUM.
      * The default key type is the column's TableMap::TYPE_PHPNAME.
      *
-     * @param  array  $arr     An array to populate the object from.
+     * @param      array  $arr     An array to populate the object from.
-     * @param  string $keyType The type of keys the array uses.
+     * @param      string $keyType The type of keys the array uses.
      * @return void
      */
     public function fromArray($arr, $keyType = TableMap::TYPE_PHPNAME)
@@ -1112,6 +1121,7 @@ abstract class AreaDeliveryModule implements ActiveRecordInterface
         if ($this->isColumnModified(AreaDeliveryModuleTableMap::DELIVERY_MODULE_ID)) $criteria->add(AreaDeliveryModuleTableMap::DELIVERY_MODULE_ID, $this->delivery_module_id);
         if ($this->isColumnModified(AreaDeliveryModuleTableMap::CREATED_AT)) $criteria->add(AreaDeliveryModuleTableMap::CREATED_AT, $this->created_at);
         if ($this->isColumnModified(AreaDeliveryModuleTableMap::UPDATED_AT)) $criteria->add(AreaDeliveryModuleTableMap::UPDATED_AT, $this->updated_at);
+
         return $criteria;
     }
 
@@ -1133,7 +1143,7 @@ abstract class AreaDeliveryModule implements ActiveRecordInterface
 
     /**
      * Returns the primary key for this object (row).
-     * @return int
+     * @return   int
      */
     public function getPrimaryKey()
     {
@@ -1143,7 +1153,7 @@ abstract class AreaDeliveryModule implements ActiveRecordInterface
     /**
      * Generic method to set the primary key (id column).
      *
-     * @param  int  $key Primary key.
+     * @param       int $key Primary key.
      * @return void
      */
     public function setPrimaryKey($key)
@@ -1157,6 +1167,7 @@ abstract class AreaDeliveryModule implements ActiveRecordInterface
      */
     public function isPrimaryKeyNull()
     {
+
         return null === $this->getId();
     }
 
@@ -1166,9 +1177,9 @@ abstract class AreaDeliveryModule implements ActiveRecordInterface
      * If desired, this method can also make copies of all associated (fkey referrers)
      * objects.
      *
-     * @param  object          $copyObj  An object of \Thelia\Model\AreaDeliveryModule (or compatible) type.
+     * @param      object $copyObj An object of \Thelia\Model\AreaDeliveryModule (or compatible) type.
-     * @param  boolean         $deepCopy Whether to also copy all rows that refer (by fkey) to the current row.
+     * @param      boolean $deepCopy Whether to also copy all rows that refer (by fkey) to the current row.
-     * @param  boolean         $makeNew  Whether to reset autoincrement PKs and make the object new.
+     * @param      boolean $makeNew Whether to reset autoincrement PKs and make the object new.
      * @throws PropelException
      */
     public function copyInto($copyObj, $deepCopy = false, $makeNew = true)
@@ -1191,8 +1202,8 @@ abstract class AreaDeliveryModule implements ActiveRecordInterface
      * If desired, this method can also make copies of all associated (fkey referrers)
      * objects.
      *
-     * @param  boolean                          $deepCopy Whether to also copy all rows that refer (by fkey) to the current row.
+     * @param      boolean $deepCopy Whether to also copy all rows that refer (by fkey) to the current row.
-     * @return \Thelia\Model\AreaDeliveryModule Clone of current object.
+     * @return                 \Thelia\Model\AreaDeliveryModule Clone of current object.
      * @throws PropelException
      */
     public function copy($deepCopy = false)
@@ -1208,8 +1219,8 @@ abstract class AreaDeliveryModule implements ActiveRecordInterface
     /**
      * Declares an association between this object and a ChildArea object.
      *
-     * @param  ChildArea                        $v
+     * @param                  ChildArea $v
-     * @return \Thelia\Model\AreaDeliveryModule The current object (for fluent API support)
+     * @return                 \Thelia\Model\AreaDeliveryModule The current object (for fluent API support)
      * @throws PropelException
      */
     public function setArea(ChildArea $v = null)
@@ -1228,6 +1239,7 @@ abstract class AreaDeliveryModule implements ActiveRecordInterface
             $v->addAreaDeliveryModule($this);
         }
 
+
         return $this;
     }
 
@@ -1235,8 +1247,8 @@ abstract class AreaDeliveryModule implements ActiveRecordInterface
     /**
      * Get the associated ChildArea object
      *
-     * @param  ConnectionInterface $con Optional Connection object.
+     * @param      ConnectionInterface $con Optional Connection object.
-     * @return ChildArea           The associated ChildArea object.
+     * @return                 ChildArea The associated ChildArea object.
      * @throws PropelException
      */
     public function getArea(ConnectionInterface $con = null)
@@ -1258,8 +1270,8 @@ abstract class AreaDeliveryModule implements ActiveRecordInterface
     /**
      * Declares an association between this object and a ChildModule object.
      *
-     * @param  ChildModule                      $v
+     * @param                  ChildModule $v
-     * @return \Thelia\Model\AreaDeliveryModule The current object (for fluent API support)
+     * @return                 \Thelia\Model\AreaDeliveryModule The current object (for fluent API support)
      * @throws PropelException
      */
     public function setModule(ChildModule $v = null)
@@ -1278,6 +1290,7 @@ abstract class AreaDeliveryModule implements ActiveRecordInterface
             $v->addAreaDeliveryModule($this);
         }
 
+
         return $this;
     }
 
@@ -1285,8 +1298,8 @@ abstract class AreaDeliveryModule implements ActiveRecordInterface
     /**
      * Get the associated ChildModule object
      *
-     * @param  ConnectionInterface $con Optional Connection object.
+     * @param      ConnectionInterface $con Optional Connection object.
-     * @return ChildModule         The associated ChildModule object.
+     * @return                 ChildModule The associated ChildModule object.
      * @throws PropelException
      */
     public function getModule(ConnectionInterface $con = null)
@@ -1329,7 +1342,7 @@ abstract class AreaDeliveryModule implements ActiveRecordInterface
      * objects with circular references (even in PHP 5.3). This is currently necessary
      * when using Propel in certain daemon or large-volume/high-memory operations.
      *
-     * @param boolean $deep Whether to also clear the references on all referrer objects.
+     * @param      boolean $deep Whether to also clear the references on all referrer objects.
      */
     public function clearAllReferences($deep = false)
     {
@@ -1355,7 +1368,7 @@ abstract class AreaDeliveryModule implements ActiveRecordInterface
     /**
      * Mark the current object so that the update date doesn't get updated during next save
      *
-     * @return ChildAreaDeliveryModule The current object (for fluent API support)
+     * @return     ChildAreaDeliveryModule The current object (for fluent API support)
      */
     public function keepUpdateDateUnchanged()
     {

core/lib/Thelia/Model/Base/AreaDeliveryModuleQuery.php

@@ -67,9 +67,9 @@ abstract class AreaDeliveryModuleQuery extends ModelCriteria
     /**
      * Initializes internal state of \Thelia\Model\Base\AreaDeliveryModuleQuery object.
      *
-     * @param string $dbName     The database name
+     * @param     string $dbName The database name
-     * @param string $modelName  The phpName of a model, e.g. 'Book'
+     * @param     string $modelName The phpName of a model, e.g. 'Book'
-     * @param string $modelAlias The alias for the model in this query, e.g. 'b'
+     * @param     string $modelAlias The alias for the model in this query, e.g. 'b'
      */
     public function __construct($dbName = 'thelia', $modelName = '\\Thelia\\Model\\AreaDeliveryModule', $modelAlias = null)
     {
@@ -79,8 +79,8 @@ abstract class AreaDeliveryModuleQuery extends ModelCriteria
     /**
      * Returns a new ChildAreaDeliveryModuleQuery object.
      *
-     * @param string   $modelAlias The alias of a model in the query
+     * @param     string $modelAlias The alias of a model in the query
-     * @param Criteria $criteria   Optional Criteria to build the query from
+     * @param     Criteria $criteria Optional Criteria to build the query from
      *
      * @return ChildAreaDeliveryModuleQuery
      */
@@ -109,7 +109,7 @@ abstract class AreaDeliveryModuleQuery extends ModelCriteria
      * $obj  = $c->findPk(12, $con);
      * </code>
      *
-     * @param mixed               $key Primary key to use for the query
+     * @param mixed $key Primary key to use for the query
      * @param ConnectionInterface $con an optional connection object
      *
      * @return ChildAreaDeliveryModule|array|mixed the result, formatted by the current formatter
@@ -140,10 +140,10 @@ abstract class AreaDeliveryModuleQuery extends ModelCriteria
      * Find object by primary key using raw SQL to go fast.
      * Bypass doSelect() and the object formatter by using generated code.
      *
-     * @param mixed               $key Primary key to use for the query
+     * @param     mixed $key Primary key to use for the query
-     * @param ConnectionInterface $con A connection object
+     * @param     ConnectionInterface $con A connection object
      *
-     * @return ChildAreaDeliveryModule A model object, or null if the key is not found
+     * @return   ChildAreaDeliveryModule A model object, or null if the key is not found
      */
     protected function findPkSimple($key, $con)
     {
@@ -170,8 +170,8 @@ abstract class AreaDeliveryModuleQuery extends ModelCriteria
     /**
      * Find object by primary key.
      *
-     * @param mixed               $key Primary key to use for the query
+     * @param     mixed $key Primary key to use for the query
-     * @param ConnectionInterface $con A connection object
+     * @param     ConnectionInterface $con A connection object
      *
      * @return ChildAreaDeliveryModule|array|mixed the result, formatted by the current formatter
      */
@@ -191,8 +191,8 @@ abstract class AreaDeliveryModuleQuery extends ModelCriteria
      * <code>
      * $objs = $c->findPks(array(12, 56, 832), $con);
      * </code>
-     * @param array               $keys Primary keys to use for the query
+     * @param     array $keys Primary keys to use for the query
-     * @param ConnectionInterface $con  an optional connection object
+     * @param     ConnectionInterface $con an optional connection object
      *
      * @return ObjectCollection|array|mixed the list of results, formatted by the current formatter
      */
@@ -213,24 +213,26 @@ abstract class AreaDeliveryModuleQuery extends ModelCriteria
     /**
      * Filter the query by primary key
      *
-     * @param mixed $key Primary key to use for the query
+     * @param     mixed $key Primary key to use for the query
      *
      * @return ChildAreaDeliveryModuleQuery The current query, for fluid interface
      */
     public function filterByPrimaryKey($key)
     {
+
         return $this->addUsingAlias(AreaDeliveryModuleTableMap::ID, $key, Criteria::EQUAL);
     }
 
     /**
      * Filter the query by a list of primary keys
      *
-     * @param array $keys The list of primary key to use for the query
+     * @param     array $keys The list of primary key to use for the query
      *
      * @return ChildAreaDeliveryModuleQuery The current query, for fluid interface
      */
     public function filterByPrimaryKeys($keys)
     {
+
         return $this->addUsingAlias(AreaDeliveryModuleTableMap::ID, $keys, Criteria::IN);
     }
 
@@ -244,11 +246,11 @@ abstract class AreaDeliveryModuleQuery extends ModelCriteria
      * $query->filterById(array('min' => 12)); // WHERE id > 12
      * </code>
      *
-     * @param mixed  $id         The value to use as filter.
+     * @param     mixed $id The value to use as filter.
-     *                           Use scalar values for equality.
+     *              Use scalar values for equality.
-     *                           Use array values for in_array() equivalent.
+     *              Use array values for in_array() equivalent.
-     *                           Use associative array('min' => $minValue, 'max' => $maxValue) for intervals.
+     *              Use associative array('min' => $minValue, 'max' => $maxValue) for intervals.
-     * @param string $comparison Operator to use for the column comparison, defaults to Criteria::EQUAL
+     * @param     string $comparison Operator to use for the column comparison, defaults to Criteria::EQUAL
      *
      * @return ChildAreaDeliveryModuleQuery The current query, for fluid interface
      */
@@ -287,11 +289,11 @@ abstract class AreaDeliveryModuleQuery extends ModelCriteria
      *
      * @see       filterByArea()
      *
-     * @param mixed  $areaId     The value to use as filter.
+     * @param     mixed $areaId The value to use as filter.
-     *                           Use scalar values for equality.
+     *              Use scalar values for equality.
-     *                           Use array values for in_array() equivalent.
+     *              Use array values for in_array() equivalent.
-     *                           Use associative array('min' => $minValue, 'max' => $maxValue) for intervals.
+     *              Use associative array('min' => $minValue, 'max' => $maxValue) for intervals.
-     * @param string $comparison Operator to use for the column comparison, defaults to Criteria::EQUAL
+     * @param     string $comparison Operator to use for the column comparison, defaults to Criteria::EQUAL
      *
      * @return ChildAreaDeliveryModuleQuery The current query, for fluid interface
      */
@@ -330,11 +332,11 @@ abstract class AreaDeliveryModuleQuery extends ModelCriteria
      *
      * @see       filterByModule()
      *
-     * @param mixed  $deliveryModuleId The value to use as filter.
+     * @param     mixed $deliveryModuleId The value to use as filter.
-     *                                 Use scalar values for equality.
+     *              Use scalar values for equality.
-     *                                 Use array values for in_array() equivalent.
+     *              Use array values for in_array() equivalent.
-     *                                 Use associative array('min' => $minValue, 'max' => $maxValue) for intervals.
+     *              Use associative array('min' => $minValue, 'max' => $maxValue) for intervals.
-     * @param string $comparison       Operator to use for the column comparison, defaults to Criteria::EQUAL
+     * @param     string $comparison Operator to use for the column comparison, defaults to Criteria::EQUAL
      *
      * @return ChildAreaDeliveryModuleQuery The current query, for fluid interface
      */
@@ -371,13 +373,13 @@ abstract class AreaDeliveryModuleQuery extends ModelCriteria
      * $query->filterByCreatedAt(array('max' => 'yesterday')); // WHERE created_at > '2011-03-13'
      * </code>
      *
-     * @param mixed  $createdAt  The value to use as filter.
+     * @param     mixed $createdAt The value to use as filter.
-     *                           Values can be integers (unix timestamps), DateTime objects, or strings.
+     *              Values can be integers (unix timestamps), DateTime objects, or strings.
-     *                           Empty strings are treated as NULL.
+     *              Empty strings are treated as NULL.
-     *                           Use scalar values for equality.
+     *              Use scalar values for equality.
-     *                           Use array values for in_array() equivalent.
+     *              Use array values for in_array() equivalent.
-     *                           Use associative array('min' => $minValue, 'max' => $maxValue) for intervals.
+     *              Use associative array('min' => $minValue, 'max' => $maxValue) for intervals.
-     * @param string $comparison Operator to use for the column comparison, defaults to Criteria::EQUAL
+     * @param     string $comparison Operator to use for the column comparison, defaults to Criteria::EQUAL
      *
      * @return ChildAreaDeliveryModuleQuery The current query, for fluid interface
      */
@@ -414,13 +416,13 @@ abstract class AreaDeliveryModuleQuery extends ModelCriteria
      * $query->filterByUpdatedAt(array('max' => 'yesterday')); // WHERE updated_at > '2011-03-13'
      * </code>
      *
-     * @param mixed  $updatedAt  The value to use as filter.
+     * @param     mixed $updatedAt The value to use as filter.
-     *                           Values can be integers (unix timestamps), DateTime objects, or strings.
+     *              Values can be integers (unix timestamps), DateTime objects, or strings.
-     *                           Empty strings are treated as NULL.
+     *              Empty strings are treated as NULL.
-     *                           Use scalar values for equality.
+     *              Use scalar values for equality.
-     *                           Use array values for in_array() equivalent.
+     *              Use array values for in_array() equivalent.
-     *                           Use associative array('min' => $minValue, 'max' => $maxValue) for intervals.
+     *              Use associative array('min' => $minValue, 'max' => $maxValue) for intervals.
-     * @param string $comparison Operator to use for the column comparison, defaults to Criteria::EQUAL
+     * @param     string $comparison Operator to use for the column comparison, defaults to Criteria::EQUAL
      *
      * @return ChildAreaDeliveryModuleQuery The current query, for fluid interface
      */
@@ -450,8 +452,8 @@ abstract class AreaDeliveryModuleQuery extends ModelCriteria
     /**
      * Filter the query by a related \Thelia\Model\Area object
      *
-     * @param \Thelia\Model\Area|ObjectCollection $area       The related object(s) to use as filter
+     * @param \Thelia\Model\Area|ObjectCollection $area The related object(s) to use as filter
-     * @param string                              $comparison Operator to use for the column comparison, defaults to Criteria::EQUAL
+     * @param string $comparison Operator to use for the column comparison, defaults to Criteria::EQUAL
      *
      * @return ChildAreaDeliveryModuleQuery The current query, for fluid interface
      */
@@ -475,8 +477,8 @@ abstract class AreaDeliveryModuleQuery extends ModelCriteria
     /**
      * Adds a JOIN clause to the query using the Area relation
      *
-     * @param string $relationAlias optional alias for the relation
+     * @param     string $relationAlias optional alias for the relation
-     * @param string $joinType      Accepted values are null, 'left join', 'right join', 'inner join'
+     * @param     string $joinType Accepted values are null, 'left join', 'right join', 'inner join'
      *
      * @return ChildAreaDeliveryModuleQuery The current query, for fluid interface
      */
@@ -509,11 +511,11 @@ abstract class AreaDeliveryModuleQuery extends ModelCriteria
      *
      * @see useQuery()
      *
-     * @param string $relationAlias optional alias for the relation,
+     * @param     string $relationAlias optional alias for the relation,
-     *                              to be used as main alias in the secondary query
+     *                                   to be used as main alias in the secondary query
-     * @param string $joinType      Accepted values are null, 'left join', 'right join', 'inner join'
+     * @param     string $joinType Accepted values are null, 'left join', 'right join', 'inner join'
      *
-     * @return \Thelia\Model\AreaQuery A secondary query class using the current class as primary query
+     * @return   \Thelia\Model\AreaQuery A secondary query class using the current class as primary query
      */
     public function useAreaQuery($relationAlias = null, $joinType = Criteria::INNER_JOIN)
     {
@@ -525,8 +527,8 @@ abstract class AreaDeliveryModuleQuery extends ModelCriteria
     /**
      * Filter the query by a related \Thelia\Model\Module object
      *
-     * @param \Thelia\Model\Module|ObjectCollection $module     The related object(s) to use as filter
+     * @param \Thelia\Model\Module|ObjectCollection $module The related object(s) to use as filter
-     * @param string                                $comparison Operator to use for the column comparison, defaults to Criteria::EQUAL
+     * @param string $comparison Operator to use for the column comparison, defaults to Criteria::EQUAL
      *
      * @return ChildAreaDeliveryModuleQuery The current query, for fluid interface
      */
@@ -550,8 +552,8 @@ abstract class AreaDeliveryModuleQuery extends ModelCriteria
     /**
      * Adds a JOIN clause to the query using the Module relation
      *
-     * @param string $relationAlias optional alias for the relation
+     * @param     string $relationAlias optional alias for the relation
-     * @param string $joinType      Accepted values are null, 'left join', 'right join', 'inner join'
+     * @param     string $joinType Accepted values are null, 'left join', 'right join', 'inner join'
      *
      * @return ChildAreaDeliveryModuleQuery The current query, for fluid interface
      */
@@ -584,11 +586,11 @@ abstract class AreaDeliveryModuleQuery extends ModelCriteria
      *
      * @see useQuery()
      *
-     * @param string $relationAlias optional alias for the relation,
+     * @param     string $relationAlias optional alias for the relation,
-     *                              to be used as main alias in the secondary query
+     *                                   to be used as main alias in the secondary query
-     * @param string $joinType      Accepted values are null, 'left join', 'right join', 'inner join'
+     * @param     string $joinType Accepted values are null, 'left join', 'right join', 'inner join'
      *
-     * @return \Thelia\Model\ModuleQuery A secondary query class using the current class as primary query
+     * @return   \Thelia\Model\ModuleQuery A secondary query class using the current class as primary query
      */
     public function useModuleQuery($relationAlias = null, $joinType = Criteria::INNER_JOIN)
     {
@@ -600,7 +602,7 @@ abstract class AreaDeliveryModuleQuery extends ModelCriteria
     /**
      * Exclude object from result
      *
-     * @param ChildAreaDeliveryModule $areaDeliveryModule Object to remove from the list of results
+     * @param   ChildAreaDeliveryModule $areaDeliveryModule Object to remove from the list of results
      *
      * @return ChildAreaDeliveryModuleQuery The current query, for fluid interface
      */
@@ -616,8 +618,8 @@ abstract class AreaDeliveryModuleQuery extends ModelCriteria
     /**
      * Deletes all rows from the area_delivery_module table.
      *
-     * @param  ConnectionInterface $con the connection to use
+     * @param ConnectionInterface $con the connection to use
-     * @return int                 The number of affected rows (if supported by underlying database driver).
+     * @return int The number of affected rows (if supported by underlying database driver).
      */
     public function doDeleteAll(ConnectionInterface $con = null)
     {
@@ -648,13 +650,13 @@ abstract class AreaDeliveryModuleQuery extends ModelCriteria
     /**
      * Performs a DELETE on the database, given a ChildAreaDeliveryModule or Criteria object OR a primary key value.
      *
-     * @param  mixed               $values Criteria or ChildAreaDeliveryModule object or primary key or array of primary keys
+     * @param mixed               $values Criteria or ChildAreaDeliveryModule object or primary key or array of primary keys
-     *                                     which is used to create the DELETE statement
+     *              which is used to create the DELETE statement
-     * @param  ConnectionInterface $con    the connection to use
+     * @param ConnectionInterface $con the connection to use
-     * @return int                 The number of affected rows (if supported by underlying database driver).  This includes CASCADE-related rows
+     * @return int The number of affected rows (if supported by underlying database driver).  This includes CASCADE-related rows
-     *                                    if supported by native driver or if emulated using Propel.
+     *                if supported by native driver or if emulated using Propel.
-     * @throws PropelException     Any exceptions caught during processing will be
+     * @throws PropelException Any exceptions caught during processing will be
-     *                                    rethrown wrapped into a PropelException.
+     *         rethrown wrapped into a PropelException.
      */
      public function delete(ConnectionInterface $con = null)
      {
@@ -674,6 +676,7 @@ abstract class AreaDeliveryModuleQuery extends ModelCriteria
             // for more than one table or we could emulating ON DELETE CASCADE, etc.
             $con->beginTransaction();
 
+
         AreaDeliveryModuleTableMap::removeInstanceFromPool($criteria);
 
             $affectedRows += ModelCriteria::delete($con);
@@ -692,9 +695,9 @@ abstract class AreaDeliveryModuleQuery extends ModelCriteria
     /**
      * Filter by the latest updated
      *
-     * @param int $nbDays Maximum age of the latest update in days
+     * @param      int $nbDays Maximum age of the latest update in days
      *
-     * @return ChildAreaDeliveryModuleQuery The current query, for fluid interface
+     * @return     ChildAreaDeliveryModuleQuery The current query, for fluid interface
      */
     public function recentlyUpdated($nbDays = 7)
     {
@@ -704,9 +707,9 @@ abstract class AreaDeliveryModuleQuery extends ModelCriteria
     /**
      * Filter by the latest created
      *
-     * @param int $nbDays Maximum age of in days
+     * @param      int $nbDays Maximum age of in days
      *
-     * @return ChildAreaDeliveryModuleQuery The current query, for fluid interface
+     * @return     ChildAreaDeliveryModuleQuery The current query, for fluid interface
      */
     public function recentlyCreated($nbDays = 7)
     {
@@ -716,7 +719,7 @@ abstract class AreaDeliveryModuleQuery extends ModelCriteria
     /**
      * Order by update date desc
      *
-     * @return ChildAreaDeliveryModuleQuery The current query, for fluid interface
+     * @return     ChildAreaDeliveryModuleQuery The current query, for fluid interface
      */
     public function lastUpdatedFirst()
     {
@@ -726,7 +729,7 @@ abstract class AreaDeliveryModuleQuery extends ModelCriteria
     /**
      * Order by update date asc
      *
-     * @return ChildAreaDeliveryModuleQuery The current query, for fluid interface
+     * @return     ChildAreaDeliveryModuleQuery The current query, for fluid interface
      */
     public function firstUpdatedFirst()
     {
@@ -736,7 +739,7 @@ abstract class AreaDeliveryModuleQuery extends ModelCriteria
     /**
      * Order by create date desc
      *
-     * @return ChildAreaDeliveryModuleQuery The current query, for fluid interface
+     * @return     ChildAreaDeliveryModuleQuery The current query, for fluid interface
      */
     public function lastCreatedFirst()
     {
@@ -746,7 +749,7 @@ abstract class AreaDeliveryModuleQuery extends ModelCriteria
     /**
      * Order by create date asc
      *
-     * @return ChildAreaDeliveryModuleQuery The current query, for fluid interface
+     * @return     ChildAreaDeliveryModuleQuery The current query, for fluid interface
      */
     public function firstCreatedFirst()
     {

core/lib/Thelia/Model/Base/AreaQuery.php

@@ -67,9 +67,9 @@ abstract class AreaQuery extends ModelCriteria
     /**
      * Initializes internal state of \Thelia\Model\Base\AreaQuery object.
      *
-     * @param string $dbName     The database name
+     * @param     string $dbName The database name
-     * @param string $modelName  The phpName of a model, e.g. 'Book'
+     * @param     string $modelName The phpName of a model, e.g. 'Book'
-     * @param string $modelAlias The alias for the model in this query, e.g. 'b'
+     * @param     string $modelAlias The alias for the model in this query, e.g. 'b'
      */
     public function __construct($dbName = 'thelia', $modelName = '\\Thelia\\Model\\Area', $modelAlias = null)
     {
@@ -79,8 +79,8 @@ abstract class AreaQuery extends ModelCriteria
     /**
      * Returns a new ChildAreaQuery object.
      *
-     * @param string   $modelAlias The alias of a model in the query
+     * @param     string $modelAlias The alias of a model in the query
-     * @param Criteria $criteria   Optional Criteria to build the query from
+     * @param     Criteria $criteria Optional Criteria to build the query from
      *
      * @return ChildAreaQuery
      */
@@ -109,7 +109,7 @@ abstract class AreaQuery extends ModelCriteria
      * $obj  = $c->findPk(12, $con);
      * </code>
      *
-     * @param mixed               $key Primary key to use for the query
+     * @param mixed $key Primary key to use for the query
      * @param ConnectionInterface $con an optional connection object
      *
      * @return ChildArea|array|mixed the result, formatted by the current formatter
@@ -140,10 +140,10 @@ abstract class AreaQuery extends ModelCriteria
      * Find object by primary key using raw SQL to go fast.
      * Bypass doSelect() and the object formatter by using generated code.
      *
-     * @param mixed               $key Primary key to use for the query
+     * @param     mixed $key Primary key to use for the query
-     * @param ConnectionInterface $con A connection object
+     * @param     ConnectionInterface $con A connection object
      *
-     * @return ChildArea A model object, or null if the key is not found
+     * @return   ChildArea A model object, or null if the key is not found
      */
     protected function findPkSimple($key, $con)
     {
@@ -170,8 +170,8 @@ abstract class AreaQuery extends ModelCriteria
     /**
      * Find object by primary key.
      *
-     * @param mixed               $key Primary key to use for the query
+     * @param     mixed $key Primary key to use for the query
-     * @param ConnectionInterface $con A connection object
+     * @param     ConnectionInterface $con A connection object
      *
      * @return ChildArea|array|mixed the result, formatted by the current formatter
      */
@@ -191,8 +191,8 @@ abstract class AreaQuery extends ModelCriteria
      * <code>
      * $objs = $c->findPks(array(12, 56, 832), $con);
      * </code>
-     * @param array               $keys Primary keys to use for the query
+     * @param     array $keys Primary keys to use for the query
-     * @param ConnectionInterface $con  an optional connection object
+     * @param     ConnectionInterface $con an optional connection object
      *
      * @return ObjectCollection|array|mixed the list of results, formatted by the current formatter
      */
@@ -213,24 +213,26 @@ abstract class AreaQuery extends ModelCriteria
     /**
      * Filter the query by primary key
      *
-     * @param mixed $key Primary key to use for the query
+     * @param     mixed $key Primary key to use for the query
      *
      * @return ChildAreaQuery The current query, for fluid interface
      */
     public function filterByPrimaryKey($key)
     {
+
         return $this->addUsingAlias(AreaTableMap::ID, $key, Criteria::EQUAL);
     }
 
     /**
      * Filter the query by a list of primary keys
      *
-     * @param array $keys The list of primary key to use for the query
+     * @param     array $keys The list of primary key to use for the query
      *
      * @return ChildAreaQuery The current query, for fluid interface
      */
     public function filterByPrimaryKeys($keys)
     {
+
         return $this->addUsingAlias(AreaTableMap::ID, $keys, Criteria::IN);
     }
 
@@ -244,11 +246,11 @@ abstract class AreaQuery extends ModelCriteria
      * $query->filterById(array('min' => 12)); // WHERE id > 12
      * </code>
      *
-     * @param mixed  $id         The value to use as filter.
+     * @param     mixed $id The value to use as filter.
-     *                           Use scalar values for equality.
+     *              Use scalar values for equality.
-     *                           Use array values for in_array() equivalent.
+     *              Use array values for in_array() equivalent.
-     *                           Use associative array('min' => $minValue, 'max' => $maxValue) for intervals.
+     *              Use associative array('min' => $minValue, 'max' => $maxValue) for intervals.
-     * @param string $comparison Operator to use for the column comparison, defaults to Criteria::EQUAL
+     * @param     string $comparison Operator to use for the column comparison, defaults to Criteria::EQUAL
      *
      * @return ChildAreaQuery The current query, for fluid interface
      */
@@ -284,9 +286,9 @@ abstract class AreaQuery extends ModelCriteria
      * $query->filterByName('%fooValue%'); // WHERE name LIKE '%fooValue%'
      * </code>
      *
-     * @param string $name       The value to use as filter.
+     * @param     string $name The value to use as filter.
-     *                           Accepts wildcards (* and % trigger a LIKE)
+     *              Accepts wildcards (* and % trigger a LIKE)
-     * @param string $comparison Operator to use for the column comparison, defaults to Criteria::EQUAL
+     * @param     string $comparison Operator to use for the column comparison, defaults to Criteria::EQUAL
      *
      * @return ChildAreaQuery The current query, for fluid interface
      */
@@ -314,11 +316,11 @@ abstract class AreaQuery extends ModelCriteria
      * $query->filterByPostage(array('min' => 12)); // WHERE postage > 12
      * </code>
      *
-     * @param mixed  $postage    The value to use as filter.
+     * @param     mixed $postage The value to use as filter.
-     *                           Use scalar values for equality.
+     *              Use scalar values for equality.
-     *                           Use array values for in_array() equivalent.
+     *              Use array values for in_array() equivalent.
-     *                           Use associative array('min' => $minValue, 'max' => $maxValue) for intervals.
+     *              Use associative array('min' => $minValue, 'max' => $maxValue) for intervals.
-     * @param string $comparison Operator to use for the column comparison, defaults to Criteria::EQUAL
+     * @param     string $comparison Operator to use for the column comparison, defaults to Criteria::EQUAL
      *
      * @return ChildAreaQuery The current query, for fluid interface
      */
@@ -355,13 +357,13 @@ abstract class AreaQuery extends ModelCriteria
      * $query->filterByCreatedAt(array('max' => 'yesterday')); // WHERE created_at > '2011-03-13'
      * </code>
      *
-     * @param mixed  $createdAt  The value to use as filter.
+     * @param     mixed $createdAt The value to use as filter.
-     *                           Values can be integers (unix timestamps), DateTime objects, or strings.
+     *              Values can be integers (unix timestamps), DateTime objects, or strings.
-     *                           Empty strings are treated as NULL.
+     *              Empty strings are treated as NULL.
-     *                           Use scalar values for equality.
+     *              Use scalar values for equality.
-     *                           Use array values for in_array() equivalent.
+     *              Use array values for in_array() equivalent.
-     *                           Use associative array('min' => $minValue, 'max' => $maxValue) for intervals.
+     *              Use associative array('min' => $minValue, 'max' => $maxValue) for intervals.
-     * @param string $comparison Operator to use for the column comparison, defaults to Criteria::EQUAL
+     * @param     string $comparison Operator to use for the column comparison, defaults to Criteria::EQUAL
      *
      * @return ChildAreaQuery The current query, for fluid interface
      */
@@ -398,13 +400,13 @@ abstract class AreaQuery extends ModelCriteria
      * $query->filterByUpdatedAt(array('max' => 'yesterday')); // WHERE updated_at > '2011-03-13'
      * </code>
      *
-     * @param mixed  $updatedAt  The value to use as filter.
+     * @param     mixed $updatedAt The value to use as filter.
-     *                           Values can be integers (unix timestamps), DateTime objects, or strings.
+     *              Values can be integers (unix timestamps), DateTime objects, or strings.
-     *                           Empty strings are treated as NULL.
+     *              Empty strings are treated as NULL.
-     *                           Use scalar values for equality.
+     *              Use scalar values for equality.
-     *                           Use array values for in_array() equivalent.
+     *              Use array values for in_array() equivalent.
-     *                           Use associative array('min' => $minValue, 'max' => $maxValue) for intervals.
+     *              Use associative array('min' => $minValue, 'max' => $maxValue) for intervals.
-     * @param string $comparison Operator to use for the column comparison, defaults to Criteria::EQUAL
+     * @param     string $comparison Operator to use for the column comparison, defaults to Criteria::EQUAL
      *
      * @return ChildAreaQuery The current query, for fluid interface
      */
@@ -434,8 +436,8 @@ abstract class AreaQuery extends ModelCriteria
     /**
      * Filter the query by a related \Thelia\Model\Country object
      *
-     * @param \Thelia\Model\Country|ObjectCollection $country    the related object to use as filter
+     * @param \Thelia\Model\Country|ObjectCollection $country  the related object to use as filter
-     * @param string                                 $comparison Operator to use for the column comparison, defaults to Criteria::EQUAL
+     * @param string $comparison Operator to use for the column comparison, defaults to Criteria::EQUAL
      *
      * @return ChildAreaQuery The current query, for fluid interface
      */
@@ -457,8 +459,8 @@ abstract class AreaQuery extends ModelCriteria
     /**
      * Adds a JOIN clause to the query using the Country relation
      *
-     * @param string $relationAlias optional alias for the relation
+     * @param     string $relationAlias optional alias for the relation
-     * @param string $joinType      Accepted values are null, 'left join', 'right join', 'inner join'
+     * @param     string $joinType Accepted values are null, 'left join', 'right join', 'inner join'
      *
      * @return ChildAreaQuery The current query, for fluid interface
      */
@@ -491,11 +493,11 @@ abstract class AreaQuery extends ModelCriteria
      *
      * @see useQuery()
      *
-     * @param string $relationAlias optional alias for the relation,
+     * @param     string $relationAlias optional alias for the relation,
-     *                              to be used as main alias in the secondary query
+     *                                   to be used as main alias in the secondary query
-     * @param string $joinType      Accepted values are null, 'left join', 'right join', 'inner join'
+     * @param     string $joinType Accepted values are null, 'left join', 'right join', 'inner join'
      *
-     * @return \Thelia\Model\CountryQuery A secondary query class using the current class as primary query
+     * @return   \Thelia\Model\CountryQuery A secondary query class using the current class as primary query
      */
     public function useCountryQuery($relationAlias = null, $joinType = Criteria::LEFT_JOIN)
     {
@@ -507,8 +509,8 @@ abstract class AreaQuery extends ModelCriteria
     /**
      * Filter the query by a related \Thelia\Model\AreaDeliveryModule object
      *
-     * @param \Thelia\Model\AreaDeliveryModule|ObjectCollection $areaDeliveryModule the related object to use as filter
+     * @param \Thelia\Model\AreaDeliveryModule|ObjectCollection $areaDeliveryModule  the related object to use as filter
-     * @param string                                            $comparison         Operator to use for the column comparison, defaults to Criteria::EQUAL
+     * @param string $comparison Operator to use for the column comparison, defaults to Criteria::EQUAL
      *
      * @return ChildAreaQuery The current query, for fluid interface
      */
@@ -530,8 +532,8 @@ abstract class AreaQuery extends ModelCriteria
     /**
      * Adds a JOIN clause to the query using the AreaDeliveryModule relation
      *
-     * @param string $relationAlias optional alias for the relation
+     * @param     string $relationAlias optional alias for the relation
-     * @param string $joinType      Accepted values are null, 'left join', 'right join', 'inner join'
+     * @param     string $joinType Accepted values are null, 'left join', 'right join', 'inner join'
      *
      * @return ChildAreaQuery The current query, for fluid interface
      */
@@ -564,11 +566,11 @@ abstract class AreaQuery extends ModelCriteria
      *
      * @see useQuery()
      *
-     * @param string $relationAlias optional alias for the relation,
+     * @param     string $relationAlias optional alias for the relation,
-     *                              to be used as main alias in the secondary query
+     *                                   to be used as main alias in the secondary query
-     * @param string $joinType      Accepted values are null, 'left join', 'right join', 'inner join'
+     * @param     string $joinType Accepted values are null, 'left join', 'right join', 'inner join'
      *
-     * @return \Thelia\Model\AreaDeliveryModuleQuery A secondary query class using the current class as primary query
+     * @return   \Thelia\Model\AreaDeliveryModuleQuery A secondary query class using the current class as primary query
      */
     public function useAreaDeliveryModuleQuery($relationAlias = null, $joinType = Criteria::INNER_JOIN)
     {
@@ -580,7 +582,7 @@ abstract class AreaQuery extends ModelCriteria
     /**
      * Exclude object from result
      *
-     * @param ChildArea $area Object to remove from the list of results
+     * @param   ChildArea $area Object to remove from the list of results
      *
      * @return ChildAreaQuery The current query, for fluid interface
      */
@@ -596,8 +598,8 @@ abstract class AreaQuery extends ModelCriteria
     /**
      * Deletes all rows from the area table.
      *
-     * @param  ConnectionInterface $con the connection to use
+     * @param ConnectionInterface $con the connection to use
-     * @return int                 The number of affected rows (if supported by underlying database driver).
+     * @return int The number of affected rows (if supported by underlying database driver).
      */
     public function doDeleteAll(ConnectionInterface $con = null)
     {
@@ -628,13 +630,13 @@ abstract class AreaQuery extends ModelCriteria
     /**
      * Performs a DELETE on the database, given a ChildArea or Criteria object OR a primary key value.
      *
-     * @param  mixed               $values Criteria or ChildArea object or primary key or array of primary keys
+     * @param mixed               $values Criteria or ChildArea object or primary key or array of primary keys
-     *                                     which is used to create the DELETE statement
+     *              which is used to create the DELETE statement
-     * @param  ConnectionInterface $con    the connection to use
+     * @param ConnectionInterface $con the connection to use
-     * @return int                 The number of affected rows (if supported by underlying database driver).  This includes CASCADE-related rows
+     * @return int The number of affected rows (if supported by underlying database driver).  This includes CASCADE-related rows
-     *                                    if supported by native driver or if emulated using Propel.
+     *                if supported by native driver or if emulated using Propel.
-     * @throws PropelException     Any exceptions caught during processing will be
+     * @throws PropelException Any exceptions caught during processing will be
-     *                                    rethrown wrapped into a PropelException.
+     *         rethrown wrapped into a PropelException.
      */
      public function delete(ConnectionInterface $con = null)
      {
@@ -654,6 +656,7 @@ abstract class AreaQuery extends ModelCriteria
             // for more than one table or we could emulating ON DELETE CASCADE, etc.
             $con->beginTransaction();
 
+
         AreaTableMap::removeInstanceFromPool($criteria);
 
             $affectedRows += ModelCriteria::delete($con);
@@ -672,9 +675,9 @@ abstract class AreaQuery extends ModelCriteria
     /**
      * Filter by the latest updated
      *
-     * @param int $nbDays Maximum age of the latest update in days
+     * @param      int $nbDays Maximum age of the latest update in days
      *
-     * @return ChildAreaQuery The current query, for fluid interface
+     * @return     ChildAreaQuery The current query, for fluid interface
      */
     public function recentlyUpdated($nbDays = 7)
     {
@@ -684,9 +687,9 @@ abstract class AreaQuery extends ModelCriteria
     /**
      * Filter by the latest created
      *
-     * @param int $nbDays Maximum age of in days
+     * @param      int $nbDays Maximum age of in days
      *
-     * @return ChildAreaQuery The current query, for fluid interface
+     * @return     ChildAreaQuery The current query, for fluid interface
      */
     public function recentlyCreated($nbDays = 7)
     {
@@ -696,7 +699,7 @@ abstract class AreaQuery extends ModelCriteria
     /**
      * Order by update date desc
      *
-     * @return ChildAreaQuery The current query, for fluid interface
+     * @return     ChildAreaQuery The current query, for fluid interface
      */
     public function lastUpdatedFirst()
     {
@@ -706,7 +709,7 @@ abstract class AreaQuery extends ModelCriteria
     /**
      * Order by update date asc
      *
-     * @return ChildAreaQuery The current query, for fluid interface
+     * @return     ChildAreaQuery The current query, for fluid interface
      */
     public function firstUpdatedFirst()
     {
@@ -716,7 +719,7 @@ abstract class AreaQuery extends ModelCriteria
     /**
      * Order by create date desc
      *
-     * @return ChildAreaQuery The current query, for fluid interface
+     * @return     ChildAreaQuery The current query, for fluid interface
      */
     public function lastCreatedFirst()
     {
@@ -726,7 +729,7 @@ abstract class AreaQuery extends ModelCriteria
     /**
      * Order by create date asc
      *
-     * @return ChildAreaQuery The current query, for fluid interface
+     * @return     ChildAreaQuery The current query, for fluid interface
      */
     public function firstCreatedFirst()
     {

core/lib/Thelia/Model/Base/Attribute.php

@@ -38,6 +38,7 @@ abstract class Attribute implements ActiveRecordInterface
      */
     const TABLE_MAP = '\\Thelia\\Model\\Map\\AttributeTableMap';
 
+
     /**
      * attribute to determine if this object has previously been saved.
      * @var boolean
@@ -378,9 +379,9 @@ abstract class Attribute implements ActiveRecordInterface
      * $book->importFrom('JSON', '{"Id":9012,"Title":"Don Juan","ISBN":"0140422161","Price":12.99,"PublisherId":1234,"AuthorId":5678}');
      * </code>
      *
-     * @param mixed  $parser A AbstractParser instance,
+     * @param mixed $parser A AbstractParser instance,
      *                       or a format name ('XML', 'YAML', 'JSON', 'CSV')
-     * @param string $data   The source data to import from
+     * @param string $data The source data to import from
      *
      * @return Attribute The current object, for fluid interface
      */
@@ -430,20 +431,22 @@ abstract class Attribute implements ActiveRecordInterface
     /**
      * Get the [id] column value.
      *
-     * @return int
+     * @return   int
      */
     public function getId()
     {
+
         return $this->id;
     }
 
     /**
      * Get the [position] column value.
      *
-     * @return int
+     * @return   int
      */
     public function getPosition()
     {
+
         return $this->position;
     }
 
@@ -451,8 +454,8 @@ abstract class Attribute implements ActiveRecordInterface
      * Get the [optionally formatted] temporal [created_at] column value.
      *
      *
-     * @param string $format The date/time format string (either date()-style or strftime()-style).
+     * @param      string $format The date/time format string (either date()-style or strftime()-style).
-     *                       If format is NULL, then the raw \DateTime object will be returned.
+     *                            If format is NULL, then the raw \DateTime object will be returned.
      *
      * @return mixed Formatted date/time value as string or \DateTime object (if format is NULL), NULL if column is NULL, and 0 if column value is 0000-00-00 00:00:00
      *
@@ -471,8 +474,8 @@ abstract class Attribute implements ActiveRecordInterface
      * Get the [optionally formatted] temporal [updated_at] column value.
      *
      *
-     * @param string $format The date/time format string (either date()-style or strftime()-style).
+     * @param      string $format The date/time format string (either date()-style or strftime()-style).
-     *                       If format is NULL, then the raw \DateTime object will be returned.
+     *                            If format is NULL, then the raw \DateTime object will be returned.
      *
      * @return mixed Formatted date/time value as string or \DateTime object (if format is NULL), NULL if column is NULL, and 0 if column value is 0000-00-00 00:00:00
      *
@@ -490,8 +493,8 @@ abstract class Attribute implements ActiveRecordInterface
     /**
      * Set the value of [id] column.
      *
-     * @param  int                     $v new value
+     * @param      int $v new value
-     * @return \Thelia\Model\Attribute The current object (for fluent API support)
+     * @return   \Thelia\Model\Attribute The current object (for fluent API support)
      */
     public function setId($v)
     {
@@ -504,14 +507,15 @@ abstract class Attribute implements ActiveRecordInterface
             $this->modifiedColumns[AttributeTableMap::ID] = true;
         }
 
+
         return $this;
     } // setId()
 
     /**
      * Set the value of [position] column.
      *
-     * @param  int                     $v new value
+     * @param      int $v new value
-     * @return \Thelia\Model\Attribute The current object (for fluent API support)
+     * @return   \Thelia\Model\Attribute The current object (for fluent API support)
      */
     public function setPosition($v)
     {
@@ -524,15 +528,16 @@ abstract class Attribute implements ActiveRecordInterface
             $this->modifiedColumns[AttributeTableMap::POSITION] = true;
         }
 
+
         return $this;
     } // setPosition()
 
     /**
      * Sets the value of [created_at] column to a normalized version of the date/time value specified.
      *
-     * @param  mixed                   $v string, integer (timestamp), or \DateTime value.
+     * @param      mixed $v string, integer (timestamp), or \DateTime value.
-     *                                    Empty strings are treated as NULL.
+     *               Empty strings are treated as NULL.
-     * @return \Thelia\Model\Attribute The current object (for fluent API support)
+     * @return   \Thelia\Model\Attribute The current object (for fluent API support)
      */
     public function setCreatedAt($v)
     {
@@ -544,15 +549,16 @@ abstract class Attribute implements ActiveRecordInterface
             }
         } // if either are not null
 
+
         return $this;
     } // setCreatedAt()
 
     /**
      * Sets the value of [updated_at] column to a normalized version of the date/time value specified.
      *
-     * @param  mixed                   $v string, integer (timestamp), or \DateTime value.
+     * @param      mixed $v string, integer (timestamp), or \DateTime value.
-     *                                    Empty strings are treated as NULL.
+     *               Empty strings are treated as NULL.
-     * @return \Thelia\Model\Attribute The current object (for fluent API support)
+     * @return   \Thelia\Model\Attribute The current object (for fluent API support)
      */
     public function setUpdatedAt($v)
     {
@@ -564,6 +570,7 @@ abstract class Attribute implements ActiveRecordInterface
             }
         } // if either are not null
 
+
         return $this;
     } // setUpdatedAt()
 
@@ -658,10 +665,10 @@ abstract class Attribute implements ActiveRecordInterface
      *
      * This will only work if the object has been saved and has a valid primary key set.
      *
-     * @param  boolean             $deep (optional) Whether to also de-associated any related objects.
+     * @param      boolean $deep (optional) Whether to also de-associated any related objects.
-     * @param  ConnectionInterface $con  (optional) The ConnectionInterface connection to use.
+     * @param      ConnectionInterface $con (optional) The ConnectionInterface connection to use.
      * @return void
-     * @throws PropelException     - if this object is deleted, unsaved or doesn't have pk match in db
+     * @throws PropelException - if this object is deleted, unsaved or doesn't have pk match in db
      */
     public function reload($deep = false, ConnectionInterface $con = null)
     {
@@ -705,7 +712,7 @@ abstract class Attribute implements ActiveRecordInterface
     /**
      * Removes this object from datastore and sets delete attribute.
      *
-     * @param  ConnectionInterface $con
+     * @param      ConnectionInterface $con
      * @return void
      * @throws PropelException
      * @see Attribute::setDeleted()
@@ -748,8 +755,8 @@ abstract class Attribute implements ActiveRecordInterface
      * method.  This method wraps all precipitate database operations in a
      * single transaction.
      *
-     * @param  ConnectionInterface $con
+     * @param      ConnectionInterface $con
-     * @return int                 The number of rows affected by this insert/update and any referring fk objects' save() operations.
+     * @return int             The number of rows affected by this insert/update and any referring fk objects' save() operations.
      * @throws PropelException
      * @see doSave()
      */
@@ -810,8 +817,8 @@ abstract class Attribute implements ActiveRecordInterface
      * If the object is new, it inserts it; otherwise an update is performed.
      * All related objects are also updated in this method.
      *
-     * @param  ConnectionInterface $con
+     * @param      ConnectionInterface $con
-     * @return int                 The number of rows affected by this insert/update and any referring fk objects' save() operations.
+     * @return int             The number of rows affected by this insert/update and any referring fk objects' save() operations.
      * @throws PropelException
      * @see save()
      */
@@ -937,7 +944,7 @@ abstract class Attribute implements ActiveRecordInterface
     /**
      * Insert the row in the database.
      *
-     * @param ConnectionInterface $con
+     * @param      ConnectionInterface $con
      *
      * @throws PropelException
      * @see doSave()
@@ -1009,7 +1016,7 @@ abstract class Attribute implements ActiveRecordInterface
     /**
      * Update the row in the database.
      *
-     * @param ConnectionInterface $con
+     * @param      ConnectionInterface $con
      *
      * @return Integer Number of updated rows
      * @see doSave()
@@ -1025,12 +1032,12 @@ abstract class Attribute implements ActiveRecordInterface
     /**
      * Retrieves a field from the object by name passed in as a string.
      *
-     * @param  string $name name
+     * @param      string $name name
-     * @param  string $type The type of fieldname the $name is of:
+     * @param      string $type The type of fieldname the $name is of:
-     *                      one of the class type constants TableMap::TYPE_PHPNAME, TableMap::TYPE_STUDLYPHPNAME
+     *                     one of the class type constants TableMap::TYPE_PHPNAME, TableMap::TYPE_STUDLYPHPNAME
-     *                      TableMap::TYPE_COLNAME, TableMap::TYPE_FIELDNAME, TableMap::TYPE_NUM.
+     *                     TableMap::TYPE_COLNAME, TableMap::TYPE_FIELDNAME, TableMap::TYPE_NUM.
-     *                      Defaults to TableMap::TYPE_PHPNAME.
+     *                     Defaults to TableMap::TYPE_PHPNAME.
-     * @return mixed  Value of field.
+     * @return mixed Value of field.
      */
     public function getByName($name, $type = TableMap::TYPE_PHPNAME)
     {
@@ -1044,7 +1051,7 @@ abstract class Attribute implements ActiveRecordInterface
      * Retrieves a field from the object by Position as specified in the xml schema.
      * Zero-based.
      *
-     * @param  int   $pos position in xml schema
+     * @param      int $pos position in xml schema
      * @return mixed Value of field at $pos
      */
     public function getByPosition($pos)
@@ -1074,12 +1081,12 @@ abstract class Attribute implements ActiveRecordInterface
      * You can specify the key type of the array by passing one of the class
      * type constants.
      *
-     * @param string  $keyType                (optional) One of the class type constants TableMap::TYPE_PHPNAME, TableMap::TYPE_STUDLYPHPNAME,
+     * @param     string  $keyType (optional) One of the class type constants TableMap::TYPE_PHPNAME, TableMap::TYPE_STUDLYPHPNAME,
-     *                                        TableMap::TYPE_COLNAME, TableMap::TYPE_FIELDNAME, TableMap::TYPE_NUM.
+     *                    TableMap::TYPE_COLNAME, TableMap::TYPE_FIELDNAME, TableMap::TYPE_NUM.
-     *                                        Defaults to TableMap::TYPE_PHPNAME.
+     *                    Defaults to TableMap::TYPE_PHPNAME.
-     * @param boolean $includeLazyLoadColumns (optional) Whether to include lazy loaded columns. Defaults to TRUE.
+     * @param     boolean $includeLazyLoadColumns (optional) Whether to include lazy loaded columns. Defaults to TRUE.
-     * @param array   $alreadyDumpedObjects   List of objects to skip to avoid recursion
+     * @param     array $alreadyDumpedObjects List of objects to skip to avoid recursion
-     * @param boolean $includeForeignObjects  (optional) Whether to include hydrated related objects. Default to FALSE.
+     * @param     boolean $includeForeignObjects (optional) Whether to include hydrated related objects. Default to FALSE.
      *
      * @return array an associative array containing the field names (as keys) and field values
      */
@@ -1122,12 +1129,12 @@ abstract class Attribute implements ActiveRecordInterface
     /**
      * Sets a field from the object by name passed in as a string.
      *
-     * @param  string $name
+     * @param      string $name
-     * @param  mixed  $value field value
+     * @param      mixed  $value field value
-     * @param  string $type  The type of fieldname the $name is of:
+     * @param      string $type The type of fieldname the $name is of:
-     *                       one of the class type constants TableMap::TYPE_PHPNAME, TableMap::TYPE_STUDLYPHPNAME
+     *                     one of the class type constants TableMap::TYPE_PHPNAME, TableMap::TYPE_STUDLYPHPNAME
-     *                       TableMap::TYPE_COLNAME, TableMap::TYPE_FIELDNAME, TableMap::TYPE_NUM.
+     *                     TableMap::TYPE_COLNAME, TableMap::TYPE_FIELDNAME, TableMap::TYPE_NUM.
-     *                       Defaults to TableMap::TYPE_PHPNAME.
+     *                     Defaults to TableMap::TYPE_PHPNAME.
      * @return void
      */
     public function setByName($name, $value, $type = TableMap::TYPE_PHPNAME)
@@ -1141,8 +1148,8 @@ abstract class Attribute implements ActiveRecordInterface
      * Sets a field from the object by Position as specified in the xml schema.
      * Zero-based.
      *
-     * @param  int   $pos   position in xml schema
+     * @param      int $pos position in xml schema
-     * @param  mixed $value field value
+     * @param      mixed $value field value
      * @return void
      */
     public function setByPosition($pos, $value)
@@ -1176,8 +1183,8 @@ abstract class Attribute implements ActiveRecordInterface
      * TableMap::TYPE_COLNAME, TableMap::TYPE_FIELDNAME, TableMap::TYPE_NUM.
      * The default key type is the column's TableMap::TYPE_PHPNAME.
      *
-     * @param  array  $arr     An array to populate the object from.
+     * @param      array  $arr     An array to populate the object from.
-     * @param  string $keyType The type of keys the array uses.
+     * @param      string $keyType The type of keys the array uses.
      * @return void
      */
     public function fromArray($arr, $keyType = TableMap::TYPE_PHPNAME)
@@ -1203,6 +1210,7 @@ abstract class Attribute implements ActiveRecordInterface
         if ($this->isColumnModified(AttributeTableMap::POSITION)) $criteria->add(AttributeTableMap::POSITION, $this->position);
         if ($this->isColumnModified(AttributeTableMap::CREATED_AT)) $criteria->add(AttributeTableMap::CREATED_AT, $this->created_at);
         if ($this->isColumnModified(AttributeTableMap::UPDATED_AT)) $criteria->add(AttributeTableMap::UPDATED_AT, $this->updated_at);
+
         return $criteria;
     }
 
@@ -1224,7 +1232,7 @@ abstract class Attribute implements ActiveRecordInterface
 
     /**
      * Returns the primary key for this object (row).
-     * @return int
+     * @return   int
      */
     public function getPrimaryKey()
     {
@@ -1234,7 +1242,7 @@ abstract class Attribute implements ActiveRecordInterface
     /**
      * Generic method to set the primary key (id column).
      *
-     * @param  int  $key Primary key.
+     * @param       int $key Primary key.
      * @return void
      */
     public function setPrimaryKey($key)
@@ -1248,6 +1256,7 @@ abstract class Attribute implements ActiveRecordInterface
      */
     public function isPrimaryKeyNull()
     {
+
         return null === $this->getId();
     }
 
@@ -1257,9 +1266,9 @@ abstract class Attribute implements ActiveRecordInterface
      * If desired, this method can also make copies of all associated (fkey referrers)
      * objects.
      *
-     * @param  object          $copyObj  An object of \Thelia\Model\Attribute (or compatible) type.
+     * @param      object $copyObj An object of \Thelia\Model\Attribute (or compatible) type.
-     * @param  boolean         $deepCopy Whether to also copy all rows that refer (by fkey) to the current row.
+     * @param      boolean $deepCopy Whether to also copy all rows that refer (by fkey) to the current row.
-     * @param  boolean         $makeNew  Whether to reset autoincrement PKs and make the object new.
+     * @param      boolean $makeNew Whether to reset autoincrement PKs and make the object new.
      * @throws PropelException
      */
     public function copyInto($copyObj, $deepCopy = false, $makeNew = true)
@@ -1313,8 +1322,8 @@ abstract class Attribute implements ActiveRecordInterface
      * If desired, this method can also make copies of all associated (fkey referrers)
      * objects.
      *
-     * @param  boolean                 $deepCopy Whether to also copy all rows that refer (by fkey) to the current row.
+     * @param      boolean $deepCopy Whether to also copy all rows that refer (by fkey) to the current row.
-     * @return \Thelia\Model\Attribute Clone of current object.
+     * @return                 \Thelia\Model\Attribute Clone of current object.
      * @throws PropelException
      */
     public function copy($deepCopy = false)
@@ -1333,7 +1342,7 @@ abstract class Attribute implements ActiveRecordInterface
      * Avoids crafting an 'init[$relationName]s' method name
      * that wouldn't work when StandardEnglishPluralizer is used.
      *
-     * @param  string $relationName The name of the relation to initialize
+     * @param      string $relationName The name of the relation to initialize
      * @return void
      */
     public function initRelation($relationName)
@@ -1381,8 +1390,8 @@ abstract class Attribute implements ActiveRecordInterface
      * however, you may wish to override this method in your stub class to provide setting appropriate
      * to your application -- for example, setting the initial array to the values stored in database.
      *
-     * @param boolean $overrideExisting If set to true, the method call initializes
+     * @param      boolean $overrideExisting If set to true, the method call initializes
-     *                                  the collection even if it is not empty
+     *                                        the collection even if it is not empty
      *
      * @return void
      */
@@ -1404,8 +1413,8 @@ abstract class Attribute implements ActiveRecordInterface
      * If this ChildAttribute is new, it will return
      * an empty collection or the current collection; the criteria is ignored on a new object.
      *
-     * @param  Criteria                      $criteria optional Criteria object to narrow the query
+     * @param      Criteria $criteria optional Criteria object to narrow the query
-     * @param  ConnectionInterface           $con      optional connection object
+     * @param      ConnectionInterface $con optional connection object
      * @return Collection|ChildAttributeAv[] List of ChildAttributeAv objects
      * @throws PropelException
      */
@@ -1461,14 +1470,15 @@ abstract class Attribute implements ActiveRecordInterface
      * It will also schedule objects for deletion based on a diff between old objects (aka persisted)
      * and new objects from the given Propel collection.
      *
-     * @param  Collection          $attributeAvs A Propel collection.
+     * @param      Collection $attributeAvs A Propel collection.
-     * @param  ConnectionInterface $con          Optional connection object
+     * @param      ConnectionInterface $con Optional connection object
-     * @return ChildAttribute      The current object (for fluent API support)
+     * @return   ChildAttribute The current object (for fluent API support)
      */
     public function setAttributeAvs(Collection $attributeAvs, ConnectionInterface $con = null)
     {
         $attributeAvsToDelete = $this->getAttributeAvs(new Criteria(), $con)->diff($attributeAvs);
 
+
         $this->attributeAvsScheduledForDeletion = $attributeAvsToDelete;
 
         foreach ($attributeAvsToDelete as $attributeAvRemoved) {
@@ -1489,10 +1499,10 @@ abstract class Attribute implements ActiveRecordInterface
     /**
      * Returns the number of related AttributeAv objects.
      *
-     * @param  Criteria            $criteria
+     * @param      Criteria $criteria
-     * @param  boolean             $distinct
+     * @param      boolean $distinct
-     * @param  ConnectionInterface $con
+     * @param      ConnectionInterface $con
-     * @return int                 Count of related AttributeAv objects.
+     * @return int             Count of related AttributeAv objects.
      * @throws PropelException
      */
     public function countAttributeAvs(Criteria $criteria = null, $distinct = false, ConnectionInterface $con = null)
@@ -1524,8 +1534,8 @@ abstract class Attribute implements ActiveRecordInterface
      * Method called to associate a ChildAttributeAv object to this object
      * through the ChildAttributeAv foreign key attribute.
      *
-     * @param  ChildAttributeAv        $l ChildAttributeAv
+     * @param    ChildAttributeAv $l ChildAttributeAv
-     * @return \Thelia\Model\Attribute The current object (for fluent API support)
+     * @return   \Thelia\Model\Attribute The current object (for fluent API support)
      */
     public function addAttributeAv(ChildAttributeAv $l)
     {
@@ -1551,7 +1561,7 @@ abstract class Attribute implements ActiveRecordInterface
     }
 
     /**
-     * @param  AttributeAv    $attributeAv The attributeAv object to remove.
+     * @param  AttributeAv $attributeAv The attributeAv object to remove.
      * @return ChildAttribute The current object (for fluent API support)
      */
     public function removeAttributeAv($attributeAv)
@@ -1598,8 +1608,8 @@ abstract class Attribute implements ActiveRecordInterface
      * however, you may wish to override this method in your stub class to provide setting appropriate
      * to your application -- for example, setting the initial array to the values stored in database.
      *
-     * @param boolean $overrideExisting If set to true, the method call initializes
+     * @param      boolean $overrideExisting If set to true, the method call initializes
-     *                                  the collection even if it is not empty
+     *                                        the collection even if it is not empty
      *
      * @return void
      */
@@ -1621,8 +1631,8 @@ abstract class Attribute implements ActiveRecordInterface
      * If this ChildAttribute is new, it will return
      * an empty collection or the current collection; the criteria is ignored on a new object.
      *
-     * @param  Criteria                               $criteria optional Criteria object to narrow the query
+     * @param      Criteria $criteria optional Criteria object to narrow the query
-     * @param  ConnectionInterface                    $con      optional connection object
+     * @param      ConnectionInterface $con optional connection object
      * @return Collection|ChildAttributeCombination[] List of ChildAttributeCombination objects
      * @throws PropelException
      */
@@ -1678,14 +1688,15 @@ abstract class Attribute implements ActiveRecordInterface
      * It will also schedule objects for deletion based on a diff between old objects (aka persisted)
      * and new objects from the given Propel collection.
      *
-     * @param  Collection          $attributeCombinations A Propel collection.
+     * @param      Collection $attributeCombinations A Propel collection.
-     * @param  ConnectionInterface $con                   Optional connection object
+     * @param      ConnectionInterface $con Optional connection object
-     * @return ChildAttribute      The current object (for fluent API support)
+     * @return   ChildAttribute The current object (for fluent API support)
      */
     public function setAttributeCombinations(Collection $attributeCombinations, ConnectionInterface $con = null)
     {
         $attributeCombinationsToDelete = $this->getAttributeCombinations(new Criteria(), $con)->diff($attributeCombinations);
 
+
         //since at least one column in the foreign key is at the same time a PK
         //we can not just set a PK to NULL in the lines below. We have to store
         //a backup of all values, so we are able to manipulate these items based on the onDelete value later.
@@ -1709,10 +1720,10 @@ abstract class Attribute implements ActiveRecordInterface
     /**
      * Returns the number of related AttributeCombination objects.
      *
-     * @param  Criteria            $criteria
+     * @param      Criteria $criteria
-     * @param  boolean             $distinct
+     * @param      boolean $distinct
-     * @param  ConnectionInterface $con
+     * @param      ConnectionInterface $con
-     * @return int                 Count of related AttributeCombination objects.
+     * @return int             Count of related AttributeCombination objects.
      * @throws PropelException
      */
     public function countAttributeCombinations(Criteria $criteria = null, $distinct = false, ConnectionInterface $con = null)
@@ -1744,8 +1755,8 @@ abstract class Attribute implements ActiveRecordInterface
      * Method called to associate a ChildAttributeCombination object to this object
      * through the ChildAttributeCombination foreign key attribute.
      *
-     * @param  ChildAttributeCombination $l ChildAttributeCombination
+     * @param    ChildAttributeCombination $l ChildAttributeCombination
-     * @return \Thelia\Model\Attribute   The current object (for fluent API support)
+     * @return   \Thelia\Model\Attribute The current object (for fluent API support)
      */
     public function addAttributeCombination(ChildAttributeCombination $l)
     {
@@ -1772,7 +1783,7 @@ abstract class Attribute implements ActiveRecordInterface
 
     /**
      * @param  AttributeCombination $attributeCombination The attributeCombination object to remove.
-     * @return ChildAttribute       The current object (for fluent API support)
+     * @return ChildAttribute The current object (for fluent API support)
      */
     public function removeAttributeCombination($attributeCombination)
     {
@@ -1789,6 +1800,7 @@ abstract class Attribute implements ActiveRecordInterface
         return $this;
     }
 
+
     /**
      * If this collection has already been initialized with
      * an identical criteria, it returns the collection.
@@ -1800,9 +1812,9 @@ abstract class Attribute implements ActiveRecordInterface
      * api reasonable.  You can provide public methods for those you
      * actually need in Attribute.
      *
-     * @param  Criteria                               $criteria     optional Criteria object to narrow the query
+     * @param      Criteria $criteria optional Criteria object to narrow the query
-     * @param  ConnectionInterface                    $con          optional connection object
+     * @param      ConnectionInterface $con optional connection object
-     * @param  string                                 $joinBehavior optional join type to use (defaults to Criteria::LEFT_JOIN)
+     * @param      string $joinBehavior optional join type to use (defaults to Criteria::LEFT_JOIN)
      * @return Collection|ChildAttributeCombination[] List of ChildAttributeCombination objects
      */
     public function getAttributeCombinationsJoinAttributeAv($criteria = null, $con = null, $joinBehavior = Criteria::LEFT_JOIN)
@@ -1813,6 +1825,7 @@ abstract class Attribute implements ActiveRecordInterface
         return $this->getAttributeCombinations($query, $con);
     }
 
+
     /**
      * If this collection has already been initialized with
      * an identical criteria, it returns the collection.
@@ -1824,9 +1837,9 @@ abstract class Attribute implements ActiveRecordInterface
      * api reasonable.  You can provide public methods for those you
      * actually need in Attribute.
      *
-     * @param  Criteria                               $criteria     optional Criteria object to narrow the query
+     * @param      Criteria $criteria optional Criteria object to narrow the query
-     * @param  ConnectionInterface                    $con          optional connection object
+     * @param      ConnectionInterface $con optional connection object
-     * @param  string                                 $joinBehavior optional join type to use (defaults to Criteria::LEFT_JOIN)
+     * @param      string $joinBehavior optional join type to use (defaults to Criteria::LEFT_JOIN)
      * @return Collection|ChildAttributeCombination[] List of ChildAttributeCombination objects
      */
     public function getAttributeCombinationsJoinProductSaleElements($criteria = null, $con = null, $joinBehavior = Criteria::LEFT_JOIN)
@@ -1866,8 +1879,8 @@ abstract class Attribute implements ActiveRecordInterface
      * however, you may wish to override this method in your stub class to provide setting appropriate
      * to your application -- for example, setting the initial array to the values stored in database.
      *
-     * @param boolean $overrideExisting If set to true, the method call initializes
+     * @param      boolean $overrideExisting If set to true, the method call initializes
-     *                                  the collection even if it is not empty
+     *                                        the collection even if it is not empty
      *
      * @return void
      */
@@ -1889,8 +1902,8 @@ abstract class Attribute implements ActiveRecordInterface
      * If this ChildAttribute is new, it will return
      * an empty collection or the current collection; the criteria is ignored on a new object.
      *
-     * @param  Criteria                            $criteria optional Criteria object to narrow the query
+     * @param      Criteria $criteria optional Criteria object to narrow the query
-     * @param  ConnectionInterface                 $con      optional connection object
+     * @param      ConnectionInterface $con optional connection object
      * @return Collection|ChildAttributeTemplate[] List of ChildAttributeTemplate objects
      * @throws PropelException
      */
@@ -1946,14 +1959,15 @@ abstract class Attribute implements ActiveRecordInterface
      * It will also schedule objects for deletion based on a diff between old objects (aka persisted)
      * and new objects from the given Propel collection.
      *
-     * @param  Collection          $attributeTemplates A Propel collection.
+     * @param      Collection $attributeTemplates A Propel collection.
-     * @param  ConnectionInterface $con                Optional connection object
+     * @param      ConnectionInterface $con Optional connection object
-     * @return ChildAttribute      The current object (for fluent API support)
+     * @return   ChildAttribute The current object (for fluent API support)
      */
     public function setAttributeTemplates(Collection $attributeTemplates, ConnectionInterface $con = null)
     {
         $attributeTemplatesToDelete = $this->getAttributeTemplates(new Criteria(), $con)->diff($attributeTemplates);
 
+
         $this->attributeTemplatesScheduledForDeletion = $attributeTemplatesToDelete;
 
         foreach ($attributeTemplatesToDelete as $attributeTemplateRemoved) {
@@ -1974,10 +1988,10 @@ abstract class Attribute implements ActiveRecordInterface
     /**
      * Returns the number of related AttributeTemplate objects.
      *
-     * @param  Criteria            $criteria
+     * @param      Criteria $criteria
-     * @param  boolean             $distinct
+     * @param      boolean $distinct
-     * @param  ConnectionInterface $con
+     * @param      ConnectionInterface $con
-     * @return int                 Count of related AttributeTemplate objects.
+     * @return int             Count of related AttributeTemplate objects.
      * @throws PropelException
      */
     public function countAttributeTemplates(Criteria $criteria = null, $distinct = false, ConnectionInterface $con = null)
@@ -2009,8 +2023,8 @@ abstract class Attribute implements ActiveRecordInterface
      * Method called to associate a ChildAttributeTemplate object to this object
      * through the ChildAttributeTemplate foreign key attribute.
      *
-     * @param  ChildAttributeTemplate  $l ChildAttributeTemplate
+     * @param    ChildAttributeTemplate $l ChildAttributeTemplate
-     * @return \Thelia\Model\Attribute The current object (for fluent API support)
+     * @return   \Thelia\Model\Attribute The current object (for fluent API support)
      */
     public function addAttributeTemplate(ChildAttributeTemplate $l)
     {
@@ -2037,7 +2051,7 @@ abstract class Attribute implements ActiveRecordInterface
 
     /**
      * @param  AttributeTemplate $attributeTemplate The attributeTemplate object to remove.
-     * @return ChildAttribute    The current object (for fluent API support)
+     * @return ChildAttribute The current object (for fluent API support)
      */
     public function removeAttributeTemplate($attributeTemplate)
     {
@@ -2054,6 +2068,7 @@ abstract class Attribute implements ActiveRecordInterface
         return $this;
     }
 
+
     /**
      * If this collection has already been initialized with
      * an identical criteria, it returns the collection.
@@ -2065,9 +2080,9 @@ abstract class Attribute implements ActiveRecordInterface
      * api reasonable.  You can provide public methods for those you
      * actually need in Attribute.
      *
-     * @param  Criteria                            $criteria     optional Criteria object to narrow the query
+     * @param      Criteria $criteria optional Criteria object to narrow the query
-     * @param  ConnectionInterface                 $con          optional connection object
+     * @param      ConnectionInterface $con optional connection object
-     * @param  string                              $joinBehavior optional join type to use (defaults to Criteria::LEFT_JOIN)
+     * @param      string $joinBehavior optional join type to use (defaults to Criteria::LEFT_JOIN)
      * @return Collection|ChildAttributeTemplate[] List of ChildAttributeTemplate objects
      */
     public function getAttributeTemplatesJoinTemplate($criteria = null, $con = null, $joinBehavior = Criteria::LEFT_JOIN)
@@ -2107,8 +2122,8 @@ abstract class Attribute implements ActiveRecordInterface
      * however, you may wish to override this method in your stub class to provide setting appropriate
      * to your application -- for example, setting the initial array to the values stored in database.
      *
-     * @param boolean $overrideExisting If set to true, the method call initializes
+     * @param      boolean $overrideExisting If set to true, the method call initializes
-     *                                  the collection even if it is not empty
+     *                                        the collection even if it is not empty
      *
      * @return void
      */
@@ -2130,8 +2145,8 @@ abstract class Attribute implements ActiveRecordInterface
      * If this ChildAttribute is new, it will return
      * an empty collection or the current collection; the criteria is ignored on a new object.
      *
-     * @param  Criteria                        $criteria optional Criteria object to narrow the query
+     * @param      Criteria $criteria optional Criteria object to narrow the query
-     * @param  ConnectionInterface             $con      optional connection object
+     * @param      ConnectionInterface $con optional connection object
      * @return Collection|ChildAttributeI18n[] List of ChildAttributeI18n objects
      * @throws PropelException
      */
@@ -2187,14 +2202,15 @@ abstract class Attribute implements ActiveRecordInterface
      * It will also schedule objects for deletion based on a diff between old objects (aka persisted)
      * and new objects from the given Propel collection.
      *
-     * @param  Collection          $attributeI18ns A Propel collection.
+     * @param      Collection $attributeI18ns A Propel collection.
-     * @param  ConnectionInterface $con            Optional connection object
+     * @param      ConnectionInterface $con Optional connection object
-     * @return ChildAttribute      The current object (for fluent API support)
+     * @return   ChildAttribute The current object (for fluent API support)
      */
     public function setAttributeI18ns(Collection $attributeI18ns, ConnectionInterface $con = null)
     {
         $attributeI18nsToDelete = $this->getAttributeI18ns(new Criteria(), $con)->diff($attributeI18ns);
 
+
         //since at least one column in the foreign key is at the same time a PK
         //we can not just set a PK to NULL in the lines below. We have to store
         //a backup of all values, so we are able to manipulate these items based on the onDelete value later.
@@ -2218,10 +2234,10 @@ abstract class Attribute implements ActiveRecordInterface
     /**
      * Returns the number of related AttributeI18n objects.
      *
-     * @param  Criteria            $criteria
+     * @param      Criteria $criteria
-     * @param  boolean             $distinct
+     * @param      boolean $distinct
-     * @param  ConnectionInterface $con
+     * @param      ConnectionInterface $con
-     * @return int                 Count of related AttributeI18n objects.
+     * @return int             Count of related AttributeI18n objects.
      * @throws PropelException
      */
     public function countAttributeI18ns(Criteria $criteria = null, $distinct = false, ConnectionInterface $con = null)
@@ -2253,8 +2269,8 @@ abstract class Attribute implements ActiveRecordInterface
      * Method called to associate a ChildAttributeI18n object to this object
      * through the ChildAttributeI18n foreign key attribute.
      *
-     * @param  ChildAttributeI18n      $l ChildAttributeI18n
+     * @param    ChildAttributeI18n $l ChildAttributeI18n
-     * @return \Thelia\Model\Attribute The current object (for fluent API support)
+     * @return   \Thelia\Model\Attribute The current object (for fluent API support)
      */
     public function addAttributeI18n(ChildAttributeI18n $l)
     {
@@ -2284,7 +2300,7 @@ abstract class Attribute implements ActiveRecordInterface
     }
 
     /**
-     * @param  AttributeI18n  $attributeI18n The attributeI18n object to remove.
+     * @param  AttributeI18n $attributeI18n The attributeI18n object to remove.
      * @return ChildAttribute The current object (for fluent API support)
      */
     public function removeAttributeI18n($attributeI18n)
@@ -2342,8 +2358,8 @@ abstract class Attribute implements ActiveRecordInterface
      * If this ChildAttribute is new, it will return
      * an empty collection or the current collection; the criteria is ignored on a new object.
      *
-     * @param Criteria            $criteria Optional query object to filter the query
+     * @param      Criteria $criteria Optional query object to filter the query
-     * @param ConnectionInterface $con      Optional connection object
+     * @param      ConnectionInterface $con Optional connection object
      *
      * @return ObjectCollection|ChildTemplate[] List of ChildTemplate objects
      */
@@ -2373,9 +2389,9 @@ abstract class Attribute implements ActiveRecordInterface
      * It will also schedule objects for deletion based on a diff between old objects (aka persisted)
      * and new objects from the given Propel collection.
      *
-     * @param  Collection          $templates A Propel collection.
+     * @param  Collection $templates A Propel collection.
-     * @param  ConnectionInterface $con       Optional connection object
+     * @param  ConnectionInterface $con Optional connection object
-     * @return ChildAttribute      The current object (for fluent API support)
+     * @return ChildAttribute The current object (for fluent API support)
      */
     public function setTemplates(Collection $templates, ConnectionInterface $con = null)
     {
@@ -2399,9 +2415,9 @@ abstract class Attribute implements ActiveRecordInterface
      * Gets the number of ChildTemplate objects related by a many-to-many relationship
      * to the current object by way of the attribute_template cross-reference table.
      *
-     * @param Criteria            $criteria Optional query object to filter the query
+     * @param      Criteria $criteria Optional query object to filter the query
-     * @param boolean             $distinct Set to true to force count distinct
+     * @param      boolean $distinct Set to true to force count distinct
-     * @param ConnectionInterface $con      Optional connection object
+     * @param      ConnectionInterface $con Optional connection object
      *
      * @return int the number of related ChildTemplate objects
      */
@@ -2429,7 +2445,7 @@ abstract class Attribute implements ActiveRecordInterface
      * Associate a ChildTemplate object to this object
      * through the attribute_template cross reference table.
      *
-     * @param  ChildTemplate  $template The ChildAttributeTemplate object to relate
+     * @param  ChildTemplate $template The ChildAttributeTemplate object to relate
      * @return ChildAttribute The current object (for fluent API support)
      */
     public function addTemplate(ChildTemplate $template)
@@ -2447,7 +2463,7 @@ abstract class Attribute implements ActiveRecordInterface
     }
 
     /**
-     * @param Template $template The template object to add.
+     * @param    Template $template The template object to add.
      */
     protected function doAddTemplate($template)
     {
@@ -2466,7 +2482,7 @@ abstract class Attribute implements ActiveRecordInterface
      * Remove a ChildTemplate object to this object
      * through the attribute_template cross reference table.
      *
-     * @param  ChildTemplate  $template The ChildAttributeTemplate object to relate
+     * @param ChildTemplate $template The ChildAttributeTemplate object to relate
      * @return ChildAttribute The current object (for fluent API support)
      */
     public function removeTemplate(ChildTemplate $template)
@@ -2508,7 +2524,7 @@ abstract class Attribute implements ActiveRecordInterface
      * objects with circular references (even in PHP 5.3). This is currently necessary
      * when using Propel in certain daemon or large-volume/high-memory operations.
      *
-     * @param boolean $deep Whether to also clear the references on all referrer objects.
+     * @param      boolean $deep Whether to also clear the references on all referrer objects.
      */
     public function clearAllReferences($deep = false)
     {
@@ -2566,7 +2582,7 @@ abstract class Attribute implements ActiveRecordInterface
     /**
      * Mark the current object so that the update date doesn't get updated during next save
      *
-     * @return ChildAttribute The current object (for fluent API support)
+     * @return     ChildAttribute The current object (for fluent API support)
      */
     public function keepUpdateDateUnchanged()
     {
@@ -2580,9 +2596,9 @@ abstract class Attribute implements ActiveRecordInterface
     /**
      * Sets the locale for translations
      *
-     * @param string $locale Locale to use for the translation, e.g. 'fr_FR'
+     * @param     string $locale Locale to use for the translation, e.g. 'fr_FR'
      *
-     * @return ChildAttribute The current object (for fluent API support)
+     * @return    ChildAttribute The current object (for fluent API support)
      */
     public function setLocale($locale = 'en_US')
     {
@@ -2594,7 +2610,7 @@ abstract class Attribute implements ActiveRecordInterface
     /**
      * Gets the locale for translations
      *
-     * @return string $locale Locale to use for the translation, e.g. 'fr_FR'
+     * @return    string $locale Locale to use for the translation, e.g. 'fr_FR'
      */
     public function getLocale()
     {
@@ -2604,8 +2620,8 @@ abstract class Attribute implements ActiveRecordInterface
     /**
      * Returns the current translation for a given locale
      *
-     * @param string              $locale Locale to use for the translation, e.g. 'fr_FR'
+     * @param     string $locale Locale to use for the translation, e.g. 'fr_FR'
-     * @param ConnectionInterface $con    an optional connection object
+     * @param     ConnectionInterface $con an optional connection object
      *
      * @return ChildAttributeI18n */
     public function getTranslation($locale = 'en_US', ConnectionInterface $con = null)
@@ -2638,10 +2654,10 @@ abstract class Attribute implements ActiveRecordInterface
     /**
      * Remove the translation for a given locale
      *
-     * @param string              $locale Locale to use for the translation, e.g. 'fr_FR'
+     * @param     string $locale Locale to use for the translation, e.g. 'fr_FR'
-     * @param ConnectionInterface $con    an optional connection object
+     * @param     ConnectionInterface $con an optional connection object
      *
-     * @return ChildAttribute The current object (for fluent API support)
+     * @return    ChildAttribute The current object (for fluent API support)
      */
     public function removeTranslation($locale = 'en_US', ConnectionInterface $con = null)
     {
@@ -2666,7 +2682,7 @@ abstract class Attribute implements ActiveRecordInterface
     /**
      * Returns the current translation
      *
-     * @param ConnectionInterface $con an optional connection object
+     * @param     ConnectionInterface $con an optional connection object
      *
      * @return ChildAttributeI18n */
     public function getCurrentTranslation(ConnectionInterface $con = null)
@@ -2674,6 +2690,7 @@ abstract class Attribute implements ActiveRecordInterface
         return $this->getTranslation($this->getLocale(), $con);
     }
 
+
         /**
          * Get the [title] column value.
          *
@@ -2684,6 +2701,7 @@ abstract class Attribute implements ActiveRecordInterface
         return $this->getCurrentTranslation()->getTitle();
     }
 
+
         /**
          * Set the value of [title] column.
          *
@@ -2696,6 +2714,7 @@ abstract class Attribute implements ActiveRecordInterface
         return $this;
     }
 
+
         /**
          * Get the [description] column value.
          *
@@ -2706,6 +2725,7 @@ abstract class Attribute implements ActiveRecordInterface
         return $this->getCurrentTranslation()->getDescription();
     }
 
+
         /**
          * Set the value of [description] column.
          *
@@ -2718,6 +2738,7 @@ abstract class Attribute implements ActiveRecordInterface
         return $this;
     }
 
+
         /**
          * Get the [chapo] column value.
          *
@@ -2728,6 +2749,7 @@ abstract class Attribute implements ActiveRecordInterface
         return $this->getCurrentTranslation()->getChapo();
     }
 
+
         /**
          * Set the value of [chapo] column.
          *
@@ -2740,6 +2762,7 @@ abstract class Attribute implements ActiveRecordInterface
         return $this;
     }
 
+
         /**
          * Get the [postscriptum] column value.
          *
@@ -2750,6 +2773,7 @@ abstract class Attribute implements ActiveRecordInterface
         return $this->getCurrentTranslation()->getPostscriptum();
     }
 
+
         /**
          * Set the value of [postscriptum] column.
          *
@@ -2838,6 +2862,7 @@ abstract class Attribute implements ActiveRecordInterface
 
     }
 
+
     /**
      * Derived method to catches calls to undefined methods.
      *

core/lib/Thelia/Model/Base/AttributeAv.php

@@ -34,6 +34,7 @@ abstract class AttributeAv implements ActiveRecordInterface
      */
     const TABLE_MAP = '\\Thelia\\Model\\Map\\AttributeAvTableMap';
 
+
     /**
      * attribute to determine if this object has previously been saved.
      * @var boolean
@@ -350,9 +351,9 @@ abstract class AttributeAv implements ActiveRecordInterface
      * $book->importFrom('JSON', '{"Id":9012,"Title":"Don Juan","ISBN":"0140422161","Price":12.99,"PublisherId":1234,"AuthorId":5678}');
      * </code>
      *
-     * @param mixed  $parser A AbstractParser instance,
+     * @param mixed $parser A AbstractParser instance,
      *                       or a format name ('XML', 'YAML', 'JSON', 'CSV')
-     * @param string $data   The source data to import from
+     * @param string $data The source data to import from
      *
      * @return AttributeAv The current object, for fluid interface
      */
@@ -402,30 +403,33 @@ abstract class AttributeAv implements ActiveRecordInterface
     /**
      * Get the [id] column value.
      *
-     * @return int
+     * @return   int
      */
     public function getId()
     {
+
         return $this->id;
     }
 
     /**
      * Get the [attribute_id] column value.
      *
-     * @return int
+     * @return   int
      */
     public function getAttributeId()
     {
+
         return $this->attribute_id;
     }
 
     /**
      * Get the [position] column value.
      *
-     * @return int
+     * @return   int
      */
     public function getPosition()
     {
+
         return $this->position;
     }
 
@@ -433,8 +437,8 @@ abstract class AttributeAv implements ActiveRecordInterface
      * Get the [optionally formatted] temporal [created_at] column value.
      *
      *
-     * @param string $format The date/time format string (either date()-style or strftime()-style).
+     * @param      string $format The date/time format string (either date()-style or strftime()-style).
-     *                       If format is NULL, then the raw \DateTime object will be returned.
+     *                            If format is NULL, then the raw \DateTime object will be returned.
      *
      * @return mixed Formatted date/time value as string or \DateTime object (if format is NULL), NULL if column is NULL, and 0 if column value is 0000-00-00 00:00:00
      *
@@ -453,8 +457,8 @@ abstract class AttributeAv implements ActiveRecordInterface
      * Get the [optionally formatted] temporal [updated_at] column value.
      *
      *
-     * @param string $format The date/time format string (either date()-style or strftime()-style).
+     * @param      string $format The date/time format string (either date()-style or strftime()-style).
-     *                       If format is NULL, then the raw \DateTime object will be returned.
+     *                            If format is NULL, then the raw \DateTime object will be returned.
      *
      * @return mixed Formatted date/time value as string or \DateTime object (if format is NULL), NULL if column is NULL, and 0 if column value is 0000-00-00 00:00:00
      *
@@ -472,8 +476,8 @@ abstract class AttributeAv implements ActiveRecordInterface
     /**
      * Set the value of [id] column.
      *
-     * @param  int                       $v new value
+     * @param      int $v new value
-     * @return \Thelia\Model\AttributeAv The current object (for fluent API support)
+     * @return   \Thelia\Model\AttributeAv The current object (for fluent API support)
      */
     public function setId($v)
     {
@@ -486,14 +490,15 @@ abstract class AttributeAv implements ActiveRecordInterface
             $this->modifiedColumns[AttributeAvTableMap::ID] = true;
         }
 
+
         return $this;
     } // setId()
 
     /**
      * Set the value of [attribute_id] column.
      *
-     * @param  int                       $v new value
+     * @param      int $v new value
-     * @return \Thelia\Model\AttributeAv The current object (for fluent API support)
+     * @return   \Thelia\Model\AttributeAv The current object (for fluent API support)
      */
     public function setAttributeId($v)
     {
@@ -510,14 +515,15 @@ abstract class AttributeAv implements ActiveRecordInterface
             $this->aAttribute = null;
         }
 
+
         return $this;
     } // setAttributeId()
 
     /**
      * Set the value of [position] column.
      *
-     * @param  int                       $v new value
+     * @param      int $v new value
-     * @return \Thelia\Model\AttributeAv The current object (for fluent API support)
+     * @return   \Thelia\Model\AttributeAv The current object (for fluent API support)
      */
     public function setPosition($v)
     {
@@ -530,15 +536,16 @@ abstract class AttributeAv implements ActiveRecordInterface
             $this->modifiedColumns[AttributeAvTableMap::POSITION] = true;
         }
 
+
         return $this;
     } // setPosition()
 
     /**
      * Sets the value of [created_at] column to a normalized version of the date/time value specified.
      *
-     * @param  mixed                     $v string, integer (timestamp), or \DateTime value.
+     * @param      mixed $v string, integer (timestamp), or \DateTime value.
-     *                                      Empty strings are treated as NULL.
+     *               Empty strings are treated as NULL.
-     * @return \Thelia\Model\AttributeAv The current object (for fluent API support)
+     * @return   \Thelia\Model\AttributeAv The current object (for fluent API support)
      */
     public function setCreatedAt($v)
     {
@@ -550,15 +557,16 @@ abstract class AttributeAv implements ActiveRecordInterface
             }
         } // if either are not null
 
+
         return $this;
     } // setCreatedAt()
 
     /**
      * Sets the value of [updated_at] column to a normalized version of the date/time value specified.
      *
-     * @param  mixed                     $v string, integer (timestamp), or \DateTime value.
+     * @param      mixed $v string, integer (timestamp), or \DateTime value.
-     *                                      Empty strings are treated as NULL.
+     *               Empty strings are treated as NULL.
-     * @return \Thelia\Model\AttributeAv The current object (for fluent API support)
+     * @return   \Thelia\Model\AttributeAv The current object (for fluent API support)
      */
     public function setUpdatedAt($v)
     {
@@ -570,6 +578,7 @@ abstract class AttributeAv implements ActiveRecordInterface
             }
         } // if either are not null
 
+
         return $this;
     } // setUpdatedAt()
 
@@ -670,10 +679,10 @@ abstract class AttributeAv implements ActiveRecordInterface
      *
      * This will only work if the object has been saved and has a valid primary key set.
      *
-     * @param  boolean             $deep (optional) Whether to also de-associated any related objects.
+     * @param      boolean $deep (optional) Whether to also de-associated any related objects.
-     * @param  ConnectionInterface $con  (optional) The ConnectionInterface connection to use.
+     * @param      ConnectionInterface $con (optional) The ConnectionInterface connection to use.
      * @return void
-     * @throws PropelException     - if this object is deleted, unsaved or doesn't have pk match in db
+     * @throws PropelException - if this object is deleted, unsaved or doesn't have pk match in db
      */
     public function reload($deep = false, ConnectionInterface $con = null)
     {
@@ -713,7 +722,7 @@ abstract class AttributeAv implements ActiveRecordInterface
     /**
      * Removes this object from datastore and sets delete attribute.
      *
-     * @param  ConnectionInterface $con
+     * @param      ConnectionInterface $con
      * @return void
      * @throws PropelException
      * @see AttributeAv::setDeleted()
@@ -756,8 +765,8 @@ abstract class AttributeAv implements ActiveRecordInterface
      * method.  This method wraps all precipitate database operations in a
      * single transaction.
      *
-     * @param  ConnectionInterface $con
+     * @param      ConnectionInterface $con
-     * @return int                 The number of rows affected by this insert/update and any referring fk objects' save() operations.
+     * @return int             The number of rows affected by this insert/update and any referring fk objects' save() operations.
      * @throws PropelException
      * @see doSave()
      */
@@ -818,8 +827,8 @@ abstract class AttributeAv implements ActiveRecordInterface
      * If the object is new, it inserts it; otherwise an update is performed.
      * All related objects are also updated in this method.
      *
-     * @param  ConnectionInterface $con
+     * @param      ConnectionInterface $con
-     * @return int                 The number of rows affected by this insert/update and any referring fk objects' save() operations.
+     * @return int             The number of rows affected by this insert/update and any referring fk objects' save() operations.
      * @throws PropelException
      * @see save()
      */
@@ -896,7 +905,7 @@ abstract class AttributeAv implements ActiveRecordInterface
     /**
      * Insert the row in the database.
      *
-     * @param ConnectionInterface $con
+     * @param      ConnectionInterface $con
      *
      * @throws PropelException
      * @see doSave()
@@ -974,7 +983,7 @@ abstract class AttributeAv implements ActiveRecordInterface
     /**
      * Update the row in the database.
      *
-     * @param ConnectionInterface $con
+     * @param      ConnectionInterface $con
      *
      * @return Integer Number of updated rows
      * @see doSave()
@@ -990,12 +999,12 @@ abstract class AttributeAv implements ActiveRecordInterface
     /**
      * Retrieves a field from the object by name passed in as a string.
      *
-     * @param  string $name name
+     * @param      string $name name
-     * @param  string $type The type of fieldname the $name is of:
+     * @param      string $type The type of fieldname the $name is of:
-     *                      one of the class type constants TableMap::TYPE_PHPNAME, TableMap::TYPE_STUDLYPHPNAME
+     *                     one of the class type constants TableMap::TYPE_PHPNAME, TableMap::TYPE_STUDLYPHPNAME
-     *                      TableMap::TYPE_COLNAME, TableMap::TYPE_FIELDNAME, TableMap::TYPE_NUM.
+     *                     TableMap::TYPE_COLNAME, TableMap::TYPE_FIELDNAME, TableMap::TYPE_NUM.
-     *                      Defaults to TableMap::TYPE_PHPNAME.
+     *                     Defaults to TableMap::TYPE_PHPNAME.
-     * @return mixed  Value of field.
+     * @return mixed Value of field.
      */
     public function getByName($name, $type = TableMap::TYPE_PHPNAME)
     {
@@ -1009,7 +1018,7 @@ abstract class AttributeAv implements ActiveRecordInterface
      * Retrieves a field from the object by Position as specified in the xml schema.
      * Zero-based.
      *
-     * @param  int   $pos position in xml schema
+     * @param      int $pos position in xml schema
      * @return mixed Value of field at $pos
      */
     public function getByPosition($pos)
@@ -1042,12 +1051,12 @@ abstract class AttributeAv implements ActiveRecordInterface
      * You can specify the key type of the array by passing one of the class
      * type constants.
      *
-     * @param string  $keyType                (optional) One of the class type constants TableMap::TYPE_PHPNAME, TableMap::TYPE_STUDLYPHPNAME,
+     * @param     string  $keyType (optional) One of the class type constants TableMap::TYPE_PHPNAME, TableMap::TYPE_STUDLYPHPNAME,
-     *                                        TableMap::TYPE_COLNAME, TableMap::TYPE_FIELDNAME, TableMap::TYPE_NUM.
+     *                    TableMap::TYPE_COLNAME, TableMap::TYPE_FIELDNAME, TableMap::TYPE_NUM.
-     *                                        Defaults to TableMap::TYPE_PHPNAME.
+     *                    Defaults to TableMap::TYPE_PHPNAME.
-     * @param boolean $includeLazyLoadColumns (optional) Whether to include lazy loaded columns. Defaults to TRUE.
+     * @param     boolean $includeLazyLoadColumns (optional) Whether to include lazy loaded columns. Defaults to TRUE.
-     * @param array   $alreadyDumpedObjects   List of objects to skip to avoid recursion
+     * @param     array $alreadyDumpedObjects List of objects to skip to avoid recursion
-     * @param boolean $includeForeignObjects  (optional) Whether to include hydrated related objects. Default to FALSE.
+     * @param     boolean $includeForeignObjects (optional) Whether to include hydrated related objects. Default to FALSE.
      *
      * @return array an associative array containing the field names (as keys) and field values
      */
@@ -1088,12 +1097,12 @@ abstract class AttributeAv implements ActiveRecordInterface
     /**
      * Sets a field from the object by name passed in as a string.
      *
-     * @param  string $name
+     * @param      string $name
-     * @param  mixed  $value field value
+     * @param      mixed  $value field value
-     * @param  string $type  The type of fieldname the $name is of:
+     * @param      string $type The type of fieldname the $name is of:
-     *                       one of the class type constants TableMap::TYPE_PHPNAME, TableMap::TYPE_STUDLYPHPNAME
+     *                     one of the class type constants TableMap::TYPE_PHPNAME, TableMap::TYPE_STUDLYPHPNAME
-     *                       TableMap::TYPE_COLNAME, TableMap::TYPE_FIELDNAME, TableMap::TYPE_NUM.
+     *                     TableMap::TYPE_COLNAME, TableMap::TYPE_FIELDNAME, TableMap::TYPE_NUM.
-     *                       Defaults to TableMap::TYPE_PHPNAME.
+     *                     Defaults to TableMap::TYPE_PHPNAME.
      * @return void
      */
     public function setByName($name, $value, $type = TableMap::TYPE_PHPNAME)
@@ -1107,8 +1116,8 @@ abstract class AttributeAv implements ActiveRecordInterface
      * Sets a field from the object by Position as specified in the xml schema.
      * Zero-based.
      *
-     * @param  int   $pos   position in xml schema
+     * @param      int $pos position in xml schema
-     * @param  mixed $value field value
+     * @param      mixed $value field value
      * @return void
      */
     public function setByPosition($pos, $value)
@@ -1145,8 +1154,8 @@ abstract class AttributeAv implements ActiveRecordInterface
      * TableMap::TYPE_COLNAME, TableMap::TYPE_FIELDNAME, TableMap::TYPE_NUM.
      * The default key type is the column's TableMap::TYPE_PHPNAME.
      *
-     * @param  array  $arr     An array to populate the object from.
+     * @param      array  $arr     An array to populate the object from.
-     * @param  string $keyType The type of keys the array uses.
+     * @param      string $keyType The type of keys the array uses.
      * @return void
      */
     public function fromArray($arr, $keyType = TableMap::TYPE_PHPNAME)
@@ -1174,6 +1183,7 @@ abstract class AttributeAv implements ActiveRecordInterface
         if ($this->isColumnModified(AttributeAvTableMap::POSITION)) $criteria->add(AttributeAvTableMap::POSITION, $this->position);
         if ($this->isColumnModified(AttributeAvTableMap::CREATED_AT)) $criteria->add(AttributeAvTableMap::CREATED_AT, $this->created_at);
         if ($this->isColumnModified(AttributeAvTableMap::UPDATED_AT)) $criteria->add(AttributeAvTableMap::UPDATED_AT, $this->updated_at);
+
         return $criteria;
     }
 
@@ -1195,7 +1205,7 @@ abstract class AttributeAv implements ActiveRecordInterface
 
     /**
      * Returns the primary key for this object (row).
-     * @return int
+     * @return   int
      */
     public function getPrimaryKey()
     {
@@ -1205,7 +1215,7 @@ abstract class AttributeAv implements ActiveRecordInterface
     /**
      * Generic method to set the primary key (id column).
      *
-     * @param  int  $key Primary key.
+     * @param       int $key Primary key.
      * @return void
      */
     public function setPrimaryKey($key)
@@ -1219,6 +1229,7 @@ abstract class AttributeAv implements ActiveRecordInterface
      */
     public function isPrimaryKeyNull()
     {
+
         return null === $this->getId();
     }
 
@@ -1228,9 +1239,9 @@ abstract class AttributeAv implements ActiveRecordInterface
      * If desired, this method can also make copies of all associated (fkey referrers)
      * objects.
      *
-     * @param  object          $copyObj  An object of \Thelia\Model\AttributeAv (or compatible) type.
+     * @param      object $copyObj An object of \Thelia\Model\AttributeAv (or compatible) type.
-     * @param  boolean         $deepCopy Whether to also copy all rows that refer (by fkey) to the current row.
+     * @param      boolean $deepCopy Whether to also copy all rows that refer (by fkey) to the current row.
-     * @param  boolean         $makeNew  Whether to reset autoincrement PKs and make the object new.
+     * @param      boolean $makeNew Whether to reset autoincrement PKs and make the object new.
      * @throws PropelException
      */
     public function copyInto($copyObj, $deepCopy = false, $makeNew = true)
@@ -1273,8 +1284,8 @@ abstract class AttributeAv implements ActiveRecordInterface
      * If desired, this method can also make copies of all associated (fkey referrers)
      * objects.
      *
-     * @param  boolean                   $deepCopy Whether to also copy all rows that refer (by fkey) to the current row.
+     * @param      boolean $deepCopy Whether to also copy all rows that refer (by fkey) to the current row.
-     * @return \Thelia\Model\AttributeAv Clone of current object.
+     * @return                 \Thelia\Model\AttributeAv Clone of current object.
      * @throws PropelException
      */
     public function copy($deepCopy = false)
@@ -1290,8 +1301,8 @@ abstract class AttributeAv implements ActiveRecordInterface
     /**
      * Declares an association between this object and a ChildAttribute object.
      *
-     * @param  ChildAttribute            $v
+     * @param                  ChildAttribute $v
-     * @return \Thelia\Model\AttributeAv The current object (for fluent API support)
+     * @return                 \Thelia\Model\AttributeAv The current object (for fluent API support)
      * @throws PropelException
      */
     public function setAttribute(ChildAttribute $v = null)
@@ -1310,6 +1321,7 @@ abstract class AttributeAv implements ActiveRecordInterface
             $v->addAttributeAv($this);
         }
 
+
         return $this;
     }
 
@@ -1317,8 +1329,8 @@ abstract class AttributeAv implements ActiveRecordInterface
     /**
      * Get the associated ChildAttribute object
      *
-     * @param  ConnectionInterface $con Optional Connection object.
+     * @param      ConnectionInterface $con Optional Connection object.
-     * @return ChildAttribute      The associated ChildAttribute object.
+     * @return                 ChildAttribute The associated ChildAttribute object.
      * @throws PropelException
      */
     public function getAttribute(ConnectionInterface $con = null)
@@ -1343,7 +1355,7 @@ abstract class AttributeAv implements ActiveRecordInterface
      * Avoids crafting an 'init[$relationName]s' method name
      * that wouldn't work when StandardEnglishPluralizer is used.
      *
-     * @param  string $relationName The name of the relation to initialize
+     * @param      string $relationName The name of the relation to initialize
      * @return void
      */
     public function initRelation($relationName)
@@ -1385,8 +1397,8 @@ abstract class AttributeAv implements ActiveRecordInterface
      * however, you may wish to override this method in your stub class to provide setting appropriate
      * to your application -- for example, setting the initial array to the values stored in database.
      *
-     * @param boolean $overrideExisting If set to true, the method call initializes
+     * @param      boolean $overrideExisting If set to true, the method call initializes
-     *                                  the collection even if it is not empty
+     *                                        the collection even if it is not empty
      *
      * @return void
      */
@@ -1408,8 +1420,8 @@ abstract class AttributeAv implements ActiveRecordInterface
      * If this ChildAttributeAv is new, it will return
      * an empty collection or the current collection; the criteria is ignored on a new object.
      *
-     * @param  Criteria                               $criteria optional Criteria object to narrow the query
+     * @param      Criteria $criteria optional Criteria object to narrow the query
-     * @param  ConnectionInterface                    $con      optional connection object
+     * @param      ConnectionInterface $con optional connection object
      * @return Collection|ChildAttributeCombination[] List of ChildAttributeCombination objects
      * @throws PropelException
      */
@@ -1465,14 +1477,15 @@ abstract class AttributeAv implements ActiveRecordInterface
      * It will also schedule objects for deletion based on a diff between old objects (aka persisted)
      * and new objects from the given Propel collection.
      *
-     * @param  Collection          $attributeCombinations A Propel collection.
+     * @param      Collection $attributeCombinations A Propel collection.
-     * @param  ConnectionInterface $con                   Optional connection object
+     * @param      ConnectionInterface $con Optional connection object
-     * @return ChildAttributeAv    The current object (for fluent API support)
+     * @return   ChildAttributeAv The current object (for fluent API support)
      */
     public function setAttributeCombinations(Collection $attributeCombinations, ConnectionInterface $con = null)
     {
         $attributeCombinationsToDelete = $this->getAttributeCombinations(new Criteria(), $con)->diff($attributeCombinations);
 
+
         //since at least one column in the foreign key is at the same time a PK
         //we can not just set a PK to NULL in the lines below. We have to store
         //a backup of all values, so we are able to manipulate these items based on the onDelete value later.
@@ -1496,10 +1509,10 @@ abstract class AttributeAv implements ActiveRecordInterface
     /**
      * Returns the number of related AttributeCombination objects.
      *
-     * @param  Criteria            $criteria
+     * @param      Criteria $criteria
-     * @param  boolean             $distinct
+     * @param      boolean $distinct
-     * @param  ConnectionInterface $con
+     * @param      ConnectionInterface $con
-     * @return int                 Count of related AttributeCombination objects.
+     * @return int             Count of related AttributeCombination objects.
      * @throws PropelException
      */
     public function countAttributeCombinations(Criteria $criteria = null, $distinct = false, ConnectionInterface $con = null)
@@ -1531,8 +1544,8 @@ abstract class AttributeAv implements ActiveRecordInterface
      * Method called to associate a ChildAttributeCombination object to this object
      * through the ChildAttributeCombination foreign key attribute.
      *
-     * @param  ChildAttributeCombination $l ChildAttributeCombination
+     * @param    ChildAttributeCombination $l ChildAttributeCombination
-     * @return \Thelia\Model\AttributeAv The current object (for fluent API support)
+     * @return   \Thelia\Model\AttributeAv The current object (for fluent API support)
      */
     public function addAttributeCombination(ChildAttributeCombination $l)
     {
@@ -1559,7 +1572,7 @@ abstract class AttributeAv implements ActiveRecordInterface
 
     /**
      * @param  AttributeCombination $attributeCombination The attributeCombination object to remove.
-     * @return ChildAttributeAv     The current object (for fluent API support)
+     * @return ChildAttributeAv The current object (for fluent API support)
      */
     public function removeAttributeCombination($attributeCombination)
     {
@@ -1576,6 +1589,7 @@ abstract class AttributeAv implements ActiveRecordInterface
         return $this;
     }
 
+
     /**
      * If this collection has already been initialized with
      * an identical criteria, it returns the collection.
@@ -1587,9 +1601,9 @@ abstract class AttributeAv implements ActiveRecordInterface
      * api reasonable.  You can provide public methods for those you
      * actually need in AttributeAv.
      *
-     * @param  Criteria                               $criteria     optional Criteria object to narrow the query
+     * @param      Criteria $criteria optional Criteria object to narrow the query
-     * @param  ConnectionInterface                    $con          optional connection object
+     * @param      ConnectionInterface $con optional connection object
-     * @param  string                                 $joinBehavior optional join type to use (defaults to Criteria::LEFT_JOIN)
+     * @param      string $joinBehavior optional join type to use (defaults to Criteria::LEFT_JOIN)
      * @return Collection|ChildAttributeCombination[] List of ChildAttributeCombination objects
      */
     public function getAttributeCombinationsJoinAttribute($criteria = null, $con = null, $joinBehavior = Criteria::LEFT_JOIN)
@@ -1600,6 +1614,7 @@ abstract class AttributeAv implements ActiveRecordInterface
         return $this->getAttributeCombinations($query, $con);
     }
 
+
     /**
      * If this collection has already been initialized with
      * an identical criteria, it returns the collection.
@@ -1611,9 +1626,9 @@ abstract class AttributeAv implements ActiveRecordInterface
      * api reasonable.  You can provide public methods for those you
      * actually need in AttributeAv.
      *
-     * @param  Criteria                               $criteria     optional Criteria object to narrow the query
+     * @param      Criteria $criteria optional Criteria object to narrow the query
-     * @param  ConnectionInterface                    $con          optional connection object
+     * @param      ConnectionInterface $con optional connection object
-     * @param  string                                 $joinBehavior optional join type to use (defaults to Criteria::LEFT_JOIN)
+     * @param      string $joinBehavior optional join type to use (defaults to Criteria::LEFT_JOIN)
      * @return Collection|ChildAttributeCombination[] List of ChildAttributeCombination objects
      */
     public function getAttributeCombinationsJoinProductSaleElements($criteria = null, $con = null, $joinBehavior = Criteria::LEFT_JOIN)
@@ -1653,8 +1668,8 @@ abstract class AttributeAv implements ActiveRecordInterface
      * however, you may wish to override this method in your stub class to provide setting appropriate
      * to your application -- for example, setting the initial array to the values stored in database.
      *
-     * @param boolean $overrideExisting If set to true, the method call initializes
+     * @param      boolean $overrideExisting If set to true, the method call initializes
-     *                                  the collection even if it is not empty
+     *                                        the collection even if it is not empty
      *
      * @return void
      */
@@ -1676,8 +1691,8 @@ abstract class AttributeAv implements ActiveRecordInterface
      * If this ChildAttributeAv is new, it will return
      * an empty collection or the current collection; the criteria is ignored on a new object.
      *
-     * @param  Criteria                          $criteria optional Criteria object to narrow the query
+     * @param      Criteria $criteria optional Criteria object to narrow the query
-     * @param  ConnectionInterface               $con      optional connection object
+     * @param      ConnectionInterface $con optional connection object
      * @return Collection|ChildAttributeAvI18n[] List of ChildAttributeAvI18n objects
      * @throws PropelException
      */
@@ -1733,14 +1748,15 @@ abstract class AttributeAv implements ActiveRecordInterface
      * It will also schedule objects for deletion based on a diff between old objects (aka persisted)
      * and new objects from the given Propel collection.
      *
-     * @param  Collection          $attributeAvI18ns A Propel collection.
+     * @param      Collection $attributeAvI18ns A Propel collection.
-     * @param  ConnectionInterface $con              Optional connection object
+     * @param      ConnectionInterface $con Optional connection object
-     * @return ChildAttributeAv    The current object (for fluent API support)
+     * @return   ChildAttributeAv The current object (for fluent API support)
      */
     public function setAttributeAvI18ns(Collection $attributeAvI18ns, ConnectionInterface $con = null)
     {
         $attributeAvI18nsToDelete = $this->getAttributeAvI18ns(new Criteria(), $con)->diff($attributeAvI18ns);
 
+
         //since at least one column in the foreign key is at the same time a PK
         //we can not just set a PK to NULL in the lines below. We have to store
         //a backup of all values, so we are able to manipulate these items based on the onDelete value later.
@@ -1764,10 +1780,10 @@ abstract class AttributeAv implements ActiveRecordInterface
     /**
      * Returns the number of related AttributeAvI18n objects.
      *
-     * @param  Criteria            $criteria
+     * @param      Criteria $criteria
-     * @param  boolean             $distinct
+     * @param      boolean $distinct
-     * @param  ConnectionInterface $con
+     * @param      ConnectionInterface $con
-     * @return int                 Count of related AttributeAvI18n objects.
+     * @return int             Count of related AttributeAvI18n objects.
      * @throws PropelException
      */
     public function countAttributeAvI18ns(Criteria $criteria = null, $distinct = false, ConnectionInterface $con = null)
@@ -1799,8 +1815,8 @@ abstract class AttributeAv implements ActiveRecordInterface
      * Method called to associate a ChildAttributeAvI18n object to this object
      * through the ChildAttributeAvI18n foreign key attribute.
      *
-     * @param  ChildAttributeAvI18n      $l ChildAttributeAvI18n
+     * @param    ChildAttributeAvI18n $l ChildAttributeAvI18n
-     * @return \Thelia\Model\AttributeAv The current object (for fluent API support)
+     * @return   \Thelia\Model\AttributeAv The current object (for fluent API support)
      */
     public function addAttributeAvI18n(ChildAttributeAvI18n $l)
     {
@@ -1830,7 +1846,7 @@ abstract class AttributeAv implements ActiveRecordInterface
     }
 
     /**
-     * @param  AttributeAvI18n  $attributeAvI18n The attributeAvI18n object to remove.
+     * @param  AttributeAvI18n $attributeAvI18n The attributeAvI18n object to remove.
      * @return ChildAttributeAv The current object (for fluent API support)
      */
     public function removeAttributeAvI18n($attributeAvI18n)
@@ -1872,7 +1888,7 @@ abstract class AttributeAv implements ActiveRecordInterface
      * objects with circular references (even in PHP 5.3). This is currently necessary
      * when using Propel in certain daemon or large-volume/high-memory operations.
      *
-     * @param boolean $deep Whether to also clear the references on all referrer objects.
+     * @param      boolean $deep Whether to also clear the references on all referrer objects.
      */
     public function clearAllReferences($deep = false)
     {
@@ -1913,7 +1929,7 @@ abstract class AttributeAv implements ActiveRecordInterface
     /**
      * Mark the current object so that the update date doesn't get updated during next save
      *
-     * @return ChildAttributeAv The current object (for fluent API support)
+     * @return     ChildAttributeAv The current object (for fluent API support)
      */
     public function keepUpdateDateUnchanged()
     {
@@ -1927,9 +1943,9 @@ abstract class AttributeAv implements ActiveRecordInterface
     /**
      * Sets the locale for translations
      *
-     * @param string $locale Locale to use for the translation, e.g. 'fr_FR'
+     * @param     string $locale Locale to use for the translation, e.g. 'fr_FR'
      *
-     * @return ChildAttributeAv The current object (for fluent API support)
+     * @return    ChildAttributeAv The current object (for fluent API support)
      */
     public function setLocale($locale = 'en_US')
     {
@@ -1941,7 +1957,7 @@ abstract class AttributeAv implements ActiveRecordInterface
     /**
      * Gets the locale for translations
      *
-     * @return string $locale Locale to use for the translation, e.g. 'fr_FR'
+     * @return    string $locale Locale to use for the translation, e.g. 'fr_FR'
      */
     public function getLocale()
     {
@@ -1951,8 +1967,8 @@ abstract class AttributeAv implements ActiveRecordInterface
     /**
      * Returns the current translation for a given locale
      *
-     * @param string              $locale Locale to use for the translation, e.g. 'fr_FR'
+     * @param     string $locale Locale to use for the translation, e.g. 'fr_FR'
-     * @param ConnectionInterface $con    an optional connection object
+     * @param     ConnectionInterface $con an optional connection object
      *
      * @return ChildAttributeAvI18n */
     public function getTranslation($locale = 'en_US', ConnectionInterface $con = null)
@@ -1985,10 +2001,10 @@ abstract class AttributeAv implements ActiveRecordInterface
     /**
      * Remove the translation for a given locale
      *
-     * @param string              $locale Locale to use for the translation, e.g. 'fr_FR'
+     * @param     string $locale Locale to use for the translation, e.g. 'fr_FR'
-     * @param ConnectionInterface $con    an optional connection object
+     * @param     ConnectionInterface $con an optional connection object
      *
-     * @return ChildAttributeAv The current object (for fluent API support)
+     * @return    ChildAttributeAv The current object (for fluent API support)
      */
     public function removeTranslation($locale = 'en_US', ConnectionInterface $con = null)
     {
@@ -2013,7 +2029,7 @@ abstract class AttributeAv implements ActiveRecordInterface
     /**
      * Returns the current translation
      *
-     * @param ConnectionInterface $con an optional connection object
+     * @param     ConnectionInterface $con an optional connection object
      *
      * @return ChildAttributeAvI18n */
     public function getCurrentTranslation(ConnectionInterface $con = null)
@@ -2021,6 +2037,7 @@ abstract class AttributeAv implements ActiveRecordInterface
         return $this->getTranslation($this->getLocale(), $con);
     }
 
+
         /**
          * Get the [title] column value.
          *
@@ -2031,6 +2048,7 @@ abstract class AttributeAv implements ActiveRecordInterface
         return $this->getCurrentTranslation()->getTitle();
     }
 
+
         /**
          * Set the value of [title] column.
          *
@@ -2043,6 +2061,7 @@ abstract class AttributeAv implements ActiveRecordInterface
         return $this;
     }
 
+
         /**
          * Get the [description] column value.
          *
@@ -2053,6 +2072,7 @@ abstract class AttributeAv implements ActiveRecordInterface
         return $this->getCurrentTranslation()->getDescription();
     }
 
+
         /**
          * Set the value of [description] column.
          *
@@ -2065,6 +2085,7 @@ abstract class AttributeAv implements ActiveRecordInterface
         return $this;
     }
 
+
         /**
          * Get the [chapo] column value.
          *
@@ -2075,6 +2096,7 @@ abstract class AttributeAv implements ActiveRecordInterface
         return $this->getCurrentTranslation()->getChapo();
     }
 
+
         /**
          * Set the value of [chapo] column.
          *
@@ -2087,6 +2109,7 @@ abstract class AttributeAv implements ActiveRecordInterface
         return $this;
     }
 
+
         /**
          * Get the [postscriptum] column value.
          *
@@ -2097,6 +2120,7 @@ abstract class AttributeAv implements ActiveRecordInterface
         return $this->getCurrentTranslation()->getPostscriptum();
     }
 
+
         /**
          * Set the value of [postscriptum] column.
          *
@@ -2185,6 +2209,7 @@ abstract class AttributeAv implements ActiveRecordInterface
 
     }
 
+
     /**
      * Derived method to catches calls to undefined methods.
      *

core/lib/Thelia/Model/Base/AttributeAvI18n.php

@@ -26,6 +26,7 @@ abstract class AttributeAvI18n implements ActiveRecordInterface
      */
     const TABLE_MAP = '\\Thelia\\Model\\Map\\AttributeAvI18nTableMap';
 
+
     /**
      * attribute to determine if this object has previously been saved.
      * @var boolean
@@ -324,9 +325,9 @@ abstract class AttributeAvI18n implements ActiveRecordInterface
      * $book->importFrom('JSON', '{"Id":9012,"Title":"Don Juan","ISBN":"0140422161","Price":12.99,"PublisherId":1234,"AuthorId":5678}');
      * </code>
      *
-     * @param mixed  $parser A AbstractParser instance,
+     * @param mixed $parser A AbstractParser instance,
      *                       or a format name ('XML', 'YAML', 'JSON', 'CSV')
-     * @param string $data   The source data to import from
+     * @param string $data The source data to import from
      *
      * @return AttributeAvI18n The current object, for fluid interface
      */
@@ -376,68 +377,74 @@ abstract class AttributeAvI18n implements ActiveRecordInterface
     /**
      * Get the [id] column value.
      *
-     * @return int
+     * @return   int
      */
     public function getId()
     {
+
         return $this->id;
     }
 
     /**
      * Get the [locale] column value.
      *
-     * @return string
+     * @return   string
      */
     public function getLocale()
     {
+
         return $this->locale;
     }
 
     /**
      * Get the [title] column value.
      *
-     * @return string
+     * @return   string
      */
     public function getTitle()
     {
+
         return $this->title;
     }
 
     /**
      * Get the [description] column value.
      *
-     * @return string
+     * @return   string
      */
     public function getDescription()
     {
+
         return $this->description;
     }
 
     /**
      * Get the [chapo] column value.
      *
-     * @return string
+     * @return   string
      */
     public function getChapo()
     {
+
         return $this->chapo;
     }
 
     /**
      * Get the [postscriptum] column value.
      *
-     * @return string
+     * @return   string
      */
     public function getPostscriptum()
     {
+
         return $this->postscriptum;
     }
 
     /**
      * Set the value of [id] column.
      *
-     * @param  int                           $v new value
+     * @param      int $v new value
-     * @return \Thelia\Model\AttributeAvI18n The current object (for fluent API support)
+     * @return   \Thelia\Model\AttributeAvI18n The current object (for fluent API support)
      */
     public function setId($v)
     {
@@ -454,14 +461,15 @@ abstract class AttributeAvI18n implements ActiveRecordInterface
             $this->aAttributeAv = null;
         }
 
+
         return $this;
     } // setId()
 
     /**
      * Set the value of [locale] column.
      *
-     * @param  string                        $v new value
+     * @param      string $v new value
-     * @return \Thelia\Model\AttributeAvI18n The current object (for fluent API support)
+     * @return   \Thelia\Model\AttributeAvI18n The current object (for fluent API support)
      */
     public function setLocale($v)
     {
@@ -474,14 +482,15 @@ abstract class AttributeAvI18n implements ActiveRecordInterface
             $this->modifiedColumns[AttributeAvI18nTableMap::LOCALE] = true;
         }
 
+
         return $this;
     } // setLocale()
 
     /**
      * Set the value of [title] column.
      *
-     * @param  string                        $v new value
+     * @param      string $v new value
-     * @return \Thelia\Model\AttributeAvI18n The current object (for fluent API support)
+     * @return   \Thelia\Model\AttributeAvI18n The current object (for fluent API support)
      */
     public function setTitle($v)
     {
@@ -494,14 +503,15 @@ abstract class AttributeAvI18n implements ActiveRecordInterface
             $this->modifiedColumns[AttributeAvI18nTableMap::TITLE] = true;
         }
 
+
         return $this;
     } // setTitle()
 
     /**
      * Set the value of [description] column.
      *
-     * @param  string                        $v new value
+     * @param      string $v new value
-     * @return \Thelia\Model\AttributeAvI18n The current object (for fluent API support)
+     * @return   \Thelia\Model\AttributeAvI18n The current object (for fluent API support)
      */
     public function setDescription($v)
     {
@@ -514,14 +524,15 @@ abstract class AttributeAvI18n implements ActiveRecordInterface
             $this->modifiedColumns[AttributeAvI18nTableMap::DESCRIPTION] = true;
         }
 
+
         return $this;
     } // setDescription()
 
     /**
      * Set the value of [chapo] column.
      *
-     * @param  string                        $v new value
+     * @param      string $v new value
-     * @return \Thelia\Model\AttributeAvI18n The current object (for fluent API support)
+     * @return   \Thelia\Model\AttributeAvI18n The current object (for fluent API support)
      */
     public function setChapo($v)
     {
@@ -534,14 +545,15 @@ abstract class AttributeAvI18n implements ActiveRecordInterface
             $this->modifiedColumns[AttributeAvI18nTableMap::CHAPO] = true;
         }
 
+
         return $this;
     } // setChapo()
 
     /**
      * Set the value of [postscriptum] column.
      *
-     * @param  string                        $v new value
+     * @param      string $v new value
-     * @return \Thelia\Model\AttributeAvI18n The current object (for fluent API support)
+     * @return   \Thelia\Model\AttributeAvI18n The current object (for fluent API support)
      */
     public function setPostscriptum($v)
     {
@@ -554,6 +566,7 @@ abstract class AttributeAvI18n implements ActiveRecordInterface
             $this->modifiedColumns[AttributeAvI18nTableMap::POSTSCRIPTUM] = true;
         }
 
+
         return $this;
     } // setPostscriptum()
 
@@ -597,6 +610,7 @@ abstract class AttributeAvI18n implements ActiveRecordInterface
     {
         try {
 
+
             $col = $row[TableMap::TYPE_NUM == $indexType ? 0 + $startcol : AttributeAvI18nTableMap::translateFieldName('Id', TableMap::TYPE_PHPNAME, $indexType)];
             $this->id = (null !== $col) ? (int) $col : null;
 
@@ -654,10 +668,10 @@ abstract class AttributeAvI18n implements ActiveRecordInterface
      *
      * This will only work if the object has been saved and has a valid primary key set.
      *
-     * @param  boolean             $deep (optional) Whether to also de-associated any related objects.
+     * @param      boolean $deep (optional) Whether to also de-associated any related objects.
-     * @param  ConnectionInterface $con  (optional) The ConnectionInterface connection to use.
+     * @param      ConnectionInterface $con (optional) The ConnectionInterface connection to use.
      * @return void
-     * @throws PropelException     - if this object is deleted, unsaved or doesn't have pk match in db
+     * @throws PropelException - if this object is deleted, unsaved or doesn't have pk match in db
      */
     public function reload($deep = false, ConnectionInterface $con = null)
     {
@@ -693,7 +707,7 @@ abstract class AttributeAvI18n implements ActiveRecordInterface
     /**
      * Removes this object from datastore and sets delete attribute.
      *
-     * @param  ConnectionInterface $con
+     * @param      ConnectionInterface $con
      * @return void
      * @throws PropelException
      * @see AttributeAvI18n::setDeleted()
@@ -736,8 +750,8 @@ abstract class AttributeAvI18n implements ActiveRecordInterface
      * method.  This method wraps all precipitate database operations in a
      * single transaction.
      *
-     * @param  ConnectionInterface $con
+     * @param      ConnectionInterface $con
-     * @return int                 The number of rows affected by this insert/update and any referring fk objects' save() operations.
+     * @return int             The number of rows affected by this insert/update and any referring fk objects' save() operations.
      * @throws PropelException
      * @see doSave()
      */
@@ -787,8 +801,8 @@ abstract class AttributeAvI18n implements ActiveRecordInterface
      * If the object is new, it inserts it; otherwise an update is performed.
      * All related objects are also updated in this method.
      *
-     * @param  ConnectionInterface $con
+     * @param      ConnectionInterface $con
-     * @return int                 The number of rows affected by this insert/update and any referring fk objects' save() operations.
+     * @return int             The number of rows affected by this insert/update and any referring fk objects' save() operations.
      * @throws PropelException
      * @see save()
      */
@@ -831,7 +845,7 @@ abstract class AttributeAvI18n implements ActiveRecordInterface
     /**
      * Insert the row in the database.
      *
-     * @param ConnectionInterface $con
+     * @param      ConnectionInterface $con
      *
      * @throws PropelException
      * @see doSave()
@@ -904,7 +918,7 @@ abstract class AttributeAvI18n implements ActiveRecordInterface
     /**
      * Update the row in the database.
      *
-     * @param ConnectionInterface $con
+     * @param      ConnectionInterface $con
      *
      * @return Integer Number of updated rows
      * @see doSave()
@@ -920,12 +934,12 @@ abstract class AttributeAvI18n implements ActiveRecordInterface
     /**
      * Retrieves a field from the object by name passed in as a string.
      *
-     * @param  string $name name
+     * @param      string $name name
-     * @param  string $type The type of fieldname the $name is of:
+     * @param      string $type The type of fieldname the $name is of:
-     *                      one of the class type constants TableMap::TYPE_PHPNAME, TableMap::TYPE_STUDLYPHPNAME
+     *                     one of the class type constants TableMap::TYPE_PHPNAME, TableMap::TYPE_STUDLYPHPNAME
-     *                      TableMap::TYPE_COLNAME, TableMap::TYPE_FIELDNAME, TableMap::TYPE_NUM.
+     *                     TableMap::TYPE_COLNAME, TableMap::TYPE_FIELDNAME, TableMap::TYPE_NUM.
-     *                      Defaults to TableMap::TYPE_PHPNAME.
+     *                     Defaults to TableMap::TYPE_PHPNAME.
-     * @return mixed  Value of field.
+     * @return mixed Value of field.
      */
     public function getByName($name, $type = TableMap::TYPE_PHPNAME)
     {
@@ -939,7 +953,7 @@ abstract class AttributeAvI18n implements ActiveRecordInterface
      * Retrieves a field from the object by Position as specified in the xml schema.
      * Zero-based.
      *
-     * @param  int   $pos position in xml schema
+     * @param      int $pos position in xml schema
      * @return mixed Value of field at $pos
      */
     public function getByPosition($pos)
@@ -975,12 +989,12 @@ abstract class AttributeAvI18n implements ActiveRecordInterface
      * You can specify the key type of the array by passing one of the class
      * type constants.
      *
-     * @param string  $keyType                (optional) One of the class type constants TableMap::TYPE_PHPNAME, TableMap::TYPE_STUDLYPHPNAME,
+     * @param     string  $keyType (optional) One of the class type constants TableMap::TYPE_PHPNAME, TableMap::TYPE_STUDLYPHPNAME,
-     *                                        TableMap::TYPE_COLNAME, TableMap::TYPE_FIELDNAME, TableMap::TYPE_NUM.
+     *                    TableMap::TYPE_COLNAME, TableMap::TYPE_FIELDNAME, TableMap::TYPE_NUM.
-     *                                        Defaults to TableMap::TYPE_PHPNAME.
+     *                    Defaults to TableMap::TYPE_PHPNAME.
-     * @param boolean $includeLazyLoadColumns (optional) Whether to include lazy loaded columns. Defaults to TRUE.
+     * @param     boolean $includeLazyLoadColumns (optional) Whether to include lazy loaded columns. Defaults to TRUE.
-     * @param array   $alreadyDumpedObjects   List of objects to skip to avoid recursion
+     * @param     array $alreadyDumpedObjects List of objects to skip to avoid recursion
-     * @param boolean $includeForeignObjects  (optional) Whether to include hydrated related objects. Default to FALSE.
+     * @param     boolean $includeForeignObjects (optional) Whether to include hydrated related objects. Default to FALSE.
      *
      * @return array an associative array containing the field names (as keys) and field values
      */
@@ -1016,12 +1030,12 @@ abstract class AttributeAvI18n implements ActiveRecordInterface
     /**
      * Sets a field from the object by name passed in as a string.
      *
-     * @param  string $name
+     * @param      string $name
-     * @param  mixed  $value field value
+     * @param      mixed  $value field value
-     * @param  string $type  The type of fieldname the $name is of:
+     * @param      string $type The type of fieldname the $name is of:
-     *                       one of the class type constants TableMap::TYPE_PHPNAME, TableMap::TYPE_STUDLYPHPNAME
+     *                     one of the class type constants TableMap::TYPE_PHPNAME, TableMap::TYPE_STUDLYPHPNAME
-     *                       TableMap::TYPE_COLNAME, TableMap::TYPE_FIELDNAME, TableMap::TYPE_NUM.
+     *                     TableMap::TYPE_COLNAME, TableMap::TYPE_FIELDNAME, TableMap::TYPE_NUM.
-     *                       Defaults to TableMap::TYPE_PHPNAME.
+     *                     Defaults to TableMap::TYPE_PHPNAME.
      * @return void
      */
     public function setByName($name, $value, $type = TableMap::TYPE_PHPNAME)
@@ -1035,8 +1049,8 @@ abstract class AttributeAvI18n implements ActiveRecordInterface
      * Sets a field from the object by Position as specified in the xml schema.
      * Zero-based.
      *
-     * @param  int   $pos   position in xml schema
+     * @param      int $pos position in xml schema
-     * @param  mixed $value field value
+     * @param      mixed $value field value
      * @return void
      */
     public function setByPosition($pos, $value)
@@ -1076,8 +1090,8 @@ abstract class AttributeAvI18n implements ActiveRecordInterface
      * TableMap::TYPE_COLNAME, TableMap::TYPE_FIELDNAME, TableMap::TYPE_NUM.
      * The default key type is the column's TableMap::TYPE_PHPNAME.
      *
-     * @param  array  $arr     An array to populate the object from.
+     * @param      array  $arr     An array to populate the object from.
-     * @param  string $keyType The type of keys the array uses.
+     * @param      string $keyType The type of keys the array uses.
      * @return void
      */
     public function fromArray($arr, $keyType = TableMap::TYPE_PHPNAME)
@@ -1107,6 +1121,7 @@ abstract class AttributeAvI18n implements ActiveRecordInterface
         if ($this->isColumnModified(AttributeAvI18nTableMap::DESCRIPTION)) $criteria->add(AttributeAvI18nTableMap::DESCRIPTION, $this->description);
         if ($this->isColumnModified(AttributeAvI18nTableMap::CHAPO)) $criteria->add(AttributeAvI18nTableMap::CHAPO, $this->chapo);
         if ($this->isColumnModified(AttributeAvI18nTableMap::POSTSCRIPTUM)) $criteria->add(AttributeAvI18nTableMap::POSTSCRIPTUM, $this->postscriptum);
+
         return $criteria;
     }
 
@@ -1144,7 +1159,7 @@ abstract class AttributeAvI18n implements ActiveRecordInterface
     /**
      * Set the [composite] primary key.
      *
-     * @param  array $keys The elements of the composite key (order must match the order in XML file).
+     * @param      array $keys The elements of the composite key (order must match the order in XML file).
      * @return void
      */
     public function setPrimaryKey($keys)
@@ -1159,6 +1174,7 @@ abstract class AttributeAvI18n implements ActiveRecordInterface
      */
     public function isPrimaryKeyNull()
     {
+
         return (null === $this->getId()) && (null === $this->getLocale());
     }
 
@@ -1168,9 +1184,9 @@ abstract class AttributeAvI18n implements ActiveRecordInterface
      * If desired, this method can also make copies of all associated (fkey referrers)
      * objects.
      *
-     * @param  object          $copyObj  An object of \Thelia\Model\AttributeAvI18n (or compatible) type.
+     * @param      object $copyObj An object of \Thelia\Model\AttributeAvI18n (or compatible) type.
-     * @param  boolean         $deepCopy Whether to also copy all rows that refer (by fkey) to the current row.
+     * @param      boolean $deepCopy Whether to also copy all rows that refer (by fkey) to the current row.
-     * @param  boolean         $makeNew  Whether to reset autoincrement PKs and make the object new.
+     * @param      boolean $makeNew Whether to reset autoincrement PKs and make the object new.
      * @throws PropelException
      */
     public function copyInto($copyObj, $deepCopy = false, $makeNew = true)
@@ -1194,8 +1210,8 @@ abstract class AttributeAvI18n implements ActiveRecordInterface
      * If desired, this method can also make copies of all associated (fkey referrers)
      * objects.
      *
-     * @param  boolean                       $deepCopy Whether to also copy all rows that refer (by fkey) to the current row.
+     * @param      boolean $deepCopy Whether to also copy all rows that refer (by fkey) to the current row.
-     * @return \Thelia\Model\AttributeAvI18n Clone of current object.
+     * @return                 \Thelia\Model\AttributeAvI18n Clone of current object.
      * @throws PropelException
      */
     public function copy($deepCopy = false)
@@ -1211,8 +1227,8 @@ abstract class AttributeAvI18n implements ActiveRecordInterface
     /**
      * Declares an association between this object and a ChildAttributeAv object.
      *
-     * @param  ChildAttributeAv              $v
+     * @param                  ChildAttributeAv $v
-     * @return \Thelia\Model\AttributeAvI18n The current object (for fluent API support)
+     * @return                 \Thelia\Model\AttributeAvI18n The current object (for fluent API support)
      * @throws PropelException
      */
     public function setAttributeAv(ChildAttributeAv $v = null)
@@ -1231,14 +1247,16 @@ abstract class AttributeAvI18n implements ActiveRecordInterface
             $v->addAttributeAvI18n($this);
         }
 
+
         return $this;
     }
 
+
     /**
      * Get the associated ChildAttributeAv object
      *
-     * @param  ConnectionInterface $con Optional Connection object.
+     * @param      ConnectionInterface $con Optional Connection object.
-     * @return ChildAttributeAv    The associated ChildAttributeAv object.
+     * @return                 ChildAttributeAv The associated ChildAttributeAv object.
      * @throws PropelException
      */
     public function getAttributeAv(ConnectionInterface $con = null)
@@ -1283,7 +1301,7 @@ abstract class AttributeAvI18n implements ActiveRecordInterface
      * objects with circular references (even in PHP 5.3). This is currently necessary
      * when using Propel in certain daemon or large-volume/high-memory operations.
      *
-     * @param boolean $deep Whether to also clear the references on all referrer objects.
+     * @param      boolean $deep Whether to also clear the references on all referrer objects.
      */
     public function clearAllReferences($deep = false)
     {

core/lib/Thelia/Model/Base/AttributeAvI18nQuery.php

@@ -67,9 +67,9 @@ abstract class AttributeAvI18nQuery extends ModelCriteria
     /**
      * Initializes internal state of \Thelia\Model\Base\AttributeAvI18nQuery object.
      *
-     * @param string $dbName     The database name
+     * @param     string $dbName The database name
-     * @param string $modelName  The phpName of a model, e.g. 'Book'
+     * @param     string $modelName The phpName of a model, e.g. 'Book'
-     * @param string $modelAlias The alias for the model in this query, e.g. 'b'
+     * @param     string $modelAlias The alias for the model in this query, e.g. 'b'
      */
     public function __construct($dbName = 'thelia', $modelName = '\\Thelia\\Model\\AttributeAvI18n', $modelAlias = null)
     {
@@ -79,8 +79,8 @@ abstract class AttributeAvI18nQuery extends ModelCriteria
     /**
      * Returns a new ChildAttributeAvI18nQuery object.
      *
-     * @param string   $modelAlias The alias of a model in the query
+     * @param     string $modelAlias The alias of a model in the query
-     * @param Criteria $criteria   Optional Criteria to build the query from
+     * @param     Criteria $criteria Optional Criteria to build the query from
      *
      * @return ChildAttributeAvI18nQuery
      */
@@ -140,10 +140,10 @@ abstract class AttributeAvI18nQuery extends ModelCriteria
      * Find object by primary key using raw SQL to go fast.
      * Bypass doSelect() and the object formatter by using generated code.
      *
-     * @param mixed               $key Primary key to use for the query
+     * @param     mixed $key Primary key to use for the query
-     * @param ConnectionInterface $con A connection object
+     * @param     ConnectionInterface $con A connection object
      *
-     * @return ChildAttributeAvI18n A model object, or null if the key is not found
+     * @return   ChildAttributeAvI18n A model object, or null if the key is not found
      */
     protected function findPkSimple($key, $con)
     {
@@ -171,8 +171,8 @@ abstract class AttributeAvI18nQuery extends ModelCriteria
     /**
      * Find object by primary key.
      *
-     * @param mixed               $key Primary key to use for the query
+     * @param     mixed $key Primary key to use for the query
-     * @param ConnectionInterface $con A connection object
+     * @param     ConnectionInterface $con A connection object
      *
      * @return ChildAttributeAvI18n|array|mixed the result, formatted by the current formatter
      */
@@ -192,8 +192,8 @@ abstract class AttributeAvI18nQuery extends ModelCriteria
      * <code>
      * $objs = $c->findPks(array(array(12, 56), array(832, 123), array(123, 456)), $con);
      * </code>
-     * @param array               $keys Primary keys to use for the query
+     * @param     array $keys Primary keys to use for the query
-     * @param ConnectionInterface $con  an optional connection object
+     * @param     ConnectionInterface $con an optional connection object
      *
      * @return ObjectCollection|array|mixed the list of results, formatted by the current formatter
      */
@@ -214,7 +214,7 @@ abstract class AttributeAvI18nQuery extends ModelCriteria
     /**
      * Filter the query by primary key
      *
-     * @param mixed $key Primary key to use for the query
+     * @param     mixed $key Primary key to use for the query
      *
      * @return ChildAttributeAvI18nQuery The current query, for fluid interface
      */
@@ -229,7 +229,7 @@ abstract class AttributeAvI18nQuery extends ModelCriteria
     /**
      * Filter the query by a list of primary keys
      *
-     * @param array $keys The list of primary key to use for the query
+     * @param     array $keys The list of primary key to use for the query
      *
      * @return ChildAttributeAvI18nQuery The current query, for fluid interface
      */
@@ -260,11 +260,11 @@ abstract class AttributeAvI18nQuery extends ModelCriteria
      *
      * @see       filterByAttributeAv()
      *
-     * @param mixed  $id         The value to use as filter.
+     * @param     mixed $id The value to use as filter.
-     *                           Use scalar values for equality.
+     *              Use scalar values for equality.
-     *                           Use array values for in_array() equivalent.
+     *              Use array values for in_array() equivalent.
-     *                           Use associative array('min' => $minValue, 'max' => $maxValue) for intervals.
+     *              Use associative array('min' => $minValue, 'max' => $maxValue) for intervals.
-     * @param string $comparison Operator to use for the column comparison, defaults to Criteria::EQUAL
+     * @param     string $comparison Operator to use for the column comparison, defaults to Criteria::EQUAL
      *
      * @return ChildAttributeAvI18nQuery The current query, for fluid interface
      */
@@ -300,9 +300,9 @@ abstract class AttributeAvI18nQuery extends ModelCriteria
      * $query->filterByLocale('%fooValue%'); // WHERE locale LIKE '%fooValue%'
      * </code>
      *
-     * @param string $locale     The value to use as filter.
+     * @param     string $locale The value to use as filter.
-     *                           Accepts wildcards (* and % trigger a LIKE)
+     *              Accepts wildcards (* and % trigger a LIKE)
-     * @param string $comparison Operator to use for the column comparison, defaults to Criteria::EQUAL
+     * @param     string $comparison Operator to use for the column comparison, defaults to Criteria::EQUAL
      *
      * @return ChildAttributeAvI18nQuery The current query, for fluid interface
      */
@@ -329,9 +329,9 @@ abstract class AttributeAvI18nQuery extends ModelCriteria
      * $query->filterByTitle('%fooValue%'); // WHERE title LIKE '%fooValue%'
      * </code>
      *
-     * @param string $title      The value to use as filter.
+     * @param     string $title The value to use as filter.
-     *                           Accepts wildcards (* and % trigger a LIKE)
+     *              Accepts wildcards (* and % trigger a LIKE)
-     * @param string $comparison Operator to use for the column comparison, defaults to Criteria::EQUAL
+     * @param     string $comparison Operator to use for the column comparison, defaults to Criteria::EQUAL
      *
      * @return ChildAttributeAvI18nQuery The current query, for fluid interface
      */
@@ -358,9 +358,9 @@ abstract class AttributeAvI18nQuery extends ModelCriteria
      * $query->filterByDescription('%fooValue%'); // WHERE description LIKE '%fooValue%'
      * </code>
      *
-     * @param string $description The value to use as filter.
+     * @param     string $description The value to use as filter.
-     *                            Accepts wildcards (* and % trigger a LIKE)
+     *              Accepts wildcards (* and % trigger a LIKE)
-     * @param string $comparison  Operator to use for the column comparison, defaults to Criteria::EQUAL
+     * @param     string $comparison Operator to use for the column comparison, defaults to Criteria::EQUAL
      *
      * @return ChildAttributeAvI18nQuery The current query, for fluid interface
      */
@@ -387,9 +387,9 @@ abstract class AttributeAvI18nQuery extends ModelCriteria
      * $query->filterByChapo('%fooValue%'); // WHERE chapo LIKE '%fooValue%'
      * </code>
      *
-     * @param string $chapo      The value to use as filter.
+     * @param     string $chapo The value to use as filter.
-     *                           Accepts wildcards (* and % trigger a LIKE)
+     *              Accepts wildcards (* and % trigger a LIKE)
-     * @param string $comparison Operator to use for the column comparison, defaults to Criteria::EQUAL
+     * @param     string $comparison Operator to use for the column comparison, defaults to Criteria::EQUAL
      *
      * @return ChildAttributeAvI18nQuery The current query, for fluid interface
      */
@@ -416,9 +416,9 @@ abstract class AttributeAvI18nQuery extends ModelCriteria
      * $query->filterByPostscriptum('%fooValue%'); // WHERE postscriptum LIKE '%fooValue%'
      * </code>
      *
-     * @param string $postscriptum The value to use as filter.
+     * @param     string $postscriptum The value to use as filter.
-     *                             Accepts wildcards (* and % trigger a LIKE)
+     *              Accepts wildcards (* and % trigger a LIKE)
-     * @param string $comparison   Operator to use for the column comparison, defaults to Criteria::EQUAL
+     * @param     string $comparison Operator to use for the column comparison, defaults to Criteria::EQUAL
      *
      * @return ChildAttributeAvI18nQuery The current query, for fluid interface
      */
@@ -440,7 +440,7 @@ abstract class AttributeAvI18nQuery extends ModelCriteria
      * Filter the query by a related \Thelia\Model\AttributeAv object
      *
      * @param \Thelia\Model\AttributeAv|ObjectCollection $attributeAv The related object(s) to use as filter
-     * @param string                                     $comparison  Operator to use for the column comparison, defaults to Criteria::EQUAL
+     * @param string $comparison Operator to use for the column comparison, defaults to Criteria::EQUAL
      *
      * @return ChildAttributeAvI18nQuery The current query, for fluid interface
      */
@@ -464,8 +464,8 @@ abstract class AttributeAvI18nQuery extends ModelCriteria
     /**
      * Adds a JOIN clause to the query using the AttributeAv relation
      *
-     * @param string $relationAlias optional alias for the relation
+     * @param     string $relationAlias optional alias for the relation
-     * @param string $joinType      Accepted values are null, 'left join', 'right join', 'inner join'
+     * @param     string $joinType Accepted values are null, 'left join', 'right join', 'inner join'
      *
      * @return ChildAttributeAvI18nQuery The current query, for fluid interface
      */
@@ -498,11 +498,11 @@ abstract class AttributeAvI18nQuery extends ModelCriteria
      *
      * @see useQuery()
      *
-     * @param string $relationAlias optional alias for the relation,
+     * @param     string $relationAlias optional alias for the relation,
-     *                              to be used as main alias in the secondary query
+     *                                   to be used as main alias in the secondary query
-     * @param string $joinType      Accepted values are null, 'left join', 'right join', 'inner join'
+     * @param     string $joinType Accepted values are null, 'left join', 'right join', 'inner join'
      *
-     * @return \Thelia\Model\AttributeAvQuery A secondary query class using the current class as primary query
+     * @return   \Thelia\Model\AttributeAvQuery A secondary query class using the current class as primary query
      */
     public function useAttributeAvQuery($relationAlias = null, $joinType = 'LEFT JOIN')
     {
@@ -514,7 +514,7 @@ abstract class AttributeAvI18nQuery extends ModelCriteria
     /**
      * Exclude object from result
      *
-     * @param ChildAttributeAvI18n $attributeAvI18n Object to remove from the list of results
+     * @param   ChildAttributeAvI18n $attributeAvI18n Object to remove from the list of results
      *
      * @return ChildAttributeAvI18nQuery The current query, for fluid interface
      */
@@ -532,8 +532,8 @@ abstract class AttributeAvI18nQuery extends ModelCriteria
     /**
      * Deletes all rows from the attribute_av_i18n table.
      *
-     * @param  ConnectionInterface $con the connection to use
+     * @param ConnectionInterface $con the connection to use
-     * @return int                 The number of affected rows (if supported by underlying database driver).
+     * @return int The number of affected rows (if supported by underlying database driver).
      */
     public function doDeleteAll(ConnectionInterface $con = null)
     {
@@ -564,13 +564,13 @@ abstract class AttributeAvI18nQuery extends ModelCriteria
     /**
      * Performs a DELETE on the database, given a ChildAttributeAvI18n or Criteria object OR a primary key value.
      *
-     * @param  mixed               $values Criteria or ChildAttributeAvI18n object or primary key or array of primary keys
+     * @param mixed               $values Criteria or ChildAttributeAvI18n object or primary key or array of primary keys
-     *                                     which is used to create the DELETE statement
+     *              which is used to create the DELETE statement
-     * @param  ConnectionInterface $con    the connection to use
+     * @param ConnectionInterface $con the connection to use
-     * @return int                 The number of affected rows (if supported by underlying database driver).  This includes CASCADE-related rows
+     * @return int The number of affected rows (if supported by underlying database driver).  This includes CASCADE-related rows
-     *                                    if supported by native driver or if emulated using Propel.
+     *                if supported by native driver or if emulated using Propel.
-     * @throws PropelException     Any exceptions caught during processing will be
+     * @throws PropelException Any exceptions caught during processing will be
-     *                                    rethrown wrapped into a PropelException.
+     *         rethrown wrapped into a PropelException.
      */
      public function delete(ConnectionInterface $con = null)
      {
@@ -590,6 +590,7 @@ abstract class AttributeAvI18nQuery extends ModelCriteria
             // for more than one table or we could emulating ON DELETE CASCADE, etc.
             $con->beginTransaction();
 
+
         AttributeAvI18nTableMap::removeInstanceFromPool($criteria);
 
             $affectedRows += ModelCriteria::delete($con);

core/lib/Thelia/Model/Base/AttributeAvQuery.php

@@ -72,9 +72,9 @@ abstract class AttributeAvQuery extends ModelCriteria
     /**
      * Initializes internal state of \Thelia\Model\Base\AttributeAvQuery object.
      *
-     * @param string $dbName     The database name
+     * @param     string $dbName The database name
-     * @param string $modelName  The phpName of a model, e.g. 'Book'
+     * @param     string $modelName The phpName of a model, e.g. 'Book'
-     * @param string $modelAlias The alias for the model in this query, e.g. 'b'
+     * @param     string $modelAlias The alias for the model in this query, e.g. 'b'
      */
     public function __construct($dbName = 'thelia', $modelName = '\\Thelia\\Model\\AttributeAv', $modelAlias = null)
     {
@@ -84,8 +84,8 @@ abstract class AttributeAvQuery extends ModelCriteria
     /**
      * Returns a new ChildAttributeAvQuery object.
      *
-     * @param string   $modelAlias The alias of a model in the query
+     * @param     string $modelAlias The alias of a model in the query
-     * @param Criteria $criteria   Optional Criteria to build the query from
+     * @param     Criteria $criteria Optional Criteria to build the query from
      *
      * @return ChildAttributeAvQuery
      */
@@ -114,7 +114,7 @@ abstract class AttributeAvQuery extends ModelCriteria
      * $obj  = $c->findPk(12, $con);
      * </code>
      *
-     * @param mixed               $key Primary key to use for the query
+     * @param mixed $key Primary key to use for the query
      * @param ConnectionInterface $con an optional connection object
      *
      * @return ChildAttributeAv|array|mixed the result, formatted by the current formatter
@@ -145,10 +145,10 @@ abstract class AttributeAvQuery extends ModelCriteria
      * Find object by primary key using raw SQL to go fast.
      * Bypass doSelect() and the object formatter by using generated code.
      *
-     * @param mixed               $key Primary key to use for the query
+     * @param     mixed $key Primary key to use for the query
-     * @param ConnectionInterface $con A connection object
+     * @param     ConnectionInterface $con A connection object
      *
-     * @return ChildAttributeAv A model object, or null if the key is not found
+     * @return   ChildAttributeAv A model object, or null if the key is not found
      */
     protected function findPkSimple($key, $con)
     {
@@ -175,8 +175,8 @@ abstract class AttributeAvQuery extends ModelCriteria
     /**
      * Find object by primary key.
      *
-     * @param mixed               $key Primary key to use for the query
+     * @param     mixed $key Primary key to use for the query
-     * @param ConnectionInterface $con A connection object
+     * @param     ConnectionInterface $con A connection object
      *
      * @return ChildAttributeAv|array|mixed the result, formatted by the current formatter
      */
@@ -196,8 +196,8 @@ abstract class AttributeAvQuery extends ModelCriteria
      * <code>
      * $objs = $c->findPks(array(12, 56, 832), $con);
      * </code>
-     * @param array               $keys Primary keys to use for the query
+     * @param     array $keys Primary keys to use for the query
-     * @param ConnectionInterface $con  an optional connection object
+     * @param     ConnectionInterface $con an optional connection object
      *
      * @return ObjectCollection|array|mixed the list of results, formatted by the current formatter
      */
@@ -218,24 +218,26 @@ abstract class AttributeAvQuery extends ModelCriteria
     /**
      * Filter the query by primary key
      *
-     * @param mixed $key Primary key to use for the query
+     * @param     mixed $key Primary key to use for the query
      *
      * @return ChildAttributeAvQuery The current query, for fluid interface
      */
     public function filterByPrimaryKey($key)
     {
+
         return $this->addUsingAlias(AttributeAvTableMap::ID, $key, Criteria::EQUAL);
     }
 
     /**
      * Filter the query by a list of primary keys
      *
-     * @param array $keys The list of primary key to use for the query
+     * @param     array $keys The list of primary key to use for the query
      *
      * @return ChildAttributeAvQuery The current query, for fluid interface
      */
     public function filterByPrimaryKeys($keys)
     {
+
         return $this->addUsingAlias(AttributeAvTableMap::ID, $keys, Criteria::IN);
     }
 
@@ -249,11 +251,11 @@ abstract class AttributeAvQuery extends ModelCriteria
      * $query->filterById(array('min' => 12)); // WHERE id > 12
      * </code>
      *
-     * @param mixed  $id         The value to use as filter.
+     * @param     mixed $id The value to use as filter.
-     *                           Use scalar values for equality.
+     *              Use scalar values for equality.
-     *                           Use array values for in_array() equivalent.
+     *              Use array values for in_array() equivalent.
-     *                           Use associative array('min' => $minValue, 'max' => $maxValue) for intervals.
+     *              Use associative array('min' => $minValue, 'max' => $maxValue) for intervals.
-     * @param string $comparison Operator to use for the column comparison, defaults to Criteria::EQUAL
+     * @param     string $comparison Operator to use for the column comparison, defaults to Criteria::EQUAL
      *
      * @return ChildAttributeAvQuery The current query, for fluid interface
      */
@@ -292,11 +294,11 @@ abstract class AttributeAvQuery extends ModelCriteria
      *
      * @see       filterByAttribute()
      *
-     * @param mixed  $attributeId The value to use as filter.
+     * @param     mixed $attributeId The value to use as filter.
-     *                            Use scalar values for equality.
+     *              Use scalar values for equality.
-     *                            Use array values for in_array() equivalent.
+     *              Use array values for in_array() equivalent.
-     *                            Use associative array('min' => $minValue, 'max' => $maxValue) for intervals.
+     *              Use associative array('min' => $minValue, 'max' => $maxValue) for intervals.
-     * @param string $comparison  Operator to use for the column comparison, defaults to Criteria::EQUAL
+     * @param     string $comparison Operator to use for the column comparison, defaults to Criteria::EQUAL
      *
      * @return ChildAttributeAvQuery The current query, for fluid interface
      */
@@ -333,11 +335,11 @@ abstract class AttributeAvQuery extends ModelCriteria
      * $query->filterByPosition(array('min' => 12)); // WHERE position > 12
      * </code>
      *
-     * @param mixed  $position   The value to use as filter.
+     * @param     mixed $position The value to use as filter.
-     *                           Use scalar values for equality.
+     *              Use scalar values for equality.
-     *                           Use array values for in_array() equivalent.
+     *              Use array values for in_array() equivalent.
-     *                           Use associative array('min' => $minValue, 'max' => $maxValue) for intervals.
+     *              Use associative array('min' => $minValue, 'max' => $maxValue) for intervals.
-     * @param string $comparison Operator to use for the column comparison, defaults to Criteria::EQUAL
+     * @param     string $comparison Operator to use for the column comparison, defaults to Criteria::EQUAL
      *
      * @return ChildAttributeAvQuery The current query, for fluid interface
      */
@@ -374,13 +376,13 @@ abstract class AttributeAvQuery extends ModelCriteria
      * $query->filterByCreatedAt(array('max' => 'yesterday')); // WHERE created_at > '2011-03-13'
      * </code>
      *
-     * @param mixed  $createdAt  The value to use as filter.
+     * @param     mixed $createdAt The value to use as filter.
-     *                           Values can be integers (unix timestamps), DateTime objects, or strings.
+     *              Values can be integers (unix timestamps), DateTime objects, or strings.
-     *                           Empty strings are treated as NULL.
+     *              Empty strings are treated as NULL.
-     *                           Use scalar values for equality.
+     *              Use scalar values for equality.
-     *                           Use array values for in_array() equivalent.
+     *              Use array values for in_array() equivalent.
-     *                           Use associative array('min' => $minValue, 'max' => $maxValue) for intervals.
+     *              Use associative array('min' => $minValue, 'max' => $maxValue) for intervals.
-     * @param string $comparison Operator to use for the column comparison, defaults to Criteria::EQUAL
+     * @param     string $comparison Operator to use for the column comparison, defaults to Criteria::EQUAL
      *
      * @return ChildAttributeAvQuery The current query, for fluid interface
      */
@@ -417,13 +419,13 @@ abstract class AttributeAvQuery extends ModelCriteria
      * $query->filterByUpdatedAt(array('max' => 'yesterday')); // WHERE updated_at > '2011-03-13'
      * </code>
      *
-     * @param mixed  $updatedAt  The value to use as filter.
+     * @param     mixed $updatedAt The value to use as filter.
-     *                           Values can be integers (unix timestamps), DateTime objects, or strings.
+     *              Values can be integers (unix timestamps), DateTime objects, or strings.
-     *                           Empty strings are treated as NULL.
+     *              Empty strings are treated as NULL.
-     *                           Use scalar values for equality.
+     *              Use scalar values for equality.
-     *                           Use array values for in_array() equivalent.
+     *              Use array values for in_array() equivalent.
-     *                           Use associative array('min' => $minValue, 'max' => $maxValue) for intervals.
+     *              Use associative array('min' => $minValue, 'max' => $maxValue) for intervals.
-     * @param string $comparison Operator to use for the column comparison, defaults to Criteria::EQUAL
+     * @param     string $comparison Operator to use for the column comparison, defaults to Criteria::EQUAL
      *
      * @return ChildAttributeAvQuery The current query, for fluid interface
      */
@@ -453,8 +455,8 @@ abstract class AttributeAvQuery extends ModelCriteria
     /**
      * Filter the query by a related \Thelia\Model\Attribute object
      *
-     * @param \Thelia\Model\Attribute|ObjectCollection $attribute  The related object(s) to use as filter
+     * @param \Thelia\Model\Attribute|ObjectCollection $attribute The related object(s) to use as filter
-     * @param string                                   $comparison Operator to use for the column comparison, defaults to Criteria::EQUAL
+     * @param string $comparison Operator to use for the column comparison, defaults to Criteria::EQUAL
      *
      * @return ChildAttributeAvQuery The current query, for fluid interface
      */
@@ -478,8 +480,8 @@ abstract class AttributeAvQuery extends ModelCriteria
     /**
      * Adds a JOIN clause to the query using the Attribute relation
      *
-     * @param string $relationAlias optional alias for the relation
+     * @param     string $relationAlias optional alias for the relation
-     * @param string $joinType      Accepted values are null, 'left join', 'right join', 'inner join'
+     * @param     string $joinType Accepted values are null, 'left join', 'right join', 'inner join'
      *
      * @return ChildAttributeAvQuery The current query, for fluid interface
      */
@@ -512,11 +514,11 @@ abstract class AttributeAvQuery extends ModelCriteria
      *
      * @see useQuery()
      *
-     * @param string $relationAlias optional alias for the relation,
+     * @param     string $relationAlias optional alias for the relation,
-     *                              to be used as main alias in the secondary query
+     *                                   to be used as main alias in the secondary query
-     * @param string $joinType      Accepted values are null, 'left join', 'right join', 'inner join'
+     * @param     string $joinType Accepted values are null, 'left join', 'right join', 'inner join'
      *
-     * @return \Thelia\Model\AttributeQuery A secondary query class using the current class as primary query
+     * @return   \Thelia\Model\AttributeQuery A secondary query class using the current class as primary query
      */
     public function useAttributeQuery($relationAlias = null, $joinType = Criteria::INNER_JOIN)
     {
@@ -528,8 +530,8 @@ abstract class AttributeAvQuery extends ModelCriteria
     /**
      * Filter the query by a related \Thelia\Model\AttributeCombination object
      *
-     * @param \Thelia\Model\AttributeCombination|ObjectCollection $attributeCombination the related object to use as filter
+     * @param \Thelia\Model\AttributeCombination|ObjectCollection $attributeCombination  the related object to use as filter
-     * @param string                                              $comparison           Operator to use for the column comparison, defaults to Criteria::EQUAL
+     * @param string $comparison Operator to use for the column comparison, defaults to Criteria::EQUAL
      *
      * @return ChildAttributeAvQuery The current query, for fluid interface
      */
@@ -551,8 +553,8 @@ abstract class AttributeAvQuery extends ModelCriteria
     /**
      * Adds a JOIN clause to the query using the AttributeCombination relation
      *
-     * @param string $relationAlias optional alias for the relation
+     * @param     string $relationAlias optional alias for the relation
-     * @param string $joinType      Accepted values are null, 'left join', 'right join', 'inner join'
+     * @param     string $joinType Accepted values are null, 'left join', 'right join', 'inner join'
      *
      * @return ChildAttributeAvQuery The current query, for fluid interface
      */
@@ -585,11 +587,11 @@ abstract class AttributeAvQuery extends ModelCriteria
      *
      * @see useQuery()
      *
-     * @param string $relationAlias optional alias for the relation,
+     * @param     string $relationAlias optional alias for the relation,
-     *                              to be used as main alias in the secondary query
+     *                                   to be used as main alias in the secondary query
-     * @param string $joinType      Accepted values are null, 'left join', 'right join', 'inner join'
+     * @param     string $joinType Accepted values are null, 'left join', 'right join', 'inner join'
      *
-     * @return \Thelia\Model\AttributeCombinationQuery A secondary query class using the current class as primary query
+     * @return   \Thelia\Model\AttributeCombinationQuery A secondary query class using the current class as primary query
      */
     public function useAttributeCombinationQuery($relationAlias = null, $joinType = Criteria::INNER_JOIN)
     {
@@ -601,8 +603,8 @@ abstract class AttributeAvQuery extends ModelCriteria
     /**
      * Filter the query by a related \Thelia\Model\AttributeAvI18n object
      *
-     * @param \Thelia\Model\AttributeAvI18n|ObjectCollection $attributeAvI18n the related object to use as filter
+     * @param \Thelia\Model\AttributeAvI18n|ObjectCollection $attributeAvI18n  the related object to use as filter
-     * @param string                                         $comparison      Operator to use for the column comparison, defaults to Criteria::EQUAL
+     * @param string $comparison Operator to use for the column comparison, defaults to Criteria::EQUAL
      *
      * @return ChildAttributeAvQuery The current query, for fluid interface
      */
@@ -624,8 +626,8 @@ abstract class AttributeAvQuery extends ModelCriteria
     /**
      * Adds a JOIN clause to the query using the AttributeAvI18n relation
      *
-     * @param string $relationAlias optional alias for the relation
+     * @param     string $relationAlias optional alias for the relation
-     * @param string $joinType      Accepted values are null, 'left join', 'right join', 'inner join'
+     * @param     string $joinType Accepted values are null, 'left join', 'right join', 'inner join'
      *
      * @return ChildAttributeAvQuery The current query, for fluid interface
      */
@@ -658,11 +660,11 @@ abstract class AttributeAvQuery extends ModelCriteria
      *
      * @see useQuery()
      *
-     * @param string $relationAlias optional alias for the relation,
+     * @param     string $relationAlias optional alias for the relation,
-     *                              to be used as main alias in the secondary query
+     *                                   to be used as main alias in the secondary query
-     * @param string $joinType      Accepted values are null, 'left join', 'right join', 'inner join'
+     * @param     string $joinType Accepted values are null, 'left join', 'right join', 'inner join'
      *
-     * @return \Thelia\Model\AttributeAvI18nQuery A secondary query class using the current class as primary query
+     * @return   \Thelia\Model\AttributeAvI18nQuery A secondary query class using the current class as primary query
      */
     public function useAttributeAvI18nQuery($relationAlias = null, $joinType = 'LEFT JOIN')
     {
@@ -674,7 +676,7 @@ abstract class AttributeAvQuery extends ModelCriteria
     /**
      * Exclude object from result
      *
-     * @param ChildAttributeAv $attributeAv Object to remove from the list of results
+     * @param   ChildAttributeAv $attributeAv Object to remove from the list of results
      *
      * @return ChildAttributeAvQuery The current query, for fluid interface
      */
@@ -690,8 +692,8 @@ abstract class AttributeAvQuery extends ModelCriteria
     /**
      * Deletes all rows from the attribute_av table.
      *
-     * @param  ConnectionInterface $con the connection to use
+     * @param ConnectionInterface $con the connection to use
-     * @return int                 The number of affected rows (if supported by underlying database driver).
+     * @return int The number of affected rows (if supported by underlying database driver).
      */
     public function doDeleteAll(ConnectionInterface $con = null)
     {
@@ -722,13 +724,13 @@ abstract class AttributeAvQuery extends ModelCriteria
     /**
      * Performs a DELETE on the database, given a ChildAttributeAv or Criteria object OR a primary key value.
      *
-     * @param  mixed               $values Criteria or ChildAttributeAv object or primary key or array of primary keys
+     * @param mixed               $values Criteria or ChildAttributeAv object or primary key or array of primary keys
-     *                                     which is used to create the DELETE statement
+     *              which is used to create the DELETE statement
-     * @param  ConnectionInterface $con    the connection to use
+     * @param ConnectionInterface $con the connection to use
-     * @return int                 The number of affected rows (if supported by underlying database driver).  This includes CASCADE-related rows
+     * @return int The number of affected rows (if supported by underlying database driver).  This includes CASCADE-related rows
-     *                                    if supported by native driver or if emulated using Propel.
+     *                if supported by native driver or if emulated using Propel.
-     * @throws PropelException     Any exceptions caught during processing will be
+     * @throws PropelException Any exceptions caught during processing will be
-     *                                    rethrown wrapped into a PropelException.
+     *         rethrown wrapped into a PropelException.
      */
      public function delete(ConnectionInterface $con = null)
      {
@@ -748,6 +750,7 @@ abstract class AttributeAvQuery extends ModelCriteria
             // for more than one table or we could emulating ON DELETE CASCADE, etc.
             $con->beginTransaction();
 
+
         AttributeAvTableMap::removeInstanceFromPool($criteria);
 
             $affectedRows += ModelCriteria::delete($con);
@@ -766,9 +769,9 @@ abstract class AttributeAvQuery extends ModelCriteria
     /**
      * Filter by the latest updated
      *
-     * @param int $nbDays Maximum age of the latest update in days
+     * @param      int $nbDays Maximum age of the latest update in days
      *
-     * @return ChildAttributeAvQuery The current query, for fluid interface
+     * @return     ChildAttributeAvQuery The current query, for fluid interface
      */
     public function recentlyUpdated($nbDays = 7)
     {
@@ -778,9 +781,9 @@ abstract class AttributeAvQuery extends ModelCriteria
     /**
      * Filter by the latest created
      *
-     * @param int $nbDays Maximum age of in days
+     * @param      int $nbDays Maximum age of in days
      *
-     * @return ChildAttributeAvQuery The current query, for fluid interface
+     * @return     ChildAttributeAvQuery The current query, for fluid interface
      */
     public function recentlyCreated($nbDays = 7)
     {
@@ -790,7 +793,7 @@ abstract class AttributeAvQuery extends ModelCriteria
     /**
      * Order by update date desc
      *
-     * @return ChildAttributeAvQuery The current query, for fluid interface
+     * @return     ChildAttributeAvQuery The current query, for fluid interface
      */
     public function lastUpdatedFirst()
     {
@@ -800,7 +803,7 @@ abstract class AttributeAvQuery extends ModelCriteria
     /**
      * Order by update date asc
      *
-     * @return ChildAttributeAvQuery The current query, for fluid interface
+     * @return     ChildAttributeAvQuery The current query, for fluid interface
      */
     public function firstUpdatedFirst()
     {
@@ -810,7 +813,7 @@ abstract class AttributeAvQuery extends ModelCriteria
     /**
      * Order by create date desc
      *
-     * @return ChildAttributeAvQuery The current query, for fluid interface
+     * @return     ChildAttributeAvQuery The current query, for fluid interface
      */
     public function lastCreatedFirst()
     {
@@ -820,7 +823,7 @@ abstract class AttributeAvQuery extends ModelCriteria
     /**
      * Order by create date asc
      *
-     * @return ChildAttributeAvQuery The current query, for fluid interface
+     * @return     ChildAttributeAvQuery The current query, for fluid interface
      */
     public function firstCreatedFirst()
     {
@@ -832,11 +835,11 @@ abstract class AttributeAvQuery extends ModelCriteria
     /**
      * Adds a JOIN clause to the query using the i18n relation
      *
-     * @param string $locale        Locale to use for the join condition, e.g. 'fr_FR'
+     * @param     string $locale Locale to use for the join condition, e.g. 'fr_FR'
-     * @param string $relationAlias optional alias for the relation
+     * @param     string $relationAlias optional alias for the relation
-     * @param string $joinType      Accepted values are null, 'left join', 'right join', 'inner join'. Defaults to left join.
+     * @param     string $joinType Accepted values are null, 'left join', 'right join', 'inner join'. Defaults to left join.
      *
-     * @return ChildAttributeAvQuery The current query, for fluid interface
+     * @return    ChildAttributeAvQuery The current query, for fluid interface
      */
     public function joinI18n($locale = 'en_US', $relationAlias = null, $joinType = Criteria::LEFT_JOIN)
     {
@@ -851,10 +854,10 @@ abstract class AttributeAvQuery extends ModelCriteria
      * Adds a JOIN clause to the query and hydrates the related I18n object.
      * Shortcut for $c->joinI18n($locale)->with()
      *
-     * @param string $locale   Locale to use for the join condition, e.g. 'fr_FR'
+     * @param     string $locale Locale to use for the join condition, e.g. 'fr_FR'
-     * @param string $joinType Accepted values are null, 'left join', 'right join', 'inner join'. Defaults to left join.
+     * @param     string $joinType Accepted values are null, 'left join', 'right join', 'inner join'. Defaults to left join.
      *
-     * @return ChildAttributeAvQuery The current query, for fluid interface
+     * @return    ChildAttributeAvQuery The current query, for fluid interface
      */
     public function joinWithI18n($locale = 'en_US', $joinType = Criteria::LEFT_JOIN)
     {
@@ -871,11 +874,11 @@ abstract class AttributeAvQuery extends ModelCriteria
      *
      * @see       useQuery()
      *
-     * @param string $locale        Locale to use for the join condition, e.g. 'fr_FR'
+     * @param     string $locale Locale to use for the join condition, e.g. 'fr_FR'
-     * @param string $relationAlias optional alias for the relation
+     * @param     string $relationAlias optional alias for the relation
-     * @param string $joinType      Accepted values are null, 'left join', 'right join', 'inner join'. Defaults to left join.
+     * @param     string $joinType Accepted values are null, 'left join', 'right join', 'inner join'. Defaults to left join.
      *
-     * @return ChildAttributeAvI18nQuery A secondary query class using the current class as primary query
+     * @return    ChildAttributeAvI18nQuery A secondary query class using the current class as primary query
      */
     public function useI18nQuery($locale = 'en_US', $relationAlias = null, $joinType = Criteria::LEFT_JOIN)
     {

core/lib/Thelia/Model/Base/AttributeCombination.php

@@ -33,6 +33,7 @@ abstract class AttributeCombination implements ActiveRecordInterface
      */
     const TABLE_MAP = '\\Thelia\\Model\\Map\\AttributeCombinationTableMap';
 
+
     /**
      * attribute to determine if this object has previously been saved.
      * @var boolean
@@ -321,9 +322,9 @@ abstract class AttributeCombination implements ActiveRecordInterface
      * $book->importFrom('JSON', '{"Id":9012,"Title":"Don Juan","ISBN":"0140422161","Price":12.99,"PublisherId":1234,"AuthorId":5678}');
      * </code>
      *
-     * @param mixed  $parser A AbstractParser instance,
+     * @param mixed $parser A AbstractParser instance,
      *                       or a format name ('XML', 'YAML', 'JSON', 'CSV')
-     * @param string $data   The source data to import from
+     * @param string $data The source data to import from
      *
      * @return AttributeCombination The current object, for fluid interface
      */
@@ -373,30 +374,33 @@ abstract class AttributeCombination implements ActiveRecordInterface
     /**
      * Get the [attribute_id] column value.
      *
-     * @return int
+     * @return   int
      */
     public function getAttributeId()
     {
+
         return $this->attribute_id;
     }
 
     /**
      * Get the [attribute_av_id] column value.
      *
-     * @return int
+     * @return   int
      */
     public function getAttributeAvId()
     {
+
         return $this->attribute_av_id;
     }
 
     /**
      * Get the [product_sale_elements_id] column value.
      *
-     * @return int
+     * @return   int
      */
     public function getProductSaleElementsId()
     {
+
         return $this->product_sale_elements_id;
     }
 
@@ -404,8 +408,8 @@ abstract class AttributeCombination implements ActiveRecordInterface
      * Get the [optionally formatted] temporal [created_at] column value.
      *
      *
-     * @param string $format The date/time format string (either date()-style or strftime()-style).
+     * @param      string $format The date/time format string (either date()-style or strftime()-style).
-     *                       If format is NULL, then the raw \DateTime object will be returned.
+     *                            If format is NULL, then the raw \DateTime object will be returned.
      *
      * @return mixed Formatted date/time value as string or \DateTime object (if format is NULL), NULL if column is NULL, and 0 if column value is 0000-00-00 00:00:00
      *
@@ -424,8 +428,8 @@ abstract class AttributeCombination implements ActiveRecordInterface
      * Get the [optionally formatted] temporal [updated_at] column value.
      *
      *
-     * @param string $format The date/time format string (either date()-style or strftime()-style).
+     * @param      string $format The date/time format string (either date()-style or strftime()-style).
-     *                       If format is NULL, then the raw \DateTime object will be returned.
+     *                            If format is NULL, then the raw \DateTime object will be returned.
      *
      * @return mixed Formatted date/time value as string or \DateTime object (if format is NULL), NULL if column is NULL, and 0 if column value is 0000-00-00 00:00:00
      *
@@ -443,8 +447,8 @@ abstract class AttributeCombination implements ActiveRecordInterface
     /**
      * Set the value of [attribute_id] column.
      *
-     * @param  int                                $v new value
+     * @param      int $v new value
-     * @return \Thelia\Model\AttributeCombination The current object (for fluent API support)
+     * @return   \Thelia\Model\AttributeCombination The current object (for fluent API support)
      */
     public function setAttributeId($v)
     {
@@ -461,14 +465,15 @@ abstract class AttributeCombination implements ActiveRecordInterface
             $this->aAttribute = null;
         }
 
+
         return $this;
     } // setAttributeId()
 
     /**
      * Set the value of [attribute_av_id] column.
      *
-     * @param  int                                $v new value
+     * @param      int $v new value
-     * @return \Thelia\Model\AttributeCombination The current object (for fluent API support)
+     * @return   \Thelia\Model\AttributeCombination The current object (for fluent API support)
      */
     public function setAttributeAvId($v)
     {
@@ -485,14 +490,15 @@ abstract class AttributeCombination implements ActiveRecordInterface
             $this->aAttributeAv = null;
         }
 
+
         return $this;
     } // setAttributeAvId()
 
     /**
      * Set the value of [product_sale_elements_id] column.
      *
-     * @param  int                                $v new value
+     * @param      int $v new value
-     * @return \Thelia\Model\AttributeCombination The current object (for fluent API support)
+     * @return   \Thelia\Model\AttributeCombination The current object (for fluent API support)
      */
     public function setProductSaleElementsId($v)
     {
@@ -509,15 +515,16 @@ abstract class AttributeCombination implements ActiveRecordInterface
             $this->aProductSaleElements = null;
         }
 
+
         return $this;
     } // setProductSaleElementsId()
 
     /**
      * Sets the value of [created_at] column to a normalized version of the date/time value specified.
      *
-     * @param  mixed                              $v string, integer (timestamp), or \DateTime value.
+     * @param      mixed $v string, integer (timestamp), or \DateTime value.
-     *                                               Empty strings are treated as NULL.
+     *               Empty strings are treated as NULL.
-     * @return \Thelia\Model\AttributeCombination The current object (for fluent API support)
+     * @return   \Thelia\Model\AttributeCombination The current object (for fluent API support)
      */
     public function setCreatedAt($v)
     {
@@ -529,15 +536,16 @@ abstract class AttributeCombination implements ActiveRecordInterface
             }
         } // if either are not null
 
+
         return $this;
     } // setCreatedAt()
 
     /**
      * Sets the value of [updated_at] column to a normalized version of the date/time value specified.
      *
-     * @param  mixed                              $v string, integer (timestamp), or \DateTime value.
+     * @param      mixed $v string, integer (timestamp), or \DateTime value.
-     *                                               Empty strings are treated as NULL.
+     *               Empty strings are treated as NULL.
-     * @return \Thelia\Model\AttributeCombination The current object (for fluent API support)
+     * @return   \Thelia\Model\AttributeCombination The current object (for fluent API support)
      */
     public function setUpdatedAt($v)
     {
@@ -549,6 +557,7 @@ abstract class AttributeCombination implements ActiveRecordInterface
             }
         } // if either are not null
 
+
         return $this;
     } // setUpdatedAt()
 
@@ -655,10 +664,10 @@ abstract class AttributeCombination implements ActiveRecordInterface
      *
      * This will only work if the object has been saved and has a valid primary key set.
      *
-     * @param  boolean             $deep (optional) Whether to also de-associated any related objects.
+     * @param      boolean $deep (optional) Whether to also de-associated any related objects.
-     * @param  ConnectionInterface $con  (optional) The ConnectionInterface connection to use.
+     * @param      ConnectionInterface $con (optional) The ConnectionInterface connection to use.
      * @return void
-     * @throws PropelException     - if this object is deleted, unsaved or doesn't have pk match in db
+     * @throws PropelException - if this object is deleted, unsaved or doesn't have pk match in db
      */
     public function reload($deep = false, ConnectionInterface $con = null)
     {
@@ -696,7 +705,7 @@ abstract class AttributeCombination implements ActiveRecordInterface
     /**
      * Removes this object from datastore and sets delete attribute.
      *
-     * @param  ConnectionInterface $con
+     * @param      ConnectionInterface $con
      * @return void
      * @throws PropelException
      * @see AttributeCombination::setDeleted()
@@ -739,8 +748,8 @@ abstract class AttributeCombination implements ActiveRecordInterface
      * method.  This method wraps all precipitate database operations in a
      * single transaction.
      *
-     * @param  ConnectionInterface $con
+     * @param      ConnectionInterface $con
-     * @return int                 The number of rows affected by this insert/update and any referring fk objects' save() operations.
+     * @return int             The number of rows affected by this insert/update and any referring fk objects' save() operations.
      * @throws PropelException
      * @see doSave()
      */
@@ -801,8 +810,8 @@ abstract class AttributeCombination implements ActiveRecordInterface
      * If the object is new, it inserts it; otherwise an update is performed.
      * All related objects are also updated in this method.
      *
-     * @param  ConnectionInterface $con
+     * @param      ConnectionInterface $con
-     * @return int                 The number of rows affected by this insert/update and any referring fk objects' save() operations.
+     * @return int             The number of rows affected by this insert/update and any referring fk objects' save() operations.
      * @throws PropelException
      * @see save()
      */
@@ -859,7 +868,7 @@ abstract class AttributeCombination implements ActiveRecordInterface
     /**
      * Insert the row in the database.
      *
-     * @param ConnectionInterface $con
+     * @param      ConnectionInterface $con
      *
      * @throws PropelException
      * @see doSave()
@@ -869,6 +878,7 @@ abstract class AttributeCombination implements ActiveRecordInterface
         $modifiedColumns = array();
         $index = 0;
 
+
          // check the columns in natural order for more readable SQL queries
         if ($this->isColumnModified(AttributeCombinationTableMap::ATTRIBUTE_ID)) {
             $modifiedColumns[':p' . $index++]  = '`ATTRIBUTE_ID`';
@@ -925,7 +935,7 @@ abstract class AttributeCombination implements ActiveRecordInterface
     /**
      * Update the row in the database.
      *
-     * @param ConnectionInterface $con
+     * @param      ConnectionInterface $con
      *
      * @return Integer Number of updated rows
      * @see doSave()
@@ -941,12 +951,12 @@ abstract class AttributeCombination implements ActiveRecordInterface
     /**
      * Retrieves a field from the object by name passed in as a string.
      *
-     * @param  string $name name
+     * @param      string $name name
-     * @param  string $type The type of fieldname the $name is of:
+     * @param      string $type The type of fieldname the $name is of:
-     *                      one of the class type constants TableMap::TYPE_PHPNAME, TableMap::TYPE_STUDLYPHPNAME
+     *                     one of the class type constants TableMap::TYPE_PHPNAME, TableMap::TYPE_STUDLYPHPNAME
-     *                      TableMap::TYPE_COLNAME, TableMap::TYPE_FIELDNAME, TableMap::TYPE_NUM.
+     *                     TableMap::TYPE_COLNAME, TableMap::TYPE_FIELDNAME, TableMap::TYPE_NUM.
-     *                      Defaults to TableMap::TYPE_PHPNAME.
+     *                     Defaults to TableMap::TYPE_PHPNAME.
-     * @return mixed  Value of field.
+     * @return mixed Value of field.
      */
     public function getByName($name, $type = TableMap::TYPE_PHPNAME)
     {
@@ -960,7 +970,7 @@ abstract class AttributeCombination implements ActiveRecordInterface
      * Retrieves a field from the object by Position as specified in the xml schema.
      * Zero-based.
      *
-     * @param  int   $pos position in xml schema
+     * @param      int $pos position in xml schema
      * @return mixed Value of field at $pos
      */
     public function getByPosition($pos)
@@ -993,12 +1003,12 @@ abstract class AttributeCombination implements ActiveRecordInterface
      * You can specify the key type of the array by passing one of the class
      * type constants.
      *
-     * @param string  $keyType                (optional) One of the class type constants TableMap::TYPE_PHPNAME, TableMap::TYPE_STUDLYPHPNAME,
+     * @param     string  $keyType (optional) One of the class type constants TableMap::TYPE_PHPNAME, TableMap::TYPE_STUDLYPHPNAME,
-     *                                        TableMap::TYPE_COLNAME, TableMap::TYPE_FIELDNAME, TableMap::TYPE_NUM.
+     *                    TableMap::TYPE_COLNAME, TableMap::TYPE_FIELDNAME, TableMap::TYPE_NUM.
-     *                                        Defaults to TableMap::TYPE_PHPNAME.
+     *                    Defaults to TableMap::TYPE_PHPNAME.
-     * @param boolean $includeLazyLoadColumns (optional) Whether to include lazy loaded columns. Defaults to TRUE.
+     * @param     boolean $includeLazyLoadColumns (optional) Whether to include lazy loaded columns. Defaults to TRUE.
-     * @param array   $alreadyDumpedObjects   List of objects to skip to avoid recursion
+     * @param     array $alreadyDumpedObjects List of objects to skip to avoid recursion
-     * @param boolean $includeForeignObjects  (optional) Whether to include hydrated related objects. Default to FALSE.
+     * @param     boolean $includeForeignObjects (optional) Whether to include hydrated related objects. Default to FALSE.
      *
      * @return array an associative array containing the field names (as keys) and field values
      */
@@ -1039,12 +1049,12 @@ abstract class AttributeCombination implements ActiveRecordInterface
     /**
      * Sets a field from the object by name passed in as a string.
      *
-     * @param  string $name
+     * @param      string $name
-     * @param  mixed  $value field value
+     * @param      mixed  $value field value
-     * @param  string $type  The type of fieldname the $name is of:
+     * @param      string $type The type of fieldname the $name is of:
-     *                       one of the class type constants TableMap::TYPE_PHPNAME, TableMap::TYPE_STUDLYPHPNAME
+     *                     one of the class type constants TableMap::TYPE_PHPNAME, TableMap::TYPE_STUDLYPHPNAME
-     *                       TableMap::TYPE_COLNAME, TableMap::TYPE_FIELDNAME, TableMap::TYPE_NUM.
+     *                     TableMap::TYPE_COLNAME, TableMap::TYPE_FIELDNAME, TableMap::TYPE_NUM.
-     *                       Defaults to TableMap::TYPE_PHPNAME.
+     *                     Defaults to TableMap::TYPE_PHPNAME.
      * @return void
      */
     public function setByName($name, $value, $type = TableMap::TYPE_PHPNAME)
@@ -1058,8 +1068,8 @@ abstract class AttributeCombination implements ActiveRecordInterface
      * Sets a field from the object by Position as specified in the xml schema.
      * Zero-based.
      *
-     * @param  int   $pos   position in xml schema
+     * @param      int $pos position in xml schema
-     * @param  mixed $value field value
+     * @param      mixed $value field value
      * @return void
      */
     public function setByPosition($pos, $value)
@@ -1096,8 +1106,8 @@ abstract class AttributeCombination implements ActiveRecordInterface
      * TableMap::TYPE_COLNAME, TableMap::TYPE_FIELDNAME, TableMap::TYPE_NUM.
      * The default key type is the column's TableMap::TYPE_PHPNAME.
      *
-     * @param  array  $arr     An array to populate the object from.
+     * @param      array  $arr     An array to populate the object from.
-     * @param  string $keyType The type of keys the array uses.
+     * @param      string $keyType The type of keys the array uses.
      * @return void
      */
     public function fromArray($arr, $keyType = TableMap::TYPE_PHPNAME)
@@ -1125,6 +1135,7 @@ abstract class AttributeCombination implements ActiveRecordInterface
         if ($this->isColumnModified(AttributeCombinationTableMap::PRODUCT_SALE_ELEMENTS_ID)) $criteria->add(AttributeCombinationTableMap::PRODUCT_SALE_ELEMENTS_ID, $this->product_sale_elements_id);
         if ($this->isColumnModified(AttributeCombinationTableMap::CREATED_AT)) $criteria->add(AttributeCombinationTableMap::CREATED_AT, $this->created_at);
         if ($this->isColumnModified(AttributeCombinationTableMap::UPDATED_AT)) $criteria->add(AttributeCombinationTableMap::UPDATED_AT, $this->updated_at);
+
         return $criteria;
     }
 
@@ -1164,7 +1175,7 @@ abstract class AttributeCombination implements ActiveRecordInterface
     /**
      * Set the [composite] primary key.
      *
-     * @param  array $keys The elements of the composite key (order must match the order in XML file).
+     * @param      array $keys The elements of the composite key (order must match the order in XML file).
      * @return void
      */
     public function setPrimaryKey($keys)
@@ -1180,6 +1191,7 @@ abstract class AttributeCombination implements ActiveRecordInterface
      */
     public function isPrimaryKeyNull()
     {
+
         return (null === $this->getAttributeId()) && (null === $this->getAttributeAvId()) && (null === $this->getProductSaleElementsId());
     }
 
@@ -1189,9 +1201,9 @@ abstract class AttributeCombination implements ActiveRecordInterface
      * If desired, this method can also make copies of all associated (fkey referrers)
      * objects.
      *
-     * @param  object          $copyObj  An object of \Thelia\Model\AttributeCombination (or compatible) type.
+     * @param      object $copyObj An object of \Thelia\Model\AttributeCombination (or compatible) type.
-     * @param  boolean         $deepCopy Whether to also copy all rows that refer (by fkey) to the current row.
+     * @param      boolean $deepCopy Whether to also copy all rows that refer (by fkey) to the current row.
-     * @param  boolean         $makeNew  Whether to reset autoincrement PKs and make the object new.
+     * @param      boolean $makeNew Whether to reset autoincrement PKs and make the object new.
      * @throws PropelException
      */
     public function copyInto($copyObj, $deepCopy = false, $makeNew = true)
@@ -1214,8 +1226,8 @@ abstract class AttributeCombination implements ActiveRecordInterface
      * If desired, this method can also make copies of all associated (fkey referrers)
      * objects.
      *
-     * @param  boolean                            $deepCopy Whether to also copy all rows that refer (by fkey) to the current row.
+     * @param      boolean $deepCopy Whether to also copy all rows that refer (by fkey) to the current row.
-     * @return \Thelia\Model\AttributeCombination Clone of current object.
+     * @return                 \Thelia\Model\AttributeCombination Clone of current object.
      * @throws PropelException
      */
     public function copy($deepCopy = false)
@@ -1231,8 +1243,8 @@ abstract class AttributeCombination implements ActiveRecordInterface
     /**
      * Declares an association between this object and a ChildAttribute object.
      *
-     * @param  ChildAttribute                     $v
+     * @param                  ChildAttribute $v
-     * @return \Thelia\Model\AttributeCombination The current object (for fluent API support)
+     * @return                 \Thelia\Model\AttributeCombination The current object (for fluent API support)
      * @throws PropelException
      */
     public function setAttribute(ChildAttribute $v = null)
@@ -1251,6 +1263,7 @@ abstract class AttributeCombination implements ActiveRecordInterface
             $v->addAttributeCombination($this);
         }
 
+
         return $this;
     }
 
@@ -1258,8 +1271,8 @@ abstract class AttributeCombination implements ActiveRecordInterface
     /**
      * Get the associated ChildAttribute object
      *
-     * @param  ConnectionInterface $con Optional Connection object.
+     * @param      ConnectionInterface $con Optional Connection object.
-     * @return ChildAttribute      The associated ChildAttribute object.
+     * @return                 ChildAttribute The associated ChildAttribute object.
      * @throws PropelException
      */
     public function getAttribute(ConnectionInterface $con = null)
@@ -1281,8 +1294,8 @@ abstract class AttributeCombination implements ActiveRecordInterface
     /**
      * Declares an association between this object and a ChildAttributeAv object.
      *
-     * @param  ChildAttributeAv                   $v
+     * @param                  ChildAttributeAv $v
-     * @return \Thelia\Model\AttributeCombination The current object (for fluent API support)
+     * @return                 \Thelia\Model\AttributeCombination The current object (for fluent API support)
      * @throws PropelException
      */
     public function setAttributeAv(ChildAttributeAv $v = null)
@@ -1301,6 +1314,7 @@ abstract class AttributeCombination implements ActiveRecordInterface
             $v->addAttributeCombination($this);
         }
 
+
         return $this;
     }
 
@@ -1308,8 +1322,8 @@ abstract class AttributeCombination implements ActiveRecordInterface
     /**
      * Get the associated ChildAttributeAv object
      *
-     * @param  ConnectionInterface $con Optional Connection object.
+     * @param      ConnectionInterface $con Optional Connection object.
-     * @return ChildAttributeAv    The associated ChildAttributeAv object.
+     * @return                 ChildAttributeAv The associated ChildAttributeAv object.
      * @throws PropelException
      */
     public function getAttributeAv(ConnectionInterface $con = null)
@@ -1331,8 +1345,8 @@ abstract class AttributeCombination implements ActiveRecordInterface
     /**
      * Declares an association between this object and a ChildProductSaleElements object.
      *
-     * @param  ChildProductSaleElements           $v
+     * @param                  ChildProductSaleElements $v
-     * @return \Thelia\Model\AttributeCombination The current object (for fluent API support)
+     * @return                 \Thelia\Model\AttributeCombination The current object (for fluent API support)
      * @throws PropelException
      */
     public function setProductSaleElements(ChildProductSaleElements $v = null)
@@ -1351,6 +1365,7 @@ abstract class AttributeCombination implements ActiveRecordInterface
             $v->addAttributeCombination($this);
         }
 
+
         return $this;
     }
 
@@ -1358,8 +1373,8 @@ abstract class AttributeCombination implements ActiveRecordInterface
     /**
      * Get the associated ChildProductSaleElements object
      *
-     * @param  ConnectionInterface      $con Optional Connection object.
+     * @param      ConnectionInterface $con Optional Connection object.
-     * @return ChildProductSaleElements The associated ChildProductSaleElements object.
+     * @return                 ChildProductSaleElements The associated ChildProductSaleElements object.
      * @throws PropelException
      */
     public function getProductSaleElements(ConnectionInterface $con = null)
@@ -1402,7 +1417,7 @@ abstract class AttributeCombination implements ActiveRecordInterface
      * objects with circular references (even in PHP 5.3). This is currently necessary
      * when using Propel in certain daemon or large-volume/high-memory operations.
      *
-     * @param boolean $deep Whether to also clear the references on all referrer objects.
+     * @param      boolean $deep Whether to also clear the references on all referrer objects.
      */
     public function clearAllReferences($deep = false)
     {
@@ -1429,7 +1444,7 @@ abstract class AttributeCombination implements ActiveRecordInterface
     /**
      * Mark the current object so that the update date doesn't get updated during next save
      *
-     * @return ChildAttributeCombination The current object (for fluent API support)
+     * @return     ChildAttributeCombination The current object (for fluent API support)
      */
     public function keepUpdateDateUnchanged()
     {

core/lib/Thelia/Model/Base/AttributeCombinationQuery.php

@@ -71,9 +71,9 @@ abstract class AttributeCombinationQuery extends ModelCriteria
     /**
      * Initializes internal state of \Thelia\Model\Base\AttributeCombinationQuery object.
      *
-     * @param string $dbName     The database name
+     * @param     string $dbName The database name
-     * @param string $modelName  The phpName of a model, e.g. 'Book'
+     * @param     string $modelName The phpName of a model, e.g. 'Book'
-     * @param string $modelAlias The alias for the model in this query, e.g. 'b'
+     * @param     string $modelAlias The alias for the model in this query, e.g. 'b'
      */
     public function __construct($dbName = 'thelia', $modelName = '\\Thelia\\Model\\AttributeCombination', $modelAlias = null)
     {
@@ -83,8 +83,8 @@ abstract class AttributeCombinationQuery extends ModelCriteria
     /**
      * Returns a new ChildAttributeCombinationQuery object.
      *
-     * @param string   $modelAlias The alias of a model in the query
+     * @param     string $modelAlias The alias of a model in the query
-     * @param Criteria $criteria   Optional Criteria to build the query from
+     * @param     Criteria $criteria Optional Criteria to build the query from
      *
      * @return ChildAttributeCombinationQuery
      */
@@ -144,10 +144,10 @@ abstract class AttributeCombinationQuery extends ModelCriteria
      * Find object by primary key using raw SQL to go fast.
      * Bypass doSelect() and the object formatter by using generated code.
      *
-     * @param mixed               $key Primary key to use for the query
+     * @param     mixed $key Primary key to use for the query
-     * @param ConnectionInterface $con A connection object
+     * @param     ConnectionInterface $con A connection object
      *
-     * @return ChildAttributeCombination A model object, or null if the key is not found
+     * @return   ChildAttributeCombination A model object, or null if the key is not found
      */
     protected function findPkSimple($key, $con)
     {
@@ -176,8 +176,8 @@ abstract class AttributeCombinationQuery extends ModelCriteria
     /**
      * Find object by primary key.
      *
-     * @param mixed               $key Primary key to use for the query
+     * @param     mixed $key Primary key to use for the query
-     * @param ConnectionInterface $con A connection object
+     * @param     ConnectionInterface $con A connection object
      *
      * @return ChildAttributeCombination|array|mixed the result, formatted by the current formatter
      */
@@ -197,8 +197,8 @@ abstract class AttributeCombinationQuery extends ModelCriteria
      * <code>
      * $objs = $c->findPks(array(array(12, 56), array(832, 123), array(123, 456)), $con);
      * </code>
-     * @param array               $keys Primary keys to use for the query
+     * @param     array $keys Primary keys to use for the query
-     * @param ConnectionInterface $con  an optional connection object
+     * @param     ConnectionInterface $con an optional connection object
      *
      * @return ObjectCollection|array|mixed the list of results, formatted by the current formatter
      */
@@ -219,7 +219,7 @@ abstract class AttributeCombinationQuery extends ModelCriteria
     /**
      * Filter the query by primary key
      *
-     * @param mixed $key Primary key to use for the query
+     * @param     mixed $key Primary key to use for the query
      *
      * @return ChildAttributeCombinationQuery The current query, for fluid interface
      */
@@ -235,7 +235,7 @@ abstract class AttributeCombinationQuery extends ModelCriteria
     /**
      * Filter the query by a list of primary keys
      *
-     * @param array $keys The list of primary key to use for the query
+     * @param     array $keys The list of primary key to use for the query
      *
      * @return ChildAttributeCombinationQuery The current query, for fluid interface
      */
@@ -268,11 +268,11 @@ abstract class AttributeCombinationQuery extends ModelCriteria
      *
      * @see       filterByAttribute()
      *
-     * @param mixed  $attributeId The value to use as filter.
+     * @param     mixed $attributeId The value to use as filter.
-     *                            Use scalar values for equality.
+     *              Use scalar values for equality.
-     *                            Use array values for in_array() equivalent.
+     *              Use array values for in_array() equivalent.
-     *                            Use associative array('min' => $minValue, 'max' => $maxValue) for intervals.
+     *              Use associative array('min' => $minValue, 'max' => $maxValue) for intervals.
-     * @param string $comparison  Operator to use for the column comparison, defaults to Criteria::EQUAL
+     * @param     string $comparison Operator to use for the column comparison, defaults to Criteria::EQUAL
      *
      * @return ChildAttributeCombinationQuery The current query, for fluid interface
      */
@@ -311,11 +311,11 @@ abstract class AttributeCombinationQuery extends ModelCriteria
      *
      * @see       filterByAttributeAv()
      *
-     * @param mixed  $attributeAvId The value to use as filter.
+     * @param     mixed $attributeAvId The value to use as filter.
-     *                              Use scalar values for equality.
+     *              Use scalar values for equality.
-     *                              Use array values for in_array() equivalent.
+     *              Use array values for in_array() equivalent.
-     *                              Use associative array('min' => $minValue, 'max' => $maxValue) for intervals.
+     *              Use associative array('min' => $minValue, 'max' => $maxValue) for intervals.
-     * @param string $comparison    Operator to use for the column comparison, defaults to Criteria::EQUAL
+     * @param     string $comparison Operator to use for the column comparison, defaults to Criteria::EQUAL
      *
      * @return ChildAttributeCombinationQuery The current query, for fluid interface
      */
@@ -354,11 +354,11 @@ abstract class AttributeCombinationQuery extends ModelCriteria
      *
      * @see       filterByProductSaleElements()
      *
-     * @param mixed  $productSaleElementsId The value to use as filter.
+     * @param     mixed $productSaleElementsId The value to use as filter.
-     *                                      Use scalar values for equality.
+     *              Use scalar values for equality.
-     *                                      Use array values for in_array() equivalent.
+     *              Use array values for in_array() equivalent.
-     *                                      Use associative array('min' => $minValue, 'max' => $maxValue) for intervals.
+     *              Use associative array('min' => $minValue, 'max' => $maxValue) for intervals.
-     * @param string $comparison            Operator to use for the column comparison, defaults to Criteria::EQUAL
+     * @param     string $comparison Operator to use for the column comparison, defaults to Criteria::EQUAL
      *
      * @return ChildAttributeCombinationQuery The current query, for fluid interface
      */
@@ -395,13 +395,13 @@ abstract class AttributeCombinationQuery extends ModelCriteria
      * $query->filterByCreatedAt(array('max' => 'yesterday')); // WHERE created_at > '2011-03-13'
      * </code>
      *
-     * @param mixed  $createdAt  The value to use as filter.
+     * @param     mixed $createdAt The value to use as filter.
-     *                           Values can be integers (unix timestamps), DateTime objects, or strings.
+     *              Values can be integers (unix timestamps), DateTime objects, or strings.
-     *                           Empty strings are treated as NULL.
+     *              Empty strings are treated as NULL.
-     *                           Use scalar values for equality.
+     *              Use scalar values for equality.
-     *                           Use array values for in_array() equivalent.
+     *              Use array values for in_array() equivalent.
-     *                           Use associative array('min' => $minValue, 'max' => $maxValue) for intervals.
+     *              Use associative array('min' => $minValue, 'max' => $maxValue) for intervals.
-     * @param string $comparison Operator to use for the column comparison, defaults to Criteria::EQUAL
+     * @param     string $comparison Operator to use for the column comparison, defaults to Criteria::EQUAL
      *
      * @return ChildAttributeCombinationQuery The current query, for fluid interface
      */
@@ -438,13 +438,13 @@ abstract class AttributeCombinationQuery extends ModelCriteria
      * $query->filterByUpdatedAt(array('max' => 'yesterday')); // WHERE updated_at > '2011-03-13'
      * </code>
      *
-     * @param mixed  $updatedAt  The value to use as filter.
+     * @param     mixed $updatedAt The value to use as filter.
-     *                           Values can be integers (unix timestamps), DateTime objects, or strings.
+     *              Values can be integers (unix timestamps), DateTime objects, or strings.
-     *                           Empty strings are treated as NULL.
+     *              Empty strings are treated as NULL.
-     *                           Use scalar values for equality.
+     *              Use scalar values for equality.
-     *                           Use array values for in_array() equivalent.
+     *              Use array values for in_array() equivalent.
-     *                           Use associative array('min' => $minValue, 'max' => $maxValue) for intervals.
+     *              Use associative array('min' => $minValue, 'max' => $maxValue) for intervals.
-     * @param string $comparison Operator to use for the column comparison, defaults to Criteria::EQUAL
+     * @param     string $comparison Operator to use for the column comparison, defaults to Criteria::EQUAL
      *
      * @return ChildAttributeCombinationQuery The current query, for fluid interface
      */
@@ -474,8 +474,8 @@ abstract class AttributeCombinationQuery extends ModelCriteria
     /**
      * Filter the query by a related \Thelia\Model\Attribute object
      *
-     * @param \Thelia\Model\Attribute|ObjectCollection $attribute  The related object(s) to use as filter
+     * @param \Thelia\Model\Attribute|ObjectCollection $attribute The related object(s) to use as filter
-     * @param string                                   $comparison Operator to use for the column comparison, defaults to Criteria::EQUAL
+     * @param string $comparison Operator to use for the column comparison, defaults to Criteria::EQUAL
      *
      * @return ChildAttributeCombinationQuery The current query, for fluid interface
      */
@@ -499,8 +499,8 @@ abstract class AttributeCombinationQuery extends ModelCriteria
     /**
      * Adds a JOIN clause to the query using the Attribute relation
      *
-     * @param string $relationAlias optional alias for the relation
+     * @param     string $relationAlias optional alias for the relation
-     * @param string $joinType      Accepted values are null, 'left join', 'right join', 'inner join'
+     * @param     string $joinType Accepted values are null, 'left join', 'right join', 'inner join'
      *
      * @return ChildAttributeCombinationQuery The current query, for fluid interface
      */
@@ -533,11 +533,11 @@ abstract class AttributeCombinationQuery extends ModelCriteria
      *
      * @see useQuery()
      *
-     * @param string $relationAlias optional alias for the relation,
+     * @param     string $relationAlias optional alias for the relation,
-     *                              to be used as main alias in the secondary query
+     *                                   to be used as main alias in the secondary query
-     * @param string $joinType      Accepted values are null, 'left join', 'right join', 'inner join'
+     * @param     string $joinType Accepted values are null, 'left join', 'right join', 'inner join'
      *
-     * @return \Thelia\Model\AttributeQuery A secondary query class using the current class as primary query
+     * @return   \Thelia\Model\AttributeQuery A secondary query class using the current class as primary query
      */
     public function useAttributeQuery($relationAlias = null, $joinType = Criteria::INNER_JOIN)
     {
@@ -550,7 +550,7 @@ abstract class AttributeCombinationQuery extends ModelCriteria
      * Filter the query by a related \Thelia\Model\AttributeAv object
      *
      * @param \Thelia\Model\AttributeAv|ObjectCollection $attributeAv The related object(s) to use as filter
-     * @param string                                     $comparison  Operator to use for the column comparison, defaults to Criteria::EQUAL
+     * @param string $comparison Operator to use for the column comparison, defaults to Criteria::EQUAL
      *
      * @return ChildAttributeCombinationQuery The current query, for fluid interface
      */
@@ -574,8 +574,8 @@ abstract class AttributeCombinationQuery extends ModelCriteria
     /**
      * Adds a JOIN clause to the query using the AttributeAv relation
      *
-     * @param string $relationAlias optional alias for the relation
+     * @param     string $relationAlias optional alias for the relation
-     * @param string $joinType      Accepted values are null, 'left join', 'right join', 'inner join'
+     * @param     string $joinType Accepted values are null, 'left join', 'right join', 'inner join'
      *
      * @return ChildAttributeCombinationQuery The current query, for fluid interface
      */
@@ -608,11 +608,11 @@ abstract class AttributeCombinationQuery extends ModelCriteria
      *
      * @see useQuery()
      *
-     * @param string $relationAlias optional alias for the relation,
+     * @param     string $relationAlias optional alias for the relation,
-     *                              to be used as main alias in the secondary query
+     *                                   to be used as main alias in the secondary query
-     * @param string $joinType      Accepted values are null, 'left join', 'right join', 'inner join'
+     * @param     string $joinType Accepted values are null, 'left join', 'right join', 'inner join'
      *
-     * @return \Thelia\Model\AttributeAvQuery A secondary query class using the current class as primary query
+     * @return   \Thelia\Model\AttributeAvQuery A secondary query class using the current class as primary query
      */
     public function useAttributeAvQuery($relationAlias = null, $joinType = Criteria::INNER_JOIN)
     {
@@ -625,7 +625,7 @@ abstract class AttributeCombinationQuery extends ModelCriteria
      * Filter the query by a related \Thelia\Model\ProductSaleElements object
      *
      * @param \Thelia\Model\ProductSaleElements|ObjectCollection $productSaleElements The related object(s) to use as filter
-     * @param string                                             $comparison          Operator to use for the column comparison, defaults to Criteria::EQUAL
+     * @param string $comparison Operator to use for the column comparison, defaults to Criteria::EQUAL
      *
      * @return ChildAttributeCombinationQuery The current query, for fluid interface
      */
@@ -649,8 +649,8 @@ abstract class AttributeCombinationQuery extends ModelCriteria
     /**
      * Adds a JOIN clause to the query using the ProductSaleElements relation
      *
-     * @param string $relationAlias optional alias for the relation
+     * @param     string $relationAlias optional alias for the relation
-     * @param string $joinType      Accepted values are null, 'left join', 'right join', 'inner join'
+     * @param     string $joinType Accepted values are null, 'left join', 'right join', 'inner join'
      *
      * @return ChildAttributeCombinationQuery The current query, for fluid interface
      */
@@ -683,11 +683,11 @@ abstract class AttributeCombinationQuery extends ModelCriteria
      *
      * @see useQuery()
      *
-     * @param string $relationAlias optional alias for the relation,
+     * @param     string $relationAlias optional alias for the relation,
-     *                              to be used as main alias in the secondary query
+     *                                   to be used as main alias in the secondary query
-     * @param string $joinType      Accepted values are null, 'left join', 'right join', 'inner join'
+     * @param     string $joinType Accepted values are null, 'left join', 'right join', 'inner join'
      *
-     * @return \Thelia\Model\ProductSaleElementsQuery A secondary query class using the current class as primary query
+     * @return   \Thelia\Model\ProductSaleElementsQuery A secondary query class using the current class as primary query
      */
     public function useProductSaleElementsQuery($relationAlias = null, $joinType = Criteria::INNER_JOIN)
     {
@@ -699,7 +699,7 @@ abstract class AttributeCombinationQuery extends ModelCriteria
     /**
      * Exclude object from result
      *
-     * @param ChildAttributeCombination $attributeCombination Object to remove from the list of results
+     * @param   ChildAttributeCombination $attributeCombination Object to remove from the list of results
      *
      * @return ChildAttributeCombinationQuery The current query, for fluid interface
      */
@@ -718,8 +718,8 @@ abstract class AttributeCombinationQuery extends ModelCriteria
     /**
      * Deletes all rows from the attribute_combination table.
      *
-     * @param  ConnectionInterface $con the connection to use
+     * @param ConnectionInterface $con the connection to use
-     * @return int                 The number of affected rows (if supported by underlying database driver).
+     * @return int The number of affected rows (if supported by underlying database driver).
      */
     public function doDeleteAll(ConnectionInterface $con = null)
     {
@@ -750,13 +750,13 @@ abstract class AttributeCombinationQuery extends ModelCriteria
     /**
      * Performs a DELETE on the database, given a ChildAttributeCombination or Criteria object OR a primary key value.
      *
-     * @param  mixed               $values Criteria or ChildAttributeCombination object or primary key or array of primary keys
+     * @param mixed               $values Criteria or ChildAttributeCombination object or primary key or array of primary keys
-     *                                     which is used to create the DELETE statement
+     *              which is used to create the DELETE statement
-     * @param  ConnectionInterface $con    the connection to use
+     * @param ConnectionInterface $con the connection to use
-     * @return int                 The number of affected rows (if supported by underlying database driver).  This includes CASCADE-related rows
+     * @return int The number of affected rows (if supported by underlying database driver).  This includes CASCADE-related rows
-     *                                    if supported by native driver or if emulated using Propel.
+     *                if supported by native driver or if emulated using Propel.
-     * @throws PropelException     Any exceptions caught during processing will be
+     * @throws PropelException Any exceptions caught during processing will be
-     *                                    rethrown wrapped into a PropelException.
+     *         rethrown wrapped into a PropelException.
      */
      public function delete(ConnectionInterface $con = null)
      {
@@ -776,6 +776,7 @@ abstract class AttributeCombinationQuery extends ModelCriteria
             // for more than one table or we could emulating ON DELETE CASCADE, etc.
             $con->beginTransaction();
 
+
         AttributeCombinationTableMap::removeInstanceFromPool($criteria);
 
             $affectedRows += ModelCriteria::delete($con);
@@ -794,9 +795,9 @@ abstract class AttributeCombinationQuery extends ModelCriteria
     /**
      * Filter by the latest updated
      *
-     * @param int $nbDays Maximum age of the latest update in days
+     * @param      int $nbDays Maximum age of the latest update in days
      *
-     * @return ChildAttributeCombinationQuery The current query, for fluid interface
+     * @return     ChildAttributeCombinationQuery The current query, for fluid interface
      */
     public function recentlyUpdated($nbDays = 7)
     {
@@ -806,9 +807,9 @@ abstract class AttributeCombinationQuery extends ModelCriteria
     /**
      * Filter by the latest created
      *
-     * @param int $nbDays Maximum age of in days
+     * @param      int $nbDays Maximum age of in days
      *
-     * @return ChildAttributeCombinationQuery The current query, for fluid interface
+     * @return     ChildAttributeCombinationQuery The current query, for fluid interface
      */
     public function recentlyCreated($nbDays = 7)
     {
@@ -818,7 +819,7 @@ abstract class AttributeCombinationQuery extends ModelCriteria
     /**
      * Order by update date desc
      *
-     * @return ChildAttributeCombinationQuery The current query, for fluid interface
+     * @return     ChildAttributeCombinationQuery The current query, for fluid interface
      */
     public function lastUpdatedFirst()
     {
@@ -828,7 +829,7 @@ abstract class AttributeCombinationQuery extends ModelCriteria
     /**
      * Order by update date asc
      *
-     * @return ChildAttributeCombinationQuery The current query, for fluid interface
+     * @return     ChildAttributeCombinationQuery The current query, for fluid interface
      */
     public function firstUpdatedFirst()
     {
@@ -838,7 +839,7 @@ abstract class AttributeCombinationQuery extends ModelCriteria
     /**
      * Order by create date desc
      *
-     * @return ChildAttributeCombinationQuery The current query, for fluid interface
+     * @return     ChildAttributeCombinationQuery The current query, for fluid interface
      */
     public function lastCreatedFirst()
     {
@@ -848,7 +849,7 @@ abstract class AttributeCombinationQuery extends ModelCriteria
     /**
      * Order by create date asc
      *
-     * @return ChildAttributeCombinationQuery The current query, for fluid interface
+     * @return     ChildAttributeCombinationQuery The current query, for fluid interface
      */
     public function firstCreatedFirst()
     {

core/lib/Thelia/Model/Base/AttributeI18n.php

@@ -26,6 +26,7 @@ abstract class AttributeI18n implements ActiveRecordInterface
      */
     const TABLE_MAP = '\\Thelia\\Model\\Map\\AttributeI18nTableMap';
 
+
     /**
      * attribute to determine if this object has previously been saved.
      * @var boolean
@@ -324,9 +325,9 @@ abstract class AttributeI18n implements ActiveRecordInterface
      * $book->importFrom('JSON', '{"Id":9012,"Title":"Don Juan","ISBN":"0140422161","Price":12.99,"PublisherId":1234,"AuthorId":5678}');
      * </code>
      *
-     * @param mixed  $parser A AbstractParser instance,
+     * @param mixed $parser A AbstractParser instance,
      *                       or a format name ('XML', 'YAML', 'JSON', 'CSV')
-     * @param string $data   The source data to import from
+     * @param string $data The source data to import from
      *
      * @return AttributeI18n The current object, for fluid interface
      */
@@ -376,68 +377,74 @@ abstract class AttributeI18n implements ActiveRecordInterface
     /**
      * Get the [id] column value.
      *
-     * @return int
+     * @return   int
      */
     public function getId()
     {
+
         return $this->id;
     }
 
     /**
      * Get the [locale] column value.
      *
-     * @return string
+     * @return   string
      */
     public function getLocale()
     {
+
         return $this->locale;
     }
 
     /**
      * Get the [title] column value.
      *
-     * @return string
+     * @return   string
      */
     public function getTitle()
     {
+
         return $this->title;
     }
 
     /**
      * Get the [description] column value.
      *
-     * @return string
+     * @return   string
      */
     public function getDescription()
     {
+
         return $this->description;
     }
 
     /**
      * Get the [chapo] column value.
      *
-     * @return string
+     * @return   string
      */
     public function getChapo()
     {
+
         return $this->chapo;
     }
 
     /**
      * Get the [postscriptum] column value.
      *
-     * @return string
+     * @return   string
      */
     public function getPostscriptum()
     {
+
         return $this->postscriptum;
     }
 
     /**
      * Set the value of [id] column.
      *
-     * @param  int                         $v new value
+     * @param      int $v new value
-     * @return \Thelia\Model\AttributeI18n The current object (for fluent API support)
+     * @return   \Thelia\Model\AttributeI18n The current object (for fluent API support)
      */
     public function setId($v)
     {
@@ -454,14 +461,15 @@ abstract class AttributeI18n implements ActiveRecordInterface
             $this->aAttribute = null;
         }
 
+
         return $this;
     } // setId()
 
     /**
      * Set the value of [locale] column.
      *
-     * @param  string                      $v new value
+     * @param      string $v new value
-     * @return \Thelia\Model\AttributeI18n The current object (for fluent API support)
+     * @return   \Thelia\Model\AttributeI18n The current object (for fluent API support)
      */
     public function setLocale($v)
     {
@@ -474,14 +482,15 @@ abstract class AttributeI18n implements ActiveRecordInterface
             $this->modifiedColumns[AttributeI18nTableMap::LOCALE] = true;
         }
 
+
         return $this;
     } // setLocale()
 
     /**
      * Set the value of [title] column.
      *
-     * @param  string                      $v new value
+     * @param      string $v new value
-     * @return \Thelia\Model\AttributeI18n The current object (for fluent API support)
+     * @return   \Thelia\Model\AttributeI18n The current object (for fluent API support)
      */
     public function setTitle($v)
     {
@@ -494,14 +503,15 @@ abstract class AttributeI18n implements ActiveRecordInterface
             $this->modifiedColumns[AttributeI18nTableMap::TITLE] = true;
         }
 
+
         return $this;
     } // setTitle()
 
     /**
      * Set the value of [description] column.
      *
-     * @param  string                      $v new value
+     * @param      string $v new value
-     * @return \Thelia\Model\AttributeI18n The current object (for fluent API support)
+     * @return   \Thelia\Model\AttributeI18n The current object (for fluent API support)
      */
     public function setDescription($v)
     {
@@ -514,14 +524,15 @@ abstract class AttributeI18n implements ActiveRecordInterface
             $this->modifiedColumns[AttributeI18nTableMap::DESCRIPTION] = true;
         }
 
+
         return $this;
     } // setDescription()
 
     /**
      * Set the value of [chapo] column.
      *
-     * @param  string                      $v new value
+     * @param      string $v new value
-     * @return \Thelia\Model\AttributeI18n The current object (for fluent API support)
+     * @return   \Thelia\Model\AttributeI18n The current object (for fluent API support)
      */
     public function setChapo($v)
     {
@@ -534,14 +545,15 @@ abstract class AttributeI18n implements ActiveRecordInterface
             $this->modifiedColumns[AttributeI18nTableMap::CHAPO] = true;
         }
 
+
         return $this;
     } // setChapo()
 
     /**
      * Set the value of [postscriptum] column.
      *
-     * @param  string                      $v new value
+     * @param      string $v new value
-     * @return \Thelia\Model\AttributeI18n The current object (for fluent API support)
+     * @return   \Thelia\Model\AttributeI18n The current object (for fluent API support)
      */
     public function setPostscriptum($v)
     {
@@ -554,6 +566,7 @@ abstract class AttributeI18n implements ActiveRecordInterface
             $this->modifiedColumns[AttributeI18nTableMap::POSTSCRIPTUM] = true;
         }
 
+
         return $this;
     } // setPostscriptum()
 
@@ -597,6 +610,7 @@ abstract class AttributeI18n implements ActiveRecordInterface
     {
         try {
 
+
             $col = $row[TableMap::TYPE_NUM == $indexType ? 0 + $startcol : AttributeI18nTableMap::translateFieldName('Id', TableMap::TYPE_PHPNAME, $indexType)];
             $this->id = (null !== $col) ? (int) $col : null;
 
@@ -654,10 +668,10 @@ abstract class AttributeI18n implements ActiveRecordInterface
      *
      * This will only work if the object has been saved and has a valid primary key set.
      *
-     * @param  boolean             $deep (optional) Whether to also de-associated any related objects.
+     * @param      boolean $deep (optional) Whether to also de-associated any related objects.
-     * @param  ConnectionInterface $con  (optional) The ConnectionInterface connection to use.
+     * @param      ConnectionInterface $con (optional) The ConnectionInterface connection to use.
      * @return void
-     * @throws PropelException     - if this object is deleted, unsaved or doesn't have pk match in db
+     * @throws PropelException - if this object is deleted, unsaved or doesn't have pk match in db
      */
     public function reload($deep = false, ConnectionInterface $con = null)
     {
@@ -693,7 +707,7 @@ abstract class AttributeI18n implements ActiveRecordInterface
     /**
      * Removes this object from datastore and sets delete attribute.
      *
-     * @param  ConnectionInterface $con
+     * @param      ConnectionInterface $con
      * @return void
      * @throws PropelException
      * @see AttributeI18n::setDeleted()
@@ -736,8 +750,8 @@ abstract class AttributeI18n implements ActiveRecordInterface
      * method.  This method wraps all precipitate database operations in a
      * single transaction.
      *
-     * @param  ConnectionInterface $con
+     * @param      ConnectionInterface $con
-     * @return int                 The number of rows affected by this insert/update and any referring fk objects' save() operations.
+     * @return int             The number of rows affected by this insert/update and any referring fk objects' save() operations.
      * @throws PropelException
      * @see doSave()
      */
@@ -787,8 +801,8 @@ abstract class AttributeI18n implements ActiveRecordInterface
      * If the object is new, it inserts it; otherwise an update is performed.
      * All related objects are also updated in this method.
      *
-     * @param  ConnectionInterface $con
+     * @param      ConnectionInterface $con
-     * @return int                 The number of rows affected by this insert/update and any referring fk objects' save() operations.
+     * @return int             The number of rows affected by this insert/update and any referring fk objects' save() operations.
      * @throws PropelException
      * @see save()
      */
@@ -831,7 +845,7 @@ abstract class AttributeI18n implements ActiveRecordInterface
     /**
      * Insert the row in the database.
      *
-     * @param ConnectionInterface $con
+     * @param      ConnectionInterface $con
      *
      * @throws PropelException
      * @see doSave()
@@ -904,7 +918,7 @@ abstract class AttributeI18n implements ActiveRecordInterface
     /**
      * Update the row in the database.
      *
-     * @param ConnectionInterface $con
+     * @param      ConnectionInterface $con
      *
      * @return Integer Number of updated rows
      * @see doSave()
@@ -920,12 +934,12 @@ abstract class AttributeI18n implements ActiveRecordInterface
     /**
      * Retrieves a field from the object by name passed in as a string.
      *
-     * @param  string $name name
+     * @param      string $name name
-     * @param  string $type The type of fieldname the $name is of:
+     * @param      string $type The type of fieldname the $name is of:
-     *                      one of the class type constants TableMap::TYPE_PHPNAME, TableMap::TYPE_STUDLYPHPNAME
+     *                     one of the class type constants TableMap::TYPE_PHPNAME, TableMap::TYPE_STUDLYPHPNAME
-     *                      TableMap::TYPE_COLNAME, TableMap::TYPE_FIELDNAME, TableMap::TYPE_NUM.
+     *                     TableMap::TYPE_COLNAME, TableMap::TYPE_FIELDNAME, TableMap::TYPE_NUM.
-     *                      Defaults to TableMap::TYPE_PHPNAME.
+     *                     Defaults to TableMap::TYPE_PHPNAME.
-     * @return mixed  Value of field.
+     * @return mixed Value of field.
      */
     public function getByName($name, $type = TableMap::TYPE_PHPNAME)
     {
@@ -939,7 +953,7 @@ abstract class AttributeI18n implements ActiveRecordInterface
      * Retrieves a field from the object by Position as specified in the xml schema.
      * Zero-based.
      *
-     * @param  int   $pos position in xml schema
+     * @param      int $pos position in xml schema
      * @return mixed Value of field at $pos
      */
     public function getByPosition($pos)
@@ -975,12 +989,12 @@ abstract class AttributeI18n implements ActiveRecordInterface
      * You can specify the key type of the array by passing one of the class
      * type constants.
      *
-     * @param string  $keyType                (optional) One of the class type constants TableMap::TYPE_PHPNAME, TableMap::TYPE_STUDLYPHPNAME,
+     * @param     string  $keyType (optional) One of the class type constants TableMap::TYPE_PHPNAME, TableMap::TYPE_STUDLYPHPNAME,
-     *                                        TableMap::TYPE_COLNAME, TableMap::TYPE_FIELDNAME, TableMap::TYPE_NUM.
+     *                    TableMap::TYPE_COLNAME, TableMap::TYPE_FIELDNAME, TableMap::TYPE_NUM.
-     *                                        Defaults to TableMap::TYPE_PHPNAME.
+     *                    Defaults to TableMap::TYPE_PHPNAME.
-     * @param boolean $includeLazyLoadColumns (optional) Whether to include lazy loaded columns. Defaults to TRUE.
+     * @param     boolean $includeLazyLoadColumns (optional) Whether to include lazy loaded columns. Defaults to TRUE.
-     * @param array   $alreadyDumpedObjects   List of objects to skip to avoid recursion
+     * @param     array $alreadyDumpedObjects List of objects to skip to avoid recursion
-     * @param boolean $includeForeignObjects  (optional) Whether to include hydrated related objects. Default to FALSE.
+     * @param     boolean $includeForeignObjects (optional) Whether to include hydrated related objects. Default to FALSE.
      *
      * @return array an associative array containing the field names (as keys) and field values
      */
@@ -1016,12 +1030,12 @@ abstract class AttributeI18n implements ActiveRecordInterface
     /**
      * Sets a field from the object by name passed in as a string.
      *
-     * @param  string $name
+     * @param      string $name
-     * @param  mixed  $value field value
+     * @param      mixed  $value field value
-     * @param  string $type  The type of fieldname the $name is of:
+     * @param      string $type The type of fieldname the $name is of:
-     *                       one of the class type constants TableMap::TYPE_PHPNAME, TableMap::TYPE_STUDLYPHPNAME
+     *                     one of the class type constants TableMap::TYPE_PHPNAME, TableMap::TYPE_STUDLYPHPNAME
-     *                       TableMap::TYPE_COLNAME, TableMap::TYPE_FIELDNAME, TableMap::TYPE_NUM.
+     *                     TableMap::TYPE_COLNAME, TableMap::TYPE_FIELDNAME, TableMap::TYPE_NUM.
-     *                       Defaults to TableMap::TYPE_PHPNAME.
+     *                     Defaults to TableMap::TYPE_PHPNAME.
      * @return void
      */
     public function setByName($name, $value, $type = TableMap::TYPE_PHPNAME)
@@ -1035,8 +1049,8 @@ abstract class AttributeI18n implements ActiveRecordInterface
      * Sets a field from the object by Position as specified in the xml schema.
      * Zero-based.
      *
-     * @param  int   $pos   position in xml schema
+     * @param      int $pos position in xml schema
-     * @param  mixed $value field value
+     * @param      mixed $value field value
      * @return void
      */
     public function setByPosition($pos, $value)
@@ -1076,8 +1090,8 @@ abstract class AttributeI18n implements ActiveRecordInterface
      * TableMap::TYPE_COLNAME, TableMap::TYPE_FIELDNAME, TableMap::TYPE_NUM.
      * The default key type is the column's TableMap::TYPE_PHPNAME.
      *
-     * @param  array  $arr     An array to populate the object from.
+     * @param      array  $arr     An array to populate the object from.
-     * @param  string $keyType The type of keys the array uses.
+     * @param      string $keyType The type of keys the array uses.
      * @return void
      */
     public function fromArray($arr, $keyType = TableMap::TYPE_PHPNAME)
@@ -1107,6 +1121,7 @@ abstract class AttributeI18n implements ActiveRecordInterface
         if ($this->isColumnModified(AttributeI18nTableMap::DESCRIPTION)) $criteria->add(AttributeI18nTableMap::DESCRIPTION, $this->description);
         if ($this->isColumnModified(AttributeI18nTableMap::CHAPO)) $criteria->add(AttributeI18nTableMap::CHAPO, $this->chapo);
         if ($this->isColumnModified(AttributeI18nTableMap::POSTSCRIPTUM)) $criteria->add(AttributeI18nTableMap::POSTSCRIPTUM, $this->postscriptum);
+
         return $criteria;
     }
 
@@ -1144,7 +1159,7 @@ abstract class AttributeI18n implements ActiveRecordInterface
     /**
      * Set the [composite] primary key.
      *
-     * @param  array $keys The elements of the composite key (order must match the order in XML file).
+     * @param      array $keys The elements of the composite key (order must match the order in XML file).
      * @return void
      */
     public function setPrimaryKey($keys)
@@ -1159,6 +1174,7 @@ abstract class AttributeI18n implements ActiveRecordInterface
      */
     public function isPrimaryKeyNull()
     {
+
         return (null === $this->getId()) && (null === $this->getLocale());
     }
 
@@ -1168,9 +1184,9 @@ abstract class AttributeI18n implements ActiveRecordInterface
      * If desired, this method can also make copies of all associated (fkey referrers)
      * objects.
      *
-     * @param  object          $copyObj  An object of \Thelia\Model\AttributeI18n (or compatible) type.
+     * @param      object $copyObj An object of \Thelia\Model\AttributeI18n (or compatible) type.
-     * @param  boolean         $deepCopy Whether to also copy all rows that refer (by fkey) to the current row.
+     * @param      boolean $deepCopy Whether to also copy all rows that refer (by fkey) to the current row.
-     * @param  boolean         $makeNew  Whether to reset autoincrement PKs and make the object new.
+     * @param      boolean $makeNew Whether to reset autoincrement PKs and make the object new.
      * @throws PropelException
      */
     public function copyInto($copyObj, $deepCopy = false, $makeNew = true)
@@ -1194,8 +1210,8 @@ abstract class AttributeI18n implements ActiveRecordInterface
      * If desired, this method can also make copies of all associated (fkey referrers)
      * objects.
      *
-     * @param  boolean                     $deepCopy Whether to also copy all rows that refer (by fkey) to the current row.
+     * @param      boolean $deepCopy Whether to also copy all rows that refer (by fkey) to the current row.
-     * @return \Thelia\Model\AttributeI18n Clone of current object.
+     * @return                 \Thelia\Model\AttributeI18n Clone of current object.
      * @throws PropelException
      */
     public function copy($deepCopy = false)
@@ -1211,8 +1227,8 @@ abstract class AttributeI18n implements ActiveRecordInterface
     /**
      * Declares an association between this object and a ChildAttribute object.
      *
-     * @param  ChildAttribute              $v
+     * @param                  ChildAttribute $v
-     * @return \Thelia\Model\AttributeI18n The current object (for fluent API support)
+     * @return                 \Thelia\Model\AttributeI18n The current object (for fluent API support)
      * @throws PropelException
      */
     public function setAttribute(ChildAttribute $v = null)
@@ -1231,14 +1247,16 @@ abstract class AttributeI18n implements ActiveRecordInterface
             $v->addAttributeI18n($this);
         }
 
+
         return $this;
     }
 
+
     /**
      * Get the associated ChildAttribute object
      *
-     * @param  ConnectionInterface $con Optional Connection object.
+     * @param      ConnectionInterface $con Optional Connection object.
-     * @return ChildAttribute      The associated ChildAttribute object.
+     * @return                 ChildAttribute The associated ChildAttribute object.
      * @throws PropelException
      */
     public function getAttribute(ConnectionInterface $con = null)
@@ -1283,7 +1301,7 @@ abstract class AttributeI18n implements ActiveRecordInterface
      * objects with circular references (even in PHP 5.3). This is currently necessary
      * when using Propel in certain daemon or large-volume/high-memory operations.
      *
-     * @param boolean $deep Whether to also clear the references on all referrer objects.
+     * @param      boolean $deep Whether to also clear the references on all referrer objects.
      */
     public function clearAllReferences($deep = false)
     {

core/lib/Thelia/Model/Base/AttributeI18nQuery.php

@@ -67,9 +67,9 @@ abstract class AttributeI18nQuery extends ModelCriteria
     /**
      * Initializes internal state of \Thelia\Model\Base\AttributeI18nQuery object.
      *
-     * @param string $dbName     The database name
+     * @param     string $dbName The database name
-     * @param string $modelName  The phpName of a model, e.g. 'Book'
+     * @param     string $modelName The phpName of a model, e.g. 'Book'
-     * @param string $modelAlias The alias for the model in this query, e.g. 'b'
+     * @param     string $modelAlias The alias for the model in this query, e.g. 'b'
      */
     public function __construct($dbName = 'thelia', $modelName = '\\Thelia\\Model\\AttributeI18n', $modelAlias = null)
     {
@@ -79,8 +79,8 @@ abstract class AttributeI18nQuery extends ModelCriteria
     /**
      * Returns a new ChildAttributeI18nQuery object.
      *
-     * @param string   $modelAlias The alias of a model in the query
+     * @param     string $modelAlias The alias of a model in the query
-     * @param Criteria $criteria   Optional Criteria to build the query from
+     * @param     Criteria $criteria Optional Criteria to build the query from
      *
      * @return ChildAttributeI18nQuery
      */
@@ -140,10 +140,10 @@ abstract class AttributeI18nQuery extends ModelCriteria
      * Find object by primary key using raw SQL to go fast.
      * Bypass doSelect() and the object formatter by using generated code.
      *
-     * @param mixed               $key Primary key to use for the query
+     * @param     mixed $key Primary key to use for the query
-     * @param ConnectionInterface $con A connection object
+     * @param     ConnectionInterface $con A connection object
      *
-     * @return ChildAttributeI18n A model object, or null if the key is not found
+     * @return   ChildAttributeI18n A model object, or null if the key is not found
      */
     protected function findPkSimple($key, $con)
     {
@@ -171,8 +171,8 @@ abstract class AttributeI18nQuery extends ModelCriteria
     /**
      * Find object by primary key.
      *
-     * @param mixed               $key Primary key to use for the query
+     * @param     mixed $key Primary key to use for the query
-     * @param ConnectionInterface $con A connection object
+     * @param     ConnectionInterface $con A connection object
      *
      * @return ChildAttributeI18n|array|mixed the result, formatted by the current formatter
      */
@@ -192,8 +192,8 @@ abstract class AttributeI18nQuery extends ModelCriteria
      * <code>
      * $objs = $c->findPks(array(array(12, 56), array(832, 123), array(123, 456)), $con);
      * </code>
-     * @param array               $keys Primary keys to use for the query
+     * @param     array $keys Primary keys to use for the query
-     * @param ConnectionInterface $con  an optional connection object
+     * @param     ConnectionInterface $con an optional connection object
      *
      * @return ObjectCollection|array|mixed the list of results, formatted by the current formatter
      */
@@ -214,7 +214,7 @@ abstract class AttributeI18nQuery extends ModelCriteria
     /**
      * Filter the query by primary key
      *
-     * @param mixed $key Primary key to use for the query
+     * @param     mixed $key Primary key to use for the query
      *
      * @return ChildAttributeI18nQuery The current query, for fluid interface
      */
@@ -229,7 +229,7 @@ abstract class AttributeI18nQuery extends ModelCriteria
     /**
      * Filter the query by a list of primary keys
      *
-     * @param array $keys The list of primary key to use for the query
+     * @param     array $keys The list of primary key to use for the query
      *
      * @return ChildAttributeI18nQuery The current query, for fluid interface
      */
@@ -260,11 +260,11 @@ abstract class AttributeI18nQuery extends ModelCriteria
      *
      * @see       filterByAttribute()
      *
-     * @param mixed  $id         The value to use as filter.
+     * @param     mixed $id The value to use as filter.
-     *                           Use scalar values for equality.
+     *              Use scalar values for equality.
-     *                           Use array values for in_array() equivalent.
+     *              Use array values for in_array() equivalent.
-     *                           Use associative array('min' => $minValue, 'max' => $maxValue) for intervals.
+     *              Use associative array('min' => $minValue, 'max' => $maxValue) for intervals.
-     * @param string $comparison Operator to use for the column comparison, defaults to Criteria::EQUAL
+     * @param     string $comparison Operator to use for the column comparison, defaults to Criteria::EQUAL
      *
      * @return ChildAttributeI18nQuery The current query, for fluid interface
      */
@@ -300,9 +300,9 @@ abstract class AttributeI18nQuery extends ModelCriteria
      * $query->filterByLocale('%fooValue%'); // WHERE locale LIKE '%fooValue%'
      * </code>
      *
-     * @param string $locale     The value to use as filter.
+     * @param     string $locale The value to use as filter.
-     *                           Accepts wildcards (* and % trigger a LIKE)
+     *              Accepts wildcards (* and % trigger a LIKE)
-     * @param string $comparison Operator to use for the column comparison, defaults to Criteria::EQUAL
+     * @param     string $comparison Operator to use for the column comparison, defaults to Criteria::EQUAL
      *
      * @return ChildAttributeI18nQuery The current query, for fluid interface
      */
@@ -329,9 +329,9 @@ abstract class AttributeI18nQuery extends ModelCriteria
      * $query->filterByTitle('%fooValue%'); // WHERE title LIKE '%fooValue%'
      * </code>
      *
-     * @param string $title      The value to use as filter.
+     * @param     string $title The value to use as filter.
-     *                           Accepts wildcards (* and % trigger a LIKE)
+     *              Accepts wildcards (* and % trigger a LIKE)
-     * @param string $comparison Operator to use for the column comparison, defaults to Criteria::EQUAL
+     * @param     string $comparison Operator to use for the column comparison, defaults to Criteria::EQUAL
      *
      * @return ChildAttributeI18nQuery The current query, for fluid interface
      */
@@ -358,9 +358,9 @@ abstract class AttributeI18nQuery extends ModelCriteria
      * $query->filterByDescription('%fooValue%'); // WHERE description LIKE '%fooValue%'
      * </code>
      *
-     * @param string $description The value to use as filter.
+     * @param     string $description The value to use as filter.
-     *                            Accepts wildcards (* and % trigger a LIKE)
+     *              Accepts wildcards (* and % trigger a LIKE)
-     * @param string $comparison  Operator to use for the column comparison, defaults to Criteria::EQUAL
+     * @param     string $comparison Operator to use for the column comparison, defaults to Criteria::EQUAL
      *
      * @return ChildAttributeI18nQuery The current query, for fluid interface
      */
@@ -387,9 +387,9 @@ abstract class AttributeI18nQuery extends ModelCriteria
      * $query->filterByChapo('%fooValue%'); // WHERE chapo LIKE '%fooValue%'
      * </code>
      *
-     * @param string $chapo      The value to use as filter.
+     * @param     string $chapo The value to use as filter.
-     *                           Accepts wildcards (* and % trigger a LIKE)
+     *              Accepts wildcards (* and % trigger a LIKE)
-     * @param string $comparison Operator to use for the column comparison, defaults to Criteria::EQUAL
+     * @param     string $comparison Operator to use for the column comparison, defaults to Criteria::EQUAL
      *
      * @return ChildAttributeI18nQuery The current query, for fluid interface
      */
@@ -416,9 +416,9 @@ abstract class AttributeI18nQuery extends ModelCriteria
      * $query->filterByPostscriptum('%fooValue%'); // WHERE postscriptum LIKE '%fooValue%'
      * </code>
      *
-     * @param string $postscriptum The value to use as filter.
+     * @param     string $postscriptum The value to use as filter.
-     *                             Accepts wildcards (* and % trigger a LIKE)
+     *              Accepts wildcards (* and % trigger a LIKE)
-     * @param string $comparison   Operator to use for the column comparison, defaults to Criteria::EQUAL
+     * @param     string $comparison Operator to use for the column comparison, defaults to Criteria::EQUAL
      *
      * @return ChildAttributeI18nQuery The current query, for fluid interface
      */
@@ -439,8 +439,8 @@ abstract class AttributeI18nQuery extends ModelCriteria
     /**
      * Filter the query by a related \Thelia\Model\Attribute object
      *
-     * @param \Thelia\Model\Attribute|ObjectCollection $attribute  The related object(s) to use as filter
+     * @param \Thelia\Model\Attribute|ObjectCollection $attribute The related object(s) to use as filter
-     * @param string                                   $comparison Operator to use for the column comparison, defaults to Criteria::EQUAL
+     * @param string $comparison Operator to use for the column comparison, defaults to Criteria::EQUAL
      *
      * @return ChildAttributeI18nQuery The current query, for fluid interface
      */
@@ -464,8 +464,8 @@ abstract class AttributeI18nQuery extends ModelCriteria
     /**
      * Adds a JOIN clause to the query using the Attribute relation
      *
-     * @param string $relationAlias optional alias for the relation
+     * @param     string $relationAlias optional alias for the relation
-     * @param string $joinType      Accepted values are null, 'left join', 'right join', 'inner join'
+     * @param     string $joinType Accepted values are null, 'left join', 'right join', 'inner join'
      *
      * @return ChildAttributeI18nQuery The current query, for fluid interface
      */
@@ -498,11 +498,11 @@ abstract class AttributeI18nQuery extends ModelCriteria
      *
      * @see useQuery()
      *
-     * @param string $relationAlias optional alias for the relation,
+     * @param     string $relationAlias optional alias for the relation,
-     *                              to be used as main alias in the secondary query
+     *                                   to be used as main alias in the secondary query
-     * @param string $joinType      Accepted values are null, 'left join', 'right join', 'inner join'
+     * @param     string $joinType Accepted values are null, 'left join', 'right join', 'inner join'
      *
-     * @return \Thelia\Model\AttributeQuery A secondary query class using the current class as primary query
+     * @return   \Thelia\Model\AttributeQuery A secondary query class using the current class as primary query
      */
     public function useAttributeQuery($relationAlias = null, $joinType = 'LEFT JOIN')
     {
@@ -514,7 +514,7 @@ abstract class AttributeI18nQuery extends ModelCriteria
     /**
      * Exclude object from result
      *
-     * @param ChildAttributeI18n $attributeI18n Object to remove from the list of results
+     * @param   ChildAttributeI18n $attributeI18n Object to remove from the list of results
      *
      * @return ChildAttributeI18nQuery The current query, for fluid interface
      */
@@ -532,8 +532,8 @@ abstract class AttributeI18nQuery extends ModelCriteria
     /**
      * Deletes all rows from the attribute_i18n table.
      *
-     * @param  ConnectionInterface $con the connection to use
+     * @param ConnectionInterface $con the connection to use
-     * @return int                 The number of affected rows (if supported by underlying database driver).
+     * @return int The number of affected rows (if supported by underlying database driver).
      */
     public function doDeleteAll(ConnectionInterface $con = null)
     {
@@ -564,13 +564,13 @@ abstract class AttributeI18nQuery extends ModelCriteria
     /**
      * Performs a DELETE on the database, given a ChildAttributeI18n or Criteria object OR a primary key value.
      *
-     * @param  mixed               $values Criteria or ChildAttributeI18n object or primary key or array of primary keys
+     * @param mixed               $values Criteria or ChildAttributeI18n object or primary key or array of primary keys
-     *                                     which is used to create the DELETE statement
+     *              which is used to create the DELETE statement
-     * @param  ConnectionInterface $con    the connection to use
+     * @param ConnectionInterface $con the connection to use
-     * @return int                 The number of affected rows (if supported by underlying database driver).  This includes CASCADE-related rows
+     * @return int The number of affected rows (if supported by underlying database driver).  This includes CASCADE-related rows
-     *                                    if supported by native driver or if emulated using Propel.
+     *                if supported by native driver or if emulated using Propel.
-     * @throws PropelException     Any exceptions caught during processing will be
+     * @throws PropelException Any exceptions caught during processing will be
-     *                                    rethrown wrapped into a PropelException.
+     *         rethrown wrapped into a PropelException.
      */
      public function delete(ConnectionInterface $con = null)
      {
@@ -590,6 +590,7 @@ abstract class AttributeI18nQuery extends ModelCriteria
             // for more than one table or we could emulating ON DELETE CASCADE, etc.
             $con->beginTransaction();
 
+
         AttributeI18nTableMap::removeInstanceFromPool($criteria);
 
             $affectedRows += ModelCriteria::delete($con);

core/lib/Thelia/Model/Base/AttributeQuery.php

@@ -72,9 +72,9 @@ abstract class AttributeQuery extends ModelCriteria
     /**
      * Initializes internal state of \Thelia\Model\Base\AttributeQuery object.
      *
-     * @param string $dbName     The database name
+     * @param     string $dbName The database name
-     * @param string $modelName  The phpName of a model, e.g. 'Book'
+     * @param     string $modelName The phpName of a model, e.g. 'Book'
-     * @param string $modelAlias The alias for the model in this query, e.g. 'b'
+     * @param     string $modelAlias The alias for the model in this query, e.g. 'b'
      */
     public function __construct($dbName = 'thelia', $modelName = '\\Thelia\\Model\\Attribute', $modelAlias = null)
     {
@@ -84,8 +84,8 @@ abstract class AttributeQuery extends ModelCriteria
     /**
      * Returns a new ChildAttributeQuery object.
      *
-     * @param string   $modelAlias The alias of a model in the query
+     * @param     string $modelAlias The alias of a model in the query
-     * @param Criteria $criteria   Optional Criteria to build the query from
+     * @param     Criteria $criteria Optional Criteria to build the query from
      *
      * @return ChildAttributeQuery
      */
@@ -114,7 +114,7 @@ abstract class AttributeQuery extends ModelCriteria
      * $obj  = $c->findPk(12, $con);
      * </code>
      *
-     * @param mixed               $key Primary key to use for the query
+     * @param mixed $key Primary key to use for the query
      * @param ConnectionInterface $con an optional connection object
      *
      * @return ChildAttribute|array|mixed the result, formatted by the current formatter
@@ -145,10 +145,10 @@ abstract class AttributeQuery extends ModelCriteria
      * Find object by primary key using raw SQL to go fast.
      * Bypass doSelect() and the object formatter by using generated code.
      *
-     * @param mixed               $key Primary key to use for the query
+     * @param     mixed $key Primary key to use for the query
-     * @param ConnectionInterface $con A connection object
+     * @param     ConnectionInterface $con A connection object
      *
-     * @return ChildAttribute A model object, or null if the key is not found
+     * @return   ChildAttribute A model object, or null if the key is not found
      */
     protected function findPkSimple($key, $con)
     {
@@ -175,8 +175,8 @@ abstract class AttributeQuery extends ModelCriteria
     /**
      * Find object by primary key.
      *
-     * @param mixed               $key Primary key to use for the query
+     * @param     mixed $key Primary key to use for the query
-     * @param ConnectionInterface $con A connection object
+     * @param     ConnectionInterface $con A connection object
      *
      * @return ChildAttribute|array|mixed the result, formatted by the current formatter
      */
@@ -196,8 +196,8 @@ abstract class AttributeQuery extends ModelCriteria
      * <code>
      * $objs = $c->findPks(array(12, 56, 832), $con);
      * </code>
-     * @param array               $keys Primary keys to use for the query
+     * @param     array $keys Primary keys to use for the query
-     * @param ConnectionInterface $con  an optional connection object
+     * @param     ConnectionInterface $con an optional connection object
      *
      * @return ObjectCollection|array|mixed the list of results, formatted by the current formatter
      */
@@ -218,24 +218,26 @@ abstract class AttributeQuery extends ModelCriteria
     /**
      * Filter the query by primary key
      *
-     * @param mixed $key Primary key to use for the query
+     * @param     mixed $key Primary key to use for the query
      *
      * @return ChildAttributeQuery The current query, for fluid interface
      */
     public function filterByPrimaryKey($key)
     {
+
         return $this->addUsingAlias(AttributeTableMap::ID, $key, Criteria::EQUAL);
     }
 
     /**
      * Filter the query by a list of primary keys
      *
-     * @param array $keys The list of primary key to use for the query
+     * @param     array $keys The list of primary key to use for the query
      *
      * @return ChildAttributeQuery The current query, for fluid interface
      */
     public function filterByPrimaryKeys($keys)
     {
+
         return $this->addUsingAlias(AttributeTableMap::ID, $keys, Criteria::IN);
     }
 
@@ -249,11 +251,11 @@ abstract class AttributeQuery extends ModelCriteria
      * $query->filterById(array('min' => 12)); // WHERE id > 12
      * </code>
      *
-     * @param mixed  $id         The value to use as filter.
+     * @param     mixed $id The value to use as filter.
-     *                           Use scalar values for equality.
+     *              Use scalar values for equality.
-     *                           Use array values for in_array() equivalent.
+     *              Use array values for in_array() equivalent.
-     *                           Use associative array('min' => $minValue, 'max' => $maxValue) for intervals.
+     *              Use associative array('min' => $minValue, 'max' => $maxValue) for intervals.
-     * @param string $comparison Operator to use for the column comparison, defaults to Criteria::EQUAL
+     * @param     string $comparison Operator to use for the column comparison, defaults to Criteria::EQUAL
      *
      * @return ChildAttributeQuery The current query, for fluid interface
      */
@@ -290,11 +292,11 @@ abstract class AttributeQuery extends ModelCriteria
      * $query->filterByPosition(array('min' => 12)); // WHERE position > 12
      * </code>
      *
-     * @param mixed  $position   The value to use as filter.
+     * @param     mixed $position The value to use as filter.
-     *                           Use scalar values for equality.
+     *              Use scalar values for equality.
-     *                           Use array values for in_array() equivalent.
+     *              Use array values for in_array() equivalent.
-     *                           Use associative array('min' => $minValue, 'max' => $maxValue) for intervals.
+     *              Use associative array('min' => $minValue, 'max' => $maxValue) for intervals.
-     * @param string $comparison Operator to use for the column comparison, defaults to Criteria::EQUAL
+     * @param     string $comparison Operator to use for the column comparison, defaults to Criteria::EQUAL
      *
      * @return ChildAttributeQuery The current query, for fluid interface
      */
@@ -331,13 +333,13 @@ abstract class AttributeQuery extends ModelCriteria
      * $query->filterByCreatedAt(array('max' => 'yesterday')); // WHERE created_at > '2011-03-13'
      * </code>
      *
-     * @param mixed  $createdAt  The value to use as filter.
+     * @param     mixed $createdAt The value to use as filter.
-     *                           Values can be integers (unix timestamps), DateTime objects, or strings.
+     *              Values can be integers (unix timestamps), DateTime objects, or strings.
-     *                           Empty strings are treated as NULL.
+     *              Empty strings are treated as NULL.
-     *                           Use scalar values for equality.
+     *              Use scalar values for equality.
-     *                           Use array values for in_array() equivalent.
+     *              Use array values for in_array() equivalent.
-     *                           Use associative array('min' => $minValue, 'max' => $maxValue) for intervals.
+     *              Use associative array('min' => $minValue, 'max' => $maxValue) for intervals.
-     * @param string $comparison Operator to use for the column comparison, defaults to Criteria::EQUAL
+     * @param     string $comparison Operator to use for the column comparison, defaults to Criteria::EQUAL
      *
      * @return ChildAttributeQuery The current query, for fluid interface
      */
@@ -374,13 +376,13 @@ abstract class AttributeQuery extends ModelCriteria
      * $query->filterByUpdatedAt(array('max' => 'yesterday')); // WHERE updated_at > '2011-03-13'
      * </code>
      *
-     * @param mixed  $updatedAt  The value to use as filter.
+     * @param     mixed $updatedAt The value to use as filter.
-     *                           Values can be integers (unix timestamps), DateTime objects, or strings.
+     *              Values can be integers (unix timestamps), DateTime objects, or strings.
-     *                           Empty strings are treated as NULL.
+     *              Empty strings are treated as NULL.
-     *                           Use scalar values for equality.
+     *              Use scalar values for equality.
-     *                           Use array values for in_array() equivalent.
+     *              Use array values for in_array() equivalent.
-     *                           Use associative array('min' => $minValue, 'max' => $maxValue) for intervals.
+     *              Use associative array('min' => $minValue, 'max' => $maxValue) for intervals.
-     * @param string $comparison Operator to use for the column comparison, defaults to Criteria::EQUAL
+     * @param     string $comparison Operator to use for the column comparison, defaults to Criteria::EQUAL
      *
      * @return ChildAttributeQuery The current query, for fluid interface
      */
@@ -410,8 +412,8 @@ abstract class AttributeQuery extends ModelCriteria
     /**
      * Filter the query by a related \Thelia\Model\AttributeAv object
      *
-     * @param \Thelia\Model\AttributeAv|ObjectCollection $attributeAv the related object to use as filter
+     * @param \Thelia\Model\AttributeAv|ObjectCollection $attributeAv  the related object to use as filter
-     * @param string                                     $comparison  Operator to use for the column comparison, defaults to Criteria::EQUAL
+     * @param string $comparison Operator to use for the column comparison, defaults to Criteria::EQUAL
      *
      * @return ChildAttributeQuery The current query, for fluid interface
      */
@@ -433,8 +435,8 @@ abstract class AttributeQuery extends ModelCriteria
     /**
      * Adds a JOIN clause to the query using the AttributeAv relation
      *
-     * @param string $relationAlias optional alias for the relation
+     * @param     string $relationAlias optional alias for the relation
-     * @param string $joinType      Accepted values are null, 'left join', 'right join', 'inner join'
+     * @param     string $joinType Accepted values are null, 'left join', 'right join', 'inner join'
      *
      * @return ChildAttributeQuery The current query, for fluid interface
      */
@@ -467,11 +469,11 @@ abstract class AttributeQuery extends ModelCriteria
      *
      * @see useQuery()
      *
-     * @param string $relationAlias optional alias for the relation,
+     * @param     string $relationAlias optional alias for the relation,
-     *                              to be used as main alias in the secondary query
+     *                                   to be used as main alias in the secondary query
-     * @param string $joinType      Accepted values are null, 'left join', 'right join', 'inner join'
+     * @param     string $joinType Accepted values are null, 'left join', 'right join', 'inner join'
      *
-     * @return \Thelia\Model\AttributeAvQuery A secondary query class using the current class as primary query
+     * @return   \Thelia\Model\AttributeAvQuery A secondary query class using the current class as primary query
      */
     public function useAttributeAvQuery($relationAlias = null, $joinType = Criteria::INNER_JOIN)
     {
@@ -483,8 +485,8 @@ abstract class AttributeQuery extends ModelCriteria
     /**
      * Filter the query by a related \Thelia\Model\AttributeCombination object
      *
-     * @param \Thelia\Model\AttributeCombination|ObjectCollection $attributeCombination the related object to use as filter
+     * @param \Thelia\Model\AttributeCombination|ObjectCollection $attributeCombination  the related object to use as filter
-     * @param string                                              $comparison           Operator to use for the column comparison, defaults to Criteria::EQUAL
+     * @param string $comparison Operator to use for the column comparison, defaults to Criteria::EQUAL
      *
      * @return ChildAttributeQuery The current query, for fluid interface
      */
@@ -506,8 +508,8 @@ abstract class AttributeQuery extends ModelCriteria
     /**
      * Adds a JOIN clause to the query using the AttributeCombination relation
      *
-     * @param string $relationAlias optional alias for the relation
+     * @param     string $relationAlias optional alias for the relation
-     * @param string $joinType      Accepted values are null, 'left join', 'right join', 'inner join'
+     * @param     string $joinType Accepted values are null, 'left join', 'right join', 'inner join'
      *
      * @return ChildAttributeQuery The current query, for fluid interface
      */
@@ -540,11 +542,11 @@ abstract class AttributeQuery extends ModelCriteria
      *
      * @see useQuery()
      *
-     * @param string $relationAlias optional alias for the relation,
+     * @param     string $relationAlias optional alias for the relation,
-     *                              to be used as main alias in the secondary query
+     *                                   to be used as main alias in the secondary query
-     * @param string $joinType      Accepted values are null, 'left join', 'right join', 'inner join'
+     * @param     string $joinType Accepted values are null, 'left join', 'right join', 'inner join'
      *
-     * @return \Thelia\Model\AttributeCombinationQuery A secondary query class using the current class as primary query
+     * @return   \Thelia\Model\AttributeCombinationQuery A secondary query class using the current class as primary query
      */
     public function useAttributeCombinationQuery($relationAlias = null, $joinType = Criteria::INNER_JOIN)
     {
@@ -556,8 +558,8 @@ abstract class AttributeQuery extends ModelCriteria
     /**
      * Filter the query by a related \Thelia\Model\AttributeTemplate object
      *
-     * @param \Thelia\Model\AttributeTemplate|ObjectCollection $attributeTemplate the related object to use as filter
+     * @param \Thelia\Model\AttributeTemplate|ObjectCollection $attributeTemplate  the related object to use as filter
-     * @param string                                           $comparison        Operator to use for the column comparison, defaults to Criteria::EQUAL
+     * @param string $comparison Operator to use for the column comparison, defaults to Criteria::EQUAL
      *
      * @return ChildAttributeQuery The current query, for fluid interface
      */
@@ -579,8 +581,8 @@ abstract class AttributeQuery extends ModelCriteria
     /**
      * Adds a JOIN clause to the query using the AttributeTemplate relation
      *
-     * @param string $relationAlias optional alias for the relation
+     * @param     string $relationAlias optional alias for the relation
-     * @param string $joinType      Accepted values are null, 'left join', 'right join', 'inner join'
+     * @param     string $joinType Accepted values are null, 'left join', 'right join', 'inner join'
      *
      * @return ChildAttributeQuery The current query, for fluid interface
      */
@@ -613,11 +615,11 @@ abstract class AttributeQuery extends ModelCriteria
      *
      * @see useQuery()
      *
-     * @param string $relationAlias optional alias for the relation,
+     * @param     string $relationAlias optional alias for the relation,
-     *                              to be used as main alias in the secondary query
+     *                                   to be used as main alias in the secondary query
-     * @param string $joinType      Accepted values are null, 'left join', 'right join', 'inner join'
+     * @param     string $joinType Accepted values are null, 'left join', 'right join', 'inner join'
      *
-     * @return \Thelia\Model\AttributeTemplateQuery A secondary query class using the current class as primary query
+     * @return   \Thelia\Model\AttributeTemplateQuery A secondary query class using the current class as primary query
      */
     public function useAttributeTemplateQuery($relationAlias = null, $joinType = Criteria::INNER_JOIN)
     {
@@ -629,8 +631,8 @@ abstract class AttributeQuery extends ModelCriteria
     /**
      * Filter the query by a related \Thelia\Model\AttributeI18n object
      *
-     * @param \Thelia\Model\AttributeI18n|ObjectCollection $attributeI18n the related object to use as filter
+     * @param \Thelia\Model\AttributeI18n|ObjectCollection $attributeI18n  the related object to use as filter
-     * @param string                                       $comparison    Operator to use for the column comparison, defaults to Criteria::EQUAL
+     * @param string $comparison Operator to use for the column comparison, defaults to Criteria::EQUAL
      *
      * @return ChildAttributeQuery The current query, for fluid interface
      */
@@ -652,8 +654,8 @@ abstract class AttributeQuery extends ModelCriteria
     /**
      * Adds a JOIN clause to the query using the AttributeI18n relation
      *
-     * @param string $relationAlias optional alias for the relation
+     * @param     string $relationAlias optional alias for the relation
-     * @param string $joinType      Accepted values are null, 'left join', 'right join', 'inner join'
+     * @param     string $joinType Accepted values are null, 'left join', 'right join', 'inner join'
      *
      * @return ChildAttributeQuery The current query, for fluid interface
      */
@@ -686,11 +688,11 @@ abstract class AttributeQuery extends ModelCriteria
      *
      * @see useQuery()
      *
-     * @param string $relationAlias optional alias for the relation,
+     * @param     string $relationAlias optional alias for the relation,
-     *                              to be used as main alias in the secondary query
+     *                                   to be used as main alias in the secondary query
-     * @param string $joinType      Accepted values are null, 'left join', 'right join', 'inner join'
+     * @param     string $joinType Accepted values are null, 'left join', 'right join', 'inner join'
      *
-     * @return \Thelia\Model\AttributeI18nQuery A secondary query class using the current class as primary query
+     * @return   \Thelia\Model\AttributeI18nQuery A secondary query class using the current class as primary query
      */
     public function useAttributeI18nQuery($relationAlias = null, $joinType = 'LEFT JOIN')
     {
@@ -703,8 +705,8 @@ abstract class AttributeQuery extends ModelCriteria
      * Filter the query by a related Template object
      * using the attribute_template table as cross reference
      *
-     * @param Template $template   the related object to use as filter
+     * @param Template $template the related object to use as filter
-     * @param string   $comparison Operator to use for the column comparison, defaults to Criteria::EQUAL
+     * @param string $comparison Operator to use for the column comparison, defaults to Criteria::EQUAL
      *
      * @return ChildAttributeQuery The current query, for fluid interface
      */
@@ -719,7 +721,7 @@ abstract class AttributeQuery extends ModelCriteria
     /**
      * Exclude object from result
      *
-     * @param ChildAttribute $attribute Object to remove from the list of results
+     * @param   ChildAttribute $attribute Object to remove from the list of results
      *
      * @return ChildAttributeQuery The current query, for fluid interface
      */
@@ -735,8 +737,8 @@ abstract class AttributeQuery extends ModelCriteria
     /**
      * Deletes all rows from the attribute table.
      *
-     * @param  ConnectionInterface $con the connection to use
+     * @param ConnectionInterface $con the connection to use
-     * @return int                 The number of affected rows (if supported by underlying database driver).
+     * @return int The number of affected rows (if supported by underlying database driver).
      */
     public function doDeleteAll(ConnectionInterface $con = null)
     {
@@ -767,13 +769,13 @@ abstract class AttributeQuery extends ModelCriteria
     /**
      * Performs a DELETE on the database, given a ChildAttribute or Criteria object OR a primary key value.
      *
-     * @param  mixed               $values Criteria or ChildAttribute object or primary key or array of primary keys
+     * @param mixed               $values Criteria or ChildAttribute object or primary key or array of primary keys
-     *                                     which is used to create the DELETE statement
+     *              which is used to create the DELETE statement
-     * @param  ConnectionInterface $con    the connection to use
+     * @param ConnectionInterface $con the connection to use
-     * @return int                 The number of affected rows (if supported by underlying database driver).  This includes CASCADE-related rows
+     * @return int The number of affected rows (if supported by underlying database driver).  This includes CASCADE-related rows
-     *                                    if supported by native driver or if emulated using Propel.
+     *                if supported by native driver or if emulated using Propel.
-     * @throws PropelException     Any exceptions caught during processing will be
+     * @throws PropelException Any exceptions caught during processing will be
-     *                                    rethrown wrapped into a PropelException.
+     *         rethrown wrapped into a PropelException.
      */
      public function delete(ConnectionInterface $con = null)
      {
@@ -793,6 +795,7 @@ abstract class AttributeQuery extends ModelCriteria
             // for more than one table or we could emulating ON DELETE CASCADE, etc.
             $con->beginTransaction();
 
+
         AttributeTableMap::removeInstanceFromPool($criteria);
 
             $affectedRows += ModelCriteria::delete($con);
@@ -811,9 +814,9 @@ abstract class AttributeQuery extends ModelCriteria
     /**
      * Filter by the latest updated
      *
-     * @param int $nbDays Maximum age of the latest update in days
+     * @param      int $nbDays Maximum age of the latest update in days
      *
-     * @return ChildAttributeQuery The current query, for fluid interface
+     * @return     ChildAttributeQuery The current query, for fluid interface
      */
     public function recentlyUpdated($nbDays = 7)
     {
@@ -823,9 +826,9 @@ abstract class AttributeQuery extends ModelCriteria
     /**
      * Filter by the latest created
      *
-     * @param int $nbDays Maximum age of in days
+     * @param      int $nbDays Maximum age of in days
      *
-     * @return ChildAttributeQuery The current query, for fluid interface
+     * @return     ChildAttributeQuery The current query, for fluid interface
      */
     public function recentlyCreated($nbDays = 7)
     {
@@ -835,7 +838,7 @@ abstract class AttributeQuery extends ModelCriteria
     /**
      * Order by update date desc
      *
-     * @return ChildAttributeQuery The current query, for fluid interface
+     * @return     ChildAttributeQuery The current query, for fluid interface
      */
     public function lastUpdatedFirst()
     {
@@ -845,7 +848,7 @@ abstract class AttributeQuery extends ModelCriteria
     /**
      * Order by update date asc
      *
-     * @return ChildAttributeQuery The current query, for fluid interface
+     * @return     ChildAttributeQuery The current query, for fluid interface
      */
     public function firstUpdatedFirst()
     {
@@ -855,7 +858,7 @@ abstract class AttributeQuery extends ModelCriteria
     /**
      * Order by create date desc
      *
-     * @return ChildAttributeQuery The current query, for fluid interface
+     * @return     ChildAttributeQuery The current query, for fluid interface
      */
     public function lastCreatedFirst()
     {
@@ -865,7 +868,7 @@ abstract class AttributeQuery extends ModelCriteria
     /**
      * Order by create date asc
      *
-     * @return ChildAttributeQuery The current query, for fluid interface
+     * @return     ChildAttributeQuery The current query, for fluid interface
      */
     public function firstCreatedFirst()
     {
@@ -877,11 +880,11 @@ abstract class AttributeQuery extends ModelCriteria
     /**
      * Adds a JOIN clause to the query using the i18n relation
      *
-     * @param string $locale        Locale to use for the join condition, e.g. 'fr_FR'
+     * @param     string $locale Locale to use for the join condition, e.g. 'fr_FR'
-     * @param string $relationAlias optional alias for the relation
+     * @param     string $relationAlias optional alias for the relation
-     * @param string $joinType      Accepted values are null, 'left join', 'right join', 'inner join'. Defaults to left join.
+     * @param     string $joinType Accepted values are null, 'left join', 'right join', 'inner join'. Defaults to left join.
      *
-     * @return ChildAttributeQuery The current query, for fluid interface
+     * @return    ChildAttributeQuery The current query, for fluid interface
      */
     public function joinI18n($locale = 'en_US', $relationAlias = null, $joinType = Criteria::LEFT_JOIN)
     {
@@ -896,10 +899,10 @@ abstract class AttributeQuery extends ModelCriteria
      * Adds a JOIN clause to the query and hydrates the related I18n object.
      * Shortcut for $c->joinI18n($locale)->with()
      *
-     * @param string $locale   Locale to use for the join condition, e.g. 'fr_FR'
+     * @param     string $locale Locale to use for the join condition, e.g. 'fr_FR'
-     * @param string $joinType Accepted values are null, 'left join', 'right join', 'inner join'. Defaults to left join.
+     * @param     string $joinType Accepted values are null, 'left join', 'right join', 'inner join'. Defaults to left join.
      *
-     * @return ChildAttributeQuery The current query, for fluid interface
+     * @return    ChildAttributeQuery The current query, for fluid interface
      */
     public function joinWithI18n($locale = 'en_US', $joinType = Criteria::LEFT_JOIN)
     {
@@ -916,11 +919,11 @@ abstract class AttributeQuery extends ModelCriteria
      *
      * @see       useQuery()
      *
-     * @param string $locale        Locale to use for the join condition, e.g. 'fr_FR'
+     * @param     string $locale Locale to use for the join condition, e.g. 'fr_FR'
-     * @param string $relationAlias optional alias for the relation
+     * @param     string $relationAlias optional alias for the relation
-     * @param string $joinType      Accepted values are null, 'left join', 'right join', 'inner join'. Defaults to left join.
+     * @param     string $joinType Accepted values are null, 'left join', 'right join', 'inner join'. Defaults to left join.
      *
-     * @return ChildAttributeI18nQuery A secondary query class using the current class as primary query
+     * @return    ChildAttributeI18nQuery A secondary query class using the current class as primary query
      */
     public function useI18nQuery($locale = 'en_US', $relationAlias = null, $joinType = Criteria::LEFT_JOIN)
     {

core/lib/Thelia/Model/Base/AttributeTemplate.php

@@ -31,6 +31,7 @@ abstract class AttributeTemplate implements ActiveRecordInterface
      */
     const TABLE_MAP = '\\Thelia\\Model\\Map\\AttributeTemplateTableMap';
 
+
     /**
      * attribute to determine if this object has previously been saved.
      * @var boolean
@@ -320,9 +321,9 @@ abstract class AttributeTemplate implements ActiveRecordInterface
      * $book->importFrom('JSON', '{"Id":9012,"Title":"Don Juan","ISBN":"0140422161","Price":12.99,"PublisherId":1234,"AuthorId":5678}');
      * </code>
      *
-     * @param mixed  $parser A AbstractParser instance,
+     * @param mixed $parser A AbstractParser instance,
      *                       or a format name ('XML', 'YAML', 'JSON', 'CSV')
-     * @param string $data   The source data to import from
+     * @param string $data The source data to import from
      *
      * @return AttributeTemplate The current object, for fluid interface
      */
@@ -372,40 +373,44 @@ abstract class AttributeTemplate implements ActiveRecordInterface
     /**
      * Get the [id] column value.
      *
-     * @return int
+     * @return   int
      */
     public function getId()
     {
+
         return $this->id;
     }
 
     /**
      * Get the [attribute_id] column value.
      *
-     * @return int
+     * @return   int
      */
     public function getAttributeId()
     {
+
         return $this->attribute_id;
     }
 
     /**
      * Get the [template_id] column value.
      *
-     * @return int
+     * @return   int
      */
     public function getTemplateId()
     {
+
         return $this->template_id;
     }
 
     /**
      * Get the [position] column value.
      *
-     * @return int
+     * @return   int
      */
     public function getPosition()
     {
+
         return $this->position;
     }
 
@@ -413,8 +418,8 @@ abstract class AttributeTemplate implements ActiveRecordInterface
      * Get the [optionally formatted] temporal [created_at] column value.
      *
      *
-     * @param string $format The date/time format string (either date()-style or strftime()-style).
+     * @param      string $format The date/time format string (either date()-style or strftime()-style).
-     *                       If format is NULL, then the raw \DateTime object will be returned.
+     *                            If format is NULL, then the raw \DateTime object will be returned.
      *
      * @return mixed Formatted date/time value as string or \DateTime object (if format is NULL), NULL if column is NULL, and 0 if column value is 0000-00-00 00:00:00
      *
@@ -433,8 +438,8 @@ abstract class AttributeTemplate implements ActiveRecordInterface
      * Get the [optionally formatted] temporal [updated_at] column value.
      *
      *
-     * @param string $format The date/time format string (either date()-style or strftime()-style).
+     * @param      string $format The date/time format string (either date()-style or strftime()-style).
-     *                       If format is NULL, then the raw \DateTime object will be returned.
+     *                            If format is NULL, then the raw \DateTime object will be returned.
      *
      * @return mixed Formatted date/time value as string or \DateTime object (if format is NULL), NULL if column is NULL, and 0 if column value is 0000-00-00 00:00:00
      *
@@ -452,8 +457,8 @@ abstract class AttributeTemplate implements ActiveRecordInterface
     /**
      * Set the value of [id] column.
      *
-     * @param  int                             $v new value
+     * @param      int $v new value
-     * @return \Thelia\Model\AttributeTemplate The current object (for fluent API support)
+     * @return   \Thelia\Model\AttributeTemplate The current object (for fluent API support)
      */
     public function setId($v)
     {
@@ -466,14 +471,15 @@ abstract class AttributeTemplate implements ActiveRecordInterface
             $this->modifiedColumns[AttributeTemplateTableMap::ID] = true;
         }
 
+
         return $this;
     } // setId()
 
     /**
      * Set the value of [attribute_id] column.
      *
-     * @param  int                             $v new value
+     * @param      int $v new value
-     * @return \Thelia\Model\AttributeTemplate The current object (for fluent API support)
+     * @return   \Thelia\Model\AttributeTemplate The current object (for fluent API support)
      */
     public function setAttributeId($v)
     {
@@ -490,14 +496,15 @@ abstract class AttributeTemplate implements ActiveRecordInterface
             $this->aAttribute = null;
         }
 
+
         return $this;
     } // setAttributeId()
 
     /**
      * Set the value of [template_id] column.
      *
-     * @param  int                             $v new value
+     * @param      int $v new value
-     * @return \Thelia\Model\AttributeTemplate The current object (for fluent API support)
+     * @return   \Thelia\Model\AttributeTemplate The current object (for fluent API support)
      */
     public function setTemplateId($v)
     {
@@ -514,14 +521,15 @@ abstract class AttributeTemplate implements ActiveRecordInterface
             $this->aTemplate = null;
         }
 
+
         return $this;
     } // setTemplateId()
 
     /**
      * Set the value of [position] column.
      *
-     * @param  int                             $v new value
+     * @param      int $v new value
-     * @return \Thelia\Model\AttributeTemplate The current object (for fluent API support)
+     * @return   \Thelia\Model\AttributeTemplate The current object (for fluent API support)
      */
     public function setPosition($v)
     {
@@ -534,15 +542,16 @@ abstract class AttributeTemplate implements ActiveRecordInterface
             $this->modifiedColumns[AttributeTemplateTableMap::POSITION] = true;
         }
 
+
         return $this;
     } // setPosition()
 
     /**
      * Sets the value of [created_at] column to a normalized version of the date/time value specified.
      *
-     * @param  mixed                           $v string, integer (timestamp), or \DateTime value.
+     * @param      mixed $v string, integer (timestamp), or \DateTime value.
-     *                                            Empty strings are treated as NULL.
+     *               Empty strings are treated as NULL.
-     * @return \Thelia\Model\AttributeTemplate The current object (for fluent API support)
+     * @return   \Thelia\Model\AttributeTemplate The current object (for fluent API support)
      */
     public function setCreatedAt($v)
     {
@@ -554,15 +563,16 @@ abstract class AttributeTemplate implements ActiveRecordInterface
             }
         } // if either are not null
 
+
         return $this;
     } // setCreatedAt()
 
     /**
      * Sets the value of [updated_at] column to a normalized version of the date/time value specified.
      *
-     * @param  mixed                           $v string, integer (timestamp), or \DateTime value.
+     * @param      mixed $v string, integer (timestamp), or \DateTime value.
-     *                                            Empty strings are treated as NULL.
+     *               Empty strings are treated as NULL.
-     * @return \Thelia\Model\AttributeTemplate The current object (for fluent API support)
+     * @return   \Thelia\Model\AttributeTemplate The current object (for fluent API support)
      */
     public function setUpdatedAt($v)
     {
@@ -574,6 +584,7 @@ abstract class AttributeTemplate implements ActiveRecordInterface
             }
         } // if either are not null
 
+
         return $this;
     } // setUpdatedAt()
 
@@ -680,10 +691,10 @@ abstract class AttributeTemplate implements ActiveRecordInterface
      *
      * This will only work if the object has been saved and has a valid primary key set.
      *
-     * @param  boolean             $deep (optional) Whether to also de-associated any related objects.
+     * @param      boolean $deep (optional) Whether to also de-associated any related objects.
-     * @param  ConnectionInterface $con  (optional) The ConnectionInterface connection to use.
+     * @param      ConnectionInterface $con (optional) The ConnectionInterface connection to use.
      * @return void
-     * @throws PropelException     - if this object is deleted, unsaved or doesn't have pk match in db
+     * @throws PropelException - if this object is deleted, unsaved or doesn't have pk match in db
      */
     public function reload($deep = false, ConnectionInterface $con = null)
     {
@@ -720,7 +731,7 @@ abstract class AttributeTemplate implements ActiveRecordInterface
     /**
      * Removes this object from datastore and sets delete attribute.
      *
-     * @param  ConnectionInterface $con
+     * @param      ConnectionInterface $con
      * @return void
      * @throws PropelException
      * @see AttributeTemplate::setDeleted()
@@ -763,8 +774,8 @@ abstract class AttributeTemplate implements ActiveRecordInterface
      * method.  This method wraps all precipitate database operations in a
      * single transaction.
      *
-     * @param  ConnectionInterface $con
+     * @param      ConnectionInterface $con
-     * @return int                 The number of rows affected by this insert/update and any referring fk objects' save() operations.
+     * @return int             The number of rows affected by this insert/update and any referring fk objects' save() operations.
      * @throws PropelException
      * @see doSave()
      */
@@ -825,8 +836,8 @@ abstract class AttributeTemplate implements ActiveRecordInterface
      * If the object is new, it inserts it; otherwise an update is performed.
      * All related objects are also updated in this method.
      *
-     * @param  ConnectionInterface $con
+     * @param      ConnectionInterface $con
-     * @return int                 The number of rows affected by this insert/update and any referring fk objects' save() operations.
+     * @return int             The number of rows affected by this insert/update and any referring fk objects' save() operations.
      * @throws PropelException
      * @see save()
      */
@@ -876,7 +887,7 @@ abstract class AttributeTemplate implements ActiveRecordInterface
     /**
      * Insert the row in the database.
      *
-     * @param ConnectionInterface $con
+     * @param      ConnectionInterface $con
      *
      * @throws PropelException
      * @see doSave()
@@ -960,7 +971,7 @@ abstract class AttributeTemplate implements ActiveRecordInterface
     /**
      * Update the row in the database.
      *
-     * @param ConnectionInterface $con
+     * @param      ConnectionInterface $con
      *
      * @return Integer Number of updated rows
      * @see doSave()
@@ -976,12 +987,12 @@ abstract class AttributeTemplate implements ActiveRecordInterface
     /**
      * Retrieves a field from the object by name passed in as a string.
      *
-     * @param  string $name name
+     * @param      string $name name
-     * @param  string $type The type of fieldname the $name is of:
+     * @param      string $type The type of fieldname the $name is of:
-     *                      one of the class type constants TableMap::TYPE_PHPNAME, TableMap::TYPE_STUDLYPHPNAME
+     *                     one of the class type constants TableMap::TYPE_PHPNAME, TableMap::TYPE_STUDLYPHPNAME
-     *                      TableMap::TYPE_COLNAME, TableMap::TYPE_FIELDNAME, TableMap::TYPE_NUM.
+     *                     TableMap::TYPE_COLNAME, TableMap::TYPE_FIELDNAME, TableMap::TYPE_NUM.
-     *                      Defaults to TableMap::TYPE_PHPNAME.
+     *                     Defaults to TableMap::TYPE_PHPNAME.
-     * @return mixed  Value of field.
+     * @return mixed Value of field.
      */
     public function getByName($name, $type = TableMap::TYPE_PHPNAME)
     {
@@ -995,7 +1006,7 @@ abstract class AttributeTemplate implements ActiveRecordInterface
      * Retrieves a field from the object by Position as specified in the xml schema.
      * Zero-based.
      *
-     * @param  int   $pos position in xml schema
+     * @param      int $pos position in xml schema
      * @return mixed Value of field at $pos
      */
     public function getByPosition($pos)
@@ -1031,12 +1042,12 @@ abstract class AttributeTemplate implements ActiveRecordInterface
      * You can specify the key type of the array by passing one of the class
      * type constants.
      *
-     * @param string  $keyType                (optional) One of the class type constants TableMap::TYPE_PHPNAME, TableMap::TYPE_STUDLYPHPNAME,
+     * @param     string  $keyType (optional) One of the class type constants TableMap::TYPE_PHPNAME, TableMap::TYPE_STUDLYPHPNAME,
-     *                                        TableMap::TYPE_COLNAME, TableMap::TYPE_FIELDNAME, TableMap::TYPE_NUM.
+     *                    TableMap::TYPE_COLNAME, TableMap::TYPE_FIELDNAME, TableMap::TYPE_NUM.
-     *                                        Defaults to TableMap::TYPE_PHPNAME.
+     *                    Defaults to TableMap::TYPE_PHPNAME.
-     * @param boolean $includeLazyLoadColumns (optional) Whether to include lazy loaded columns. Defaults to TRUE.
+     * @param     boolean $includeLazyLoadColumns (optional) Whether to include lazy loaded columns. Defaults to TRUE.
-     * @param array   $alreadyDumpedObjects   List of objects to skip to avoid recursion
+     * @param     array $alreadyDumpedObjects List of objects to skip to avoid recursion
-     * @param boolean $includeForeignObjects  (optional) Whether to include hydrated related objects. Default to FALSE.
+     * @param     boolean $includeForeignObjects (optional) Whether to include hydrated related objects. Default to FALSE.
      *
      * @return array an associative array containing the field names (as keys) and field values
      */
@@ -1075,12 +1086,12 @@ abstract class AttributeTemplate implements ActiveRecordInterface
     /**
      * Sets a field from the object by name passed in as a string.
      *
-     * @param  string $name
+     * @param      string $name
-     * @param  mixed  $value field value
+     * @param      mixed  $value field value
-     * @param  string $type  The type of fieldname the $name is of:
+     * @param      string $type The type of fieldname the $name is of:
-     *                       one of the class type constants TableMap::TYPE_PHPNAME, TableMap::TYPE_STUDLYPHPNAME
+     *                     one of the class type constants TableMap::TYPE_PHPNAME, TableMap::TYPE_STUDLYPHPNAME
-     *                       TableMap::TYPE_COLNAME, TableMap::TYPE_FIELDNAME, TableMap::TYPE_NUM.
+     *                     TableMap::TYPE_COLNAME, TableMap::TYPE_FIELDNAME, TableMap::TYPE_NUM.
-     *                       Defaults to TableMap::TYPE_PHPNAME.
+     *                     Defaults to TableMap::TYPE_PHPNAME.
      * @return void
      */
     public function setByName($name, $value, $type = TableMap::TYPE_PHPNAME)
@@ -1094,8 +1105,8 @@ abstract class AttributeTemplate implements ActiveRecordInterface
      * Sets a field from the object by Position as specified in the xml schema.
      * Zero-based.
      *
-     * @param  int   $pos   position in xml schema
+     * @param      int $pos position in xml schema
-     * @param  mixed $value field value
+     * @param      mixed $value field value
      * @return void
      */
     public function setByPosition($pos, $value)
@@ -1135,8 +1146,8 @@ abstract class AttributeTemplate implements ActiveRecordInterface
      * TableMap::TYPE_COLNAME, TableMap::TYPE_FIELDNAME, TableMap::TYPE_NUM.
      * The default key type is the column's TableMap::TYPE_PHPNAME.
      *
-     * @param  array  $arr     An array to populate the object from.
+     * @param      array  $arr     An array to populate the object from.
-     * @param  string $keyType The type of keys the array uses.
+     * @param      string $keyType The type of keys the array uses.
      * @return void
      */
     public function fromArray($arr, $keyType = TableMap::TYPE_PHPNAME)
@@ -1166,6 +1177,7 @@ abstract class AttributeTemplate implements ActiveRecordInterface
         if ($this->isColumnModified(AttributeTemplateTableMap::POSITION)) $criteria->add(AttributeTemplateTableMap::POSITION, $this->position);
         if ($this->isColumnModified(AttributeTemplateTableMap::CREATED_AT)) $criteria->add(AttributeTemplateTableMap::CREATED_AT, $this->created_at);
         if ($this->isColumnModified(AttributeTemplateTableMap::UPDATED_AT)) $criteria->add(AttributeTemplateTableMap::UPDATED_AT, $this->updated_at);
+
         return $criteria;
     }
 
@@ -1187,7 +1199,7 @@ abstract class AttributeTemplate implements ActiveRecordInterface
 
     /**
      * Returns the primary key for this object (row).
-     * @return int
+     * @return   int
      */
     public function getPrimaryKey()
     {
@@ -1197,7 +1209,7 @@ abstract class AttributeTemplate implements ActiveRecordInterface
     /**
      * Generic method to set the primary key (id column).
      *
-     * @param  int  $key Primary key.
+     * @param       int $key Primary key.
      * @return void
      */
     public function setPrimaryKey($key)
@@ -1211,6 +1223,7 @@ abstract class AttributeTemplate implements ActiveRecordInterface
      */
     public function isPrimaryKeyNull()
     {
+
         return null === $this->getId();
     }
 
@@ -1220,9 +1233,9 @@ abstract class AttributeTemplate implements ActiveRecordInterface
      * If desired, this method can also make copies of all associated (fkey referrers)
      * objects.
      *
-     * @param  object          $copyObj  An object of \Thelia\Model\AttributeTemplate (or compatible) type.
+     * @param      object $copyObj An object of \Thelia\Model\AttributeTemplate (or compatible) type.
-     * @param  boolean         $deepCopy Whether to also copy all rows that refer (by fkey) to the current row.
+     * @param      boolean $deepCopy Whether to also copy all rows that refer (by fkey) to the current row.
-     * @param  boolean         $makeNew  Whether to reset autoincrement PKs and make the object new.
+     * @param      boolean $makeNew Whether to reset autoincrement PKs and make the object new.
      * @throws PropelException
      */
     public function copyInto($copyObj, $deepCopy = false, $makeNew = true)
@@ -1246,8 +1259,8 @@ abstract class AttributeTemplate implements ActiveRecordInterface
      * If desired, this method can also make copies of all associated (fkey referrers)
      * objects.
      *
-     * @param  boolean                         $deepCopy Whether to also copy all rows that refer (by fkey) to the current row.
+     * @param      boolean $deepCopy Whether to also copy all rows that refer (by fkey) to the current row.
-     * @return \Thelia\Model\AttributeTemplate Clone of current object.
+     * @return                 \Thelia\Model\AttributeTemplate Clone of current object.
      * @throws PropelException
      */
     public function copy($deepCopy = false)
@@ -1263,8 +1276,8 @@ abstract class AttributeTemplate implements ActiveRecordInterface
     /**
      * Declares an association between this object and a ChildAttribute object.
      *
-     * @param  ChildAttribute                  $v
+     * @param                  ChildAttribute $v
-     * @return \Thelia\Model\AttributeTemplate The current object (for fluent API support)
+     * @return                 \Thelia\Model\AttributeTemplate The current object (for fluent API support)
      * @throws PropelException
      */
     public function setAttribute(ChildAttribute $v = null)
@@ -1283,6 +1296,7 @@ abstract class AttributeTemplate implements ActiveRecordInterface
             $v->addAttributeTemplate($this);
         }
 
+
         return $this;
     }
 
@@ -1290,8 +1304,8 @@ abstract class AttributeTemplate implements ActiveRecordInterface
     /**
      * Get the associated ChildAttribute object
      *
-     * @param  ConnectionInterface $con Optional Connection object.
+     * @param      ConnectionInterface $con Optional Connection object.
-     * @return ChildAttribute      The associated ChildAttribute object.
+     * @return                 ChildAttribute The associated ChildAttribute object.
      * @throws PropelException
      */
     public function getAttribute(ConnectionInterface $con = null)
@@ -1313,8 +1327,8 @@ abstract class AttributeTemplate implements ActiveRecordInterface
     /**
      * Declares an association between this object and a ChildTemplate object.
      *
-     * @param  ChildTemplate                   $v
+     * @param                  ChildTemplate $v
-     * @return \Thelia\Model\AttributeTemplate The current object (for fluent API support)
+     * @return                 \Thelia\Model\AttributeTemplate The current object (for fluent API support)
      * @throws PropelException
      */
     public function setTemplate(ChildTemplate $v = null)
@@ -1333,6 +1347,7 @@ abstract class AttributeTemplate implements ActiveRecordInterface
             $v->addAttributeTemplate($this);
         }
 
+
         return $this;
     }
 
@@ -1340,8 +1355,8 @@ abstract class AttributeTemplate implements ActiveRecordInterface
     /**
      * Get the associated ChildTemplate object
      *
-     * @param  ConnectionInterface $con Optional Connection object.
+     * @param      ConnectionInterface $con Optional Connection object.
-     * @return ChildTemplate       The associated ChildTemplate object.
+     * @return                 ChildTemplate The associated ChildTemplate object.
      * @throws PropelException
      */
     public function getTemplate(ConnectionInterface $con = null)
@@ -1385,7 +1400,7 @@ abstract class AttributeTemplate implements ActiveRecordInterface
      * objects with circular references (even in PHP 5.3). This is currently necessary
      * when using Propel in certain daemon or large-volume/high-memory operations.
      *
-     * @param boolean $deep Whether to also clear the references on all referrer objects.
+     * @param      boolean $deep Whether to also clear the references on all referrer objects.
      */
     public function clearAllReferences($deep = false)
     {
@@ -1411,7 +1426,7 @@ abstract class AttributeTemplate implements ActiveRecordInterface
     /**
      * Mark the current object so that the update date doesn't get updated during next save
      *
-     * @return ChildAttributeTemplate The current object (for fluent API support)
+     * @return     ChildAttributeTemplate The current object (for fluent API support)
      */
     public function keepUpdateDateUnchanged()
     {

core/lib/Thelia/Model/Base/AttributeTemplateQuery.php

@@ -71,9 +71,9 @@ abstract class AttributeTemplateQuery extends ModelCriteria
     /**
      * Initializes internal state of \Thelia\Model\Base\AttributeTemplateQuery object.
      *
-     * @param string $dbName     The database name
+     * @param     string $dbName The database name
-     * @param string $modelName  The phpName of a model, e.g. 'Book'
+     * @param     string $modelName The phpName of a model, e.g. 'Book'
-     * @param string $modelAlias The alias for the model in this query, e.g. 'b'
+     * @param     string $modelAlias The alias for the model in this query, e.g. 'b'
      */
     public function __construct($dbName = 'thelia', $modelName = '\\Thelia\\Model\\AttributeTemplate', $modelAlias = null)
     {
@@ -83,8 +83,8 @@ abstract class AttributeTemplateQuery extends ModelCriteria
     /**
      * Returns a new ChildAttributeTemplateQuery object.
      *
-     * @param string   $modelAlias The alias of a model in the query
+     * @param     string $modelAlias The alias of a model in the query
-     * @param Criteria $criteria   Optional Criteria to build the query from
+     * @param     Criteria $criteria Optional Criteria to build the query from
      *
      * @return ChildAttributeTemplateQuery
      */
@@ -113,7 +113,7 @@ abstract class AttributeTemplateQuery extends ModelCriteria
      * $obj  = $c->findPk(12, $con);
      * </code>
      *
-     * @param mixed               $key Primary key to use for the query
+     * @param mixed $key Primary key to use for the query
      * @param ConnectionInterface $con an optional connection object
      *
      * @return ChildAttributeTemplate|array|mixed the result, formatted by the current formatter
@@ -144,10 +144,10 @@ abstract class AttributeTemplateQuery extends ModelCriteria
      * Find object by primary key using raw SQL to go fast.
      * Bypass doSelect() and the object formatter by using generated code.
      *
-     * @param mixed               $key Primary key to use for the query
+     * @param     mixed $key Primary key to use for the query
-     * @param ConnectionInterface $con A connection object
+     * @param     ConnectionInterface $con A connection object
      *
-     * @return ChildAttributeTemplate A model object, or null if the key is not found
+     * @return   ChildAttributeTemplate A model object, or null if the key is not found
      */
     protected function findPkSimple($key, $con)
     {
@@ -174,8 +174,8 @@ abstract class AttributeTemplateQuery extends ModelCriteria
     /**
      * Find object by primary key.
      *
-     * @param mixed               $key Primary key to use for the query
+     * @param     mixed $key Primary key to use for the query
-     * @param ConnectionInterface $con A connection object
+     * @param     ConnectionInterface $con A connection object
      *
      * @return ChildAttributeTemplate|array|mixed the result, formatted by the current formatter
      */
@@ -195,8 +195,8 @@ abstract class AttributeTemplateQuery extends ModelCriteria
      * <code>
      * $objs = $c->findPks(array(12, 56, 832), $con);
      * </code>
-     * @param array               $keys Primary keys to use for the query
+     * @param     array $keys Primary keys to use for the query
-     * @param ConnectionInterface $con  an optional connection object
+     * @param     ConnectionInterface $con an optional connection object
      *
      * @return ObjectCollection|array|mixed the list of results, formatted by the current formatter
      */
@@ -217,24 +217,26 @@ abstract class AttributeTemplateQuery extends ModelCriteria
     /**
      * Filter the query by primary key
      *
-     * @param mixed $key Primary key to use for the query
+     * @param     mixed $key Primary key to use for the query
      *
      * @return ChildAttributeTemplateQuery The current query, for fluid interface
      */
     public function filterByPrimaryKey($key)
     {
+
         return $this->addUsingAlias(AttributeTemplateTableMap::ID, $key, Criteria::EQUAL);
     }
 
     /**
      * Filter the query by a list of primary keys
      *
-     * @param array $keys The list of primary key to use for the query
+     * @param     array $keys The list of primary key to use for the query
      *
      * @return ChildAttributeTemplateQuery The current query, for fluid interface
      */
     public function filterByPrimaryKeys($keys)
     {
+
         return $this->addUsingAlias(AttributeTemplateTableMap::ID, $keys, Criteria::IN);
     }
 
@@ -248,11 +250,11 @@ abstract class AttributeTemplateQuery extends ModelCriteria
      * $query->filterById(array('min' => 12)); // WHERE id > 12
      * </code>
      *
-     * @param mixed  $id         The value to use as filter.
+     * @param     mixed $id The value to use as filter.
-     *                           Use scalar values for equality.
+     *              Use scalar values for equality.
-     *                           Use array values for in_array() equivalent.
+     *              Use array values for in_array() equivalent.
-     *                           Use associative array('min' => $minValue, 'max' => $maxValue) for intervals.
+     *              Use associative array('min' => $minValue, 'max' => $maxValue) for intervals.
-     * @param string $comparison Operator to use for the column comparison, defaults to Criteria::EQUAL
+     * @param     string $comparison Operator to use for the column comparison, defaults to Criteria::EQUAL
      *
      * @return ChildAttributeTemplateQuery The current query, for fluid interface
      */
@@ -291,11 +293,11 @@ abstract class AttributeTemplateQuery extends ModelCriteria
      *
      * @see       filterByAttribute()
      *
-     * @param mixed  $attributeId The value to use as filter.
+     * @param     mixed $attributeId The value to use as filter.
-     *                            Use scalar values for equality.
+     *              Use scalar values for equality.
-     *                            Use array values for in_array() equivalent.
+     *              Use array values for in_array() equivalent.
-     *                            Use associative array('min' => $minValue, 'max' => $maxValue) for intervals.
+     *              Use associative array('min' => $minValue, 'max' => $maxValue) for intervals.
-     * @param string $comparison  Operator to use for the column comparison, defaults to Criteria::EQUAL
+     * @param     string $comparison Operator to use for the column comparison, defaults to Criteria::EQUAL
      *
      * @return ChildAttributeTemplateQuery The current query, for fluid interface
      */
@@ -334,11 +336,11 @@ abstract class AttributeTemplateQuery extends ModelCriteria
      *
      * @see       filterByTemplate()
      *
-     * @param mixed  $templateId The value to use as filter.
+     * @param     mixed $templateId The value to use as filter.
-     *                           Use scalar values for equality.
+     *              Use scalar values for equality.
-     *                           Use array values for in_array() equivalent.
+     *              Use array values for in_array() equivalent.
-     *                           Use associative array('min' => $minValue, 'max' => $maxValue) for intervals.
+     *              Use associative array('min' => $minValue, 'max' => $maxValue) for intervals.
-     * @param string $comparison Operator to use for the column comparison, defaults to Criteria::EQUAL
+     * @param     string $comparison Operator to use for the column comparison, defaults to Criteria::EQUAL
      *
      * @return ChildAttributeTemplateQuery The current query, for fluid interface
      */
@@ -375,11 +377,11 @@ abstract class AttributeTemplateQuery extends ModelCriteria
      * $query->filterByPosition(array('min' => 12)); // WHERE position > 12
      * </code>
      *
-     * @param mixed  $position   The value to use as filter.
+     * @param     mixed $position The value to use as filter.
-     *                           Use scalar values for equality.
+     *              Use scalar values for equality.
-     *                           Use array values for in_array() equivalent.
+     *              Use array values for in_array() equivalent.
-     *                           Use associative array('min' => $minValue, 'max' => $maxValue) for intervals.
+     *              Use associative array('min' => $minValue, 'max' => $maxValue) for intervals.
-     * @param string $comparison Operator to use for the column comparison, defaults to Criteria::EQUAL
+     * @param     string $comparison Operator to use for the column comparison, defaults to Criteria::EQUAL
      *
      * @return ChildAttributeTemplateQuery The current query, for fluid interface
      */
@@ -416,13 +418,13 @@ abstract class AttributeTemplateQuery extends ModelCriteria
      * $query->filterByCreatedAt(array('max' => 'yesterday')); // WHERE created_at > '2011-03-13'
      * </code>
      *
-     * @param mixed  $createdAt  The value to use as filter.
+     * @param     mixed $createdAt The value to use as filter.
-     *                           Values can be integers (unix timestamps), DateTime objects, or strings.
+     *              Values can be integers (unix timestamps), DateTime objects, or strings.
-     *                           Empty strings are treated as NULL.
+     *              Empty strings are treated as NULL.
-     *                           Use scalar values for equality.
+     *              Use scalar values for equality.
-     *                           Use array values for in_array() equivalent.
+     *              Use array values for in_array() equivalent.
-     *                           Use associative array('min' => $minValue, 'max' => $maxValue) for intervals.
+     *              Use associative array('min' => $minValue, 'max' => $maxValue) for intervals.
-     * @param string $comparison Operator to use for the column comparison, defaults to Criteria::EQUAL
+     * @param     string $comparison Operator to use for the column comparison, defaults to Criteria::EQUAL
      *
      * @return ChildAttributeTemplateQuery The current query, for fluid interface
      */
@@ -459,13 +461,13 @@ abstract class AttributeTemplateQuery extends ModelCriteria
      * $query->filterByUpdatedAt(array('max' => 'yesterday')); // WHERE updated_at > '2011-03-13'
      * </code>
      *
-     * @param mixed  $updatedAt  The value to use as filter.
+     * @param     mixed $updatedAt The value to use as filter.
-     *                           Values can be integers (unix timestamps), DateTime objects, or strings.
+     *              Values can be integers (unix timestamps), DateTime objects, or strings.
-     *                           Empty strings are treated as NULL.
+     *              Empty strings are treated as NULL.
-     *                           Use scalar values for equality.
+     *              Use scalar values for equality.
-     *                           Use array values for in_array() equivalent.
+     *              Use array values for in_array() equivalent.
-     *                           Use associative array('min' => $minValue, 'max' => $maxValue) for intervals.
+     *              Use associative array('min' => $minValue, 'max' => $maxValue) for intervals.
-     * @param string $comparison Operator to use for the column comparison, defaults to Criteria::EQUAL
+     * @param     string $comparison Operator to use for the column comparison, defaults to Criteria::EQUAL
      *
      * @return ChildAttributeTemplateQuery The current query, for fluid interface
      */
@@ -495,8 +497,8 @@ abstract class AttributeTemplateQuery extends ModelCriteria
     /**
      * Filter the query by a related \Thelia\Model\Attribute object
      *
-     * @param \Thelia\Model\Attribute|ObjectCollection $attribute  The related object(s) to use as filter
+     * @param \Thelia\Model\Attribute|ObjectCollection $attribute The related object(s) to use as filter
-     * @param string                                   $comparison Operator to use for the column comparison, defaults to Criteria::EQUAL
+     * @param string $comparison Operator to use for the column comparison, defaults to Criteria::EQUAL
      *
      * @return ChildAttributeTemplateQuery The current query, for fluid interface
      */
@@ -520,8 +522,8 @@ abstract class AttributeTemplateQuery extends ModelCriteria
     /**
      * Adds a JOIN clause to the query using the Attribute relation
      *
-     * @param string $relationAlias optional alias for the relation
+     * @param     string $relationAlias optional alias for the relation
-     * @param string $joinType      Accepted values are null, 'left join', 'right join', 'inner join'
+     * @param     string $joinType Accepted values are null, 'left join', 'right join', 'inner join'
      *
      * @return ChildAttributeTemplateQuery The current query, for fluid interface
      */
@@ -554,11 +556,11 @@ abstract class AttributeTemplateQuery extends ModelCriteria
      *
      * @see useQuery()
      *
-     * @param string $relationAlias optional alias for the relation,
+     * @param     string $relationAlias optional alias for the relation,
-     *                              to be used as main alias in the secondary query
+     *                                   to be used as main alias in the secondary query
-     * @param string $joinType      Accepted values are null, 'left join', 'right join', 'inner join'
+     * @param     string $joinType Accepted values are null, 'left join', 'right join', 'inner join'
      *
-     * @return \Thelia\Model\AttributeQuery A secondary query class using the current class as primary query
+     * @return   \Thelia\Model\AttributeQuery A secondary query class using the current class as primary query
      */
     public function useAttributeQuery($relationAlias = null, $joinType = Criteria::INNER_JOIN)
     {
@@ -570,8 +572,8 @@ abstract class AttributeTemplateQuery extends ModelCriteria
     /**
      * Filter the query by a related \Thelia\Model\Template object
      *
-     * @param \Thelia\Model\Template|ObjectCollection $template   The related object(s) to use as filter
+     * @param \Thelia\Model\Template|ObjectCollection $template The related object(s) to use as filter
-     * @param string                                  $comparison Operator to use for the column comparison, defaults to Criteria::EQUAL
+     * @param string $comparison Operator to use for the column comparison, defaults to Criteria::EQUAL
      *
      * @return ChildAttributeTemplateQuery The current query, for fluid interface
      */
@@ -595,8 +597,8 @@ abstract class AttributeTemplateQuery extends ModelCriteria
     /**
      * Adds a JOIN clause to the query using the Template relation
      *
-     * @param string $relationAlias optional alias for the relation
+     * @param     string $relationAlias optional alias for the relation
-     * @param string $joinType      Accepted values are null, 'left join', 'right join', 'inner join'
+     * @param     string $joinType Accepted values are null, 'left join', 'right join', 'inner join'
      *
      * @return ChildAttributeTemplateQuery The current query, for fluid interface
      */
@@ -629,11 +631,11 @@ abstract class AttributeTemplateQuery extends ModelCriteria
      *
      * @see useQuery()
      *
-     * @param string $relationAlias optional alias for the relation,
+     * @param     string $relationAlias optional alias for the relation,
-     *                              to be used as main alias in the secondary query
+     *                                   to be used as main alias in the secondary query
-     * @param string $joinType      Accepted values are null, 'left join', 'right join', 'inner join'
+     * @param     string $joinType Accepted values are null, 'left join', 'right join', 'inner join'
      *
-     * @return \Thelia\Model\TemplateQuery A secondary query class using the current class as primary query
+     * @return   \Thelia\Model\TemplateQuery A secondary query class using the current class as primary query
      */
     public function useTemplateQuery($relationAlias = null, $joinType = Criteria::INNER_JOIN)
     {
@@ -645,7 +647,7 @@ abstract class AttributeTemplateQuery extends ModelCriteria
     /**
      * Exclude object from result
      *
-     * @param ChildAttributeTemplate $attributeTemplate Object to remove from the list of results
+     * @param   ChildAttributeTemplate $attributeTemplate Object to remove from the list of results
      *
      * @return ChildAttributeTemplateQuery The current query, for fluid interface
      */
@@ -661,8 +663,8 @@ abstract class AttributeTemplateQuery extends ModelCriteria
     /**
      * Deletes all rows from the attribute_template table.
      *
-     * @param  ConnectionInterface $con the connection to use
+     * @param ConnectionInterface $con the connection to use
-     * @return int                 The number of affected rows (if supported by underlying database driver).
+     * @return int The number of affected rows (if supported by underlying database driver).
      */
     public function doDeleteAll(ConnectionInterface $con = null)
     {
@@ -693,13 +695,13 @@ abstract class AttributeTemplateQuery extends ModelCriteria
     /**
      * Performs a DELETE on the database, given a ChildAttributeTemplate or Criteria object OR a primary key value.
      *
-     * @param  mixed               $values Criteria or ChildAttributeTemplate object or primary key or array of primary keys
+     * @param mixed               $values Criteria or ChildAttributeTemplate object or primary key or array of primary keys
-     *                                     which is used to create the DELETE statement
+     *              which is used to create the DELETE statement
-     * @param  ConnectionInterface $con    the connection to use
+     * @param ConnectionInterface $con the connection to use
-     * @return int                 The number of affected rows (if supported by underlying database driver).  This includes CASCADE-related rows
+     * @return int The number of affected rows (if supported by underlying database driver).  This includes CASCADE-related rows
-     *                                    if supported by native driver or if emulated using Propel.
+     *                if supported by native driver or if emulated using Propel.
-     * @throws PropelException     Any exceptions caught during processing will be
+     * @throws PropelException Any exceptions caught during processing will be
-     *                                    rethrown wrapped into a PropelException.
+     *         rethrown wrapped into a PropelException.
      */
      public function delete(ConnectionInterface $con = null)
      {
@@ -719,6 +721,7 @@ abstract class AttributeTemplateQuery extends ModelCriteria
             // for more than one table or we could emulating ON DELETE CASCADE, etc.
             $con->beginTransaction();
 
+
         AttributeTemplateTableMap::removeInstanceFromPool($criteria);
 
             $affectedRows += ModelCriteria::delete($con);
@@ -737,9 +740,9 @@ abstract class AttributeTemplateQuery extends ModelCriteria
     /**
      * Filter by the latest updated
      *
-     * @param int $nbDays Maximum age of the latest update in days
+     * @param      int $nbDays Maximum age of the latest update in days
      *
-     * @return ChildAttributeTemplateQuery The current query, for fluid interface
+     * @return     ChildAttributeTemplateQuery The current query, for fluid interface
      */
     public function recentlyUpdated($nbDays = 7)
     {
@@ -749,9 +752,9 @@ abstract class AttributeTemplateQuery extends ModelCriteria
     /**
      * Filter by the latest created
      *
-     * @param int $nbDays Maximum age of in days
+     * @param      int $nbDays Maximum age of in days
      *
-     * @return ChildAttributeTemplateQuery The current query, for fluid interface
+     * @return     ChildAttributeTemplateQuery The current query, for fluid interface
      */
     public function recentlyCreated($nbDays = 7)
     {
@@ -761,7 +764,7 @@ abstract class AttributeTemplateQuery extends ModelCriteria
     /**
      * Order by update date desc
      *
-     * @return ChildAttributeTemplateQuery The current query, for fluid interface
+     * @return     ChildAttributeTemplateQuery The current query, for fluid interface
      */
     public function lastUpdatedFirst()
     {
@@ -771,7 +774,7 @@ abstract class AttributeTemplateQuery extends ModelCriteria
     /**
      * Order by update date asc
      *
-     * @return ChildAttributeTemplateQuery The current query, for fluid interface
+     * @return     ChildAttributeTemplateQuery The current query, for fluid interface
      */
     public function firstUpdatedFirst()
     {
@@ -781,7 +784,7 @@ abstract class AttributeTemplateQuery extends ModelCriteria
     /**
      * Order by create date desc
      *
-     * @return ChildAttributeTemplateQuery The current query, for fluid interface
+     * @return     ChildAttributeTemplateQuery The current query, for fluid interface
      */
     public function lastCreatedFirst()
     {
@@ -791,7 +794,7 @@ abstract class AttributeTemplateQuery extends ModelCriteria
     /**
      * Order by create date asc
      *
-     * @return ChildAttributeTemplateQuery The current query, for fluid interface
+     * @return     ChildAttributeTemplateQuery The current query, for fluid interface
      */
     public function firstCreatedFirst()
     {

core/lib/Thelia/Model/Base/Cart.php

@@ -36,6 +36,7 @@ abstract class Cart implements ActiveRecordInterface
      */
     const TABLE_MAP = '\\Thelia\\Model\\Map\\CartTableMap';
 
+
     /**
      * attribute to determine if this object has previously been saved.
      * @var boolean
@@ -379,9 +380,9 @@ abstract class Cart implements ActiveRecordInterface
      * $book->importFrom('JSON', '{"Id":9012,"Title":"Don Juan","ISBN":"0140422161","Price":12.99,"PublisherId":1234,"AuthorId":5678}');
      * </code>
      *
-     * @param mixed  $parser A AbstractParser instance,
+     * @param mixed $parser A AbstractParser instance,
      *                       or a format name ('XML', 'YAML', 'JSON', 'CSV')
-     * @param string $data   The source data to import from
+     * @param string $data The source data to import from
      *
      * @return Cart The current object, for fluid interface
      */
@@ -431,70 +432,77 @@ abstract class Cart implements ActiveRecordInterface
     /**
      * Get the [id] column value.
      *
-     * @return int
+     * @return   int
      */
     public function getId()
     {
+
         return $this->id;
     }
 
     /**
      * Get the [token] column value.
      *
-     * @return string
+     * @return   string
      */
     public function getToken()
     {
+
         return $this->token;
     }
 
     /**
      * Get the [customer_id] column value.
      *
-     * @return int
+     * @return   int
      */
     public function getCustomerId()
     {
+
         return $this->customer_id;
     }
 
     /**
      * Get the [address_delivery_id] column value.
      *
-     * @return int
+     * @return   int
      */
     public function getAddressDeliveryId()
     {
+
         return $this->address_delivery_id;
     }
 
     /**
      * Get the [address_invoice_id] column value.
      *
-     * @return int
+     * @return   int
      */
     public function getAddressInvoiceId()
     {
+
         return $this->address_invoice_id;
     }
 
     /**
      * Get the [currency_id] column value.
      *
-     * @return int
+     * @return   int
      */
     public function getCurrencyId()
     {
+
         return $this->currency_id;
     }
 
     /**
      * Get the [discount] column value.
      *
-     * @return double
+     * @return   double
      */
     public function getDiscount()
     {
+
         return $this->discount;
     }
 
@@ -502,8 +510,8 @@ abstract class Cart implements ActiveRecordInterface
      * Get the [optionally formatted] temporal [created_at] column value.
      *
      *
-     * @param string $format The date/time format string (either date()-style or strftime()-style).
+     * @param      string $format The date/time format string (either date()-style or strftime()-style).
-     *                       If format is NULL, then the raw \DateTime object will be returned.
+     *                            If format is NULL, then the raw \DateTime object will be returned.
      *
      * @return mixed Formatted date/time value as string or \DateTime object (if format is NULL), NULL if column is NULL, and 0 if column value is 0000-00-00 00:00:00
      *
@@ -522,8 +530,8 @@ abstract class Cart implements ActiveRecordInterface
      * Get the [optionally formatted] temporal [updated_at] column value.
      *
      *
-     * @param string $format The date/time format string (either date()-style or strftime()-style).
+     * @param      string $format The date/time format string (either date()-style or strftime()-style).
-     *                       If format is NULL, then the raw \DateTime object will be returned.
+     *                            If format is NULL, then the raw \DateTime object will be returned.
      *
      * @return mixed Formatted date/time value as string or \DateTime object (if format is NULL), NULL if column is NULL, and 0 if column value is 0000-00-00 00:00:00
      *
@@ -541,8 +549,8 @@ abstract class Cart implements ActiveRecordInterface
     /**
      * Set the value of [id] column.
      *
-     * @param  int                $v new value
+     * @param      int $v new value
-     * @return \Thelia\Model\Cart The current object (for fluent API support)
+     * @return   \Thelia\Model\Cart The current object (for fluent API support)
      */
     public function setId($v)
     {
@@ -555,14 +563,15 @@ abstract class Cart implements ActiveRecordInterface
             $this->modifiedColumns[CartTableMap::ID] = true;
         }
 
+
         return $this;
     } // setId()
 
     /**
      * Set the value of [token] column.
      *
-     * @param  string             $v new value
+     * @param      string $v new value
-     * @return \Thelia\Model\Cart The current object (for fluent API support)
+     * @return   \Thelia\Model\Cart The current object (for fluent API support)
      */
     public function setToken($v)
     {
@@ -575,14 +584,15 @@ abstract class Cart implements ActiveRecordInterface
             $this->modifiedColumns[CartTableMap::TOKEN] = true;
         }
 
+
         return $this;
     } // setToken()
 
     /**
      * Set the value of [customer_id] column.
      *
-     * @param  int                $v new value
+     * @param      int $v new value
-     * @return \Thelia\Model\Cart The current object (for fluent API support)
+     * @return   \Thelia\Model\Cart The current object (for fluent API support)
      */
     public function setCustomerId($v)
     {
@@ -599,14 +609,15 @@ abstract class Cart implements ActiveRecordInterface
             $this->aCustomer = null;
         }
 
+
         return $this;
     } // setCustomerId()
 
     /**
      * Set the value of [address_delivery_id] column.
      *
-     * @param  int                $v new value
+     * @param      int $v new value
-     * @return \Thelia\Model\Cart The current object (for fluent API support)
+     * @return   \Thelia\Model\Cart The current object (for fluent API support)
      */
     public function setAddressDeliveryId($v)
     {
@@ -623,14 +634,15 @@ abstract class Cart implements ActiveRecordInterface
             $this->aAddressRelatedByAddressDeliveryId = null;
         }
 
+
         return $this;
     } // setAddressDeliveryId()
 
     /**
      * Set the value of [address_invoice_id] column.
      *
-     * @param  int                $v new value
+     * @param      int $v new value
-     * @return \Thelia\Model\Cart The current object (for fluent API support)
+     * @return   \Thelia\Model\Cart The current object (for fluent API support)
      */
     public function setAddressInvoiceId($v)
     {
@@ -647,14 +659,15 @@ abstract class Cart implements ActiveRecordInterface
             $this->aAddressRelatedByAddressInvoiceId = null;
         }
 
+
         return $this;
     } // setAddressInvoiceId()
 
     /**
      * Set the value of [currency_id] column.
      *
-     * @param  int                $v new value
+     * @param      int $v new value
-     * @return \Thelia\Model\Cart The current object (for fluent API support)
+     * @return   \Thelia\Model\Cart The current object (for fluent API support)
      */
     public function setCurrencyId($v)
     {
@@ -671,14 +684,15 @@ abstract class Cart implements ActiveRecordInterface
             $this->aCurrency = null;
         }
 
+
         return $this;
     } // setCurrencyId()
 
     /**
      * Set the value of [discount] column.
      *
-     * @param  double             $v new value
+     * @param      double $v new value
-     * @return \Thelia\Model\Cart The current object (for fluent API support)
+     * @return   \Thelia\Model\Cart The current object (for fluent API support)
      */
     public function setDiscount($v)
     {
@@ -691,15 +705,16 @@ abstract class Cart implements ActiveRecordInterface
             $this->modifiedColumns[CartTableMap::DISCOUNT] = true;
         }
 
+
         return $this;
     } // setDiscount()
 
     /**
      * Sets the value of [created_at] column to a normalized version of the date/time value specified.
      *
-     * @param  mixed              $v string, integer (timestamp), or \DateTime value.
+     * @param      mixed $v string, integer (timestamp), or \DateTime value.
-     *                               Empty strings are treated as NULL.
+     *               Empty strings are treated as NULL.
-     * @return \Thelia\Model\Cart The current object (for fluent API support)
+     * @return   \Thelia\Model\Cart The current object (for fluent API support)
      */
     public function setCreatedAt($v)
     {
@@ -711,15 +726,16 @@ abstract class Cart implements ActiveRecordInterface
             }
         } // if either are not null
 
+
         return $this;
     } // setCreatedAt()
 
     /**
      * Sets the value of [updated_at] column to a normalized version of the date/time value specified.
      *
-     * @param  mixed              $v string, integer (timestamp), or \DateTime value.
+     * @param      mixed $v string, integer (timestamp), or \DateTime value.
-     *                               Empty strings are treated as NULL.
+     *               Empty strings are treated as NULL.
-     * @return \Thelia\Model\Cart The current object (for fluent API support)
+     * @return   \Thelia\Model\Cart The current object (for fluent API support)
      */
     public function setUpdatedAt($v)
     {
@@ -731,6 +747,7 @@ abstract class Cart implements ActiveRecordInterface
             }
         } // if either are not null
 
+
         return $this;
     } // setUpdatedAt()
 
@@ -774,6 +791,7 @@ abstract class Cart implements ActiveRecordInterface
     {
         try {
 
+
             $col = $row[TableMap::TYPE_NUM == $indexType ? 0 + $startcol : CartTableMap::translateFieldName('Id', TableMap::TYPE_PHPNAME, $indexType)];
             $this->id = (null !== $col) ? (int) $col : null;
 
@@ -855,10 +873,10 @@ abstract class Cart implements ActiveRecordInterface
      *
      * This will only work if the object has been saved and has a valid primary key set.
      *
-     * @param  boolean             $deep (optional) Whether to also de-associated any related objects.
+     * @param      boolean $deep (optional) Whether to also de-associated any related objects.
-     * @param  ConnectionInterface $con  (optional) The ConnectionInterface connection to use.
+     * @param      ConnectionInterface $con (optional) The ConnectionInterface connection to use.
      * @return void
-     * @throws PropelException     - if this object is deleted, unsaved or doesn't have pk match in db
+     * @throws PropelException - if this object is deleted, unsaved or doesn't have pk match in db
      */
     public function reload($deep = false, ConnectionInterface $con = null)
     {
@@ -899,7 +917,7 @@ abstract class Cart implements ActiveRecordInterface
     /**
      * Removes this object from datastore and sets delete attribute.
      *
-     * @param  ConnectionInterface $con
+     * @param      ConnectionInterface $con
      * @return void
      * @throws PropelException
      * @see Cart::setDeleted()
@@ -942,8 +960,8 @@ abstract class Cart implements ActiveRecordInterface
      * method.  This method wraps all precipitate database operations in a
      * single transaction.
      *
-     * @param  ConnectionInterface $con
+     * @param      ConnectionInterface $con
-     * @return int                 The number of rows affected by this insert/update and any referring fk objects' save() operations.
+     * @return int             The number of rows affected by this insert/update and any referring fk objects' save() operations.
      * @throws PropelException
      * @see doSave()
      */
@@ -1004,8 +1022,8 @@ abstract class Cart implements ActiveRecordInterface
      * If the object is new, it inserts it; otherwise an update is performed.
      * All related objects are also updated in this method.
      *
-     * @param  ConnectionInterface $con
+     * @param      ConnectionInterface $con
-     * @return int                 The number of rows affected by this insert/update and any referring fk objects' save() operations.
+     * @return int             The number of rows affected by this insert/update and any referring fk objects' save() operations.
      * @throws PropelException
      * @see save()
      */
@@ -1086,7 +1104,7 @@ abstract class Cart implements ActiveRecordInterface
     /**
      * Insert the row in the database.
      *
-     * @param ConnectionInterface $con
+     * @param      ConnectionInterface $con
      *
      * @throws PropelException
      * @see doSave()
@@ -1188,7 +1206,7 @@ abstract class Cart implements ActiveRecordInterface
     /**
      * Update the row in the database.
      *
-     * @param ConnectionInterface $con
+     * @param      ConnectionInterface $con
      *
      * @return Integer Number of updated rows
      * @see doSave()
@@ -1204,12 +1222,12 @@ abstract class Cart implements ActiveRecordInterface
     /**
      * Retrieves a field from the object by name passed in as a string.
      *
-     * @param  string $name name
+     * @param      string $name name
-     * @param  string $type The type of fieldname the $name is of:
+     * @param      string $type The type of fieldname the $name is of:
-     *                      one of the class type constants TableMap::TYPE_PHPNAME, TableMap::TYPE_STUDLYPHPNAME
+     *                     one of the class type constants TableMap::TYPE_PHPNAME, TableMap::TYPE_STUDLYPHPNAME
-     *                      TableMap::TYPE_COLNAME, TableMap::TYPE_FIELDNAME, TableMap::TYPE_NUM.
+     *                     TableMap::TYPE_COLNAME, TableMap::TYPE_FIELDNAME, TableMap::TYPE_NUM.
-     *                      Defaults to TableMap::TYPE_PHPNAME.
+     *                     Defaults to TableMap::TYPE_PHPNAME.
-     * @return mixed  Value of field.
+     * @return mixed Value of field.
      */
     public function getByName($name, $type = TableMap::TYPE_PHPNAME)
     {
@@ -1223,7 +1241,7 @@ abstract class Cart implements ActiveRecordInterface
      * Retrieves a field from the object by Position as specified in the xml schema.
      * Zero-based.
      *
-     * @param  int   $pos position in xml schema
+     * @param      int $pos position in xml schema
      * @return mixed Value of field at $pos
      */
     public function getByPosition($pos)
@@ -1268,12 +1286,12 @@ abstract class Cart implements ActiveRecordInterface
      * You can specify the key type of the array by passing one of the class
      * type constants.
      *
-     * @param string  $keyType                (optional) One of the class type constants TableMap::TYPE_PHPNAME, TableMap::TYPE_STUDLYPHPNAME,
+     * @param     string  $keyType (optional) One of the class type constants TableMap::TYPE_PHPNAME, TableMap::TYPE_STUDLYPHPNAME,
-     *                                        TableMap::TYPE_COLNAME, TableMap::TYPE_FIELDNAME, TableMap::TYPE_NUM.
+     *                    TableMap::TYPE_COLNAME, TableMap::TYPE_FIELDNAME, TableMap::TYPE_NUM.
-     *                                        Defaults to TableMap::TYPE_PHPNAME.
+     *                    Defaults to TableMap::TYPE_PHPNAME.
-     * @param boolean $includeLazyLoadColumns (optional) Whether to include lazy loaded columns. Defaults to TRUE.
+     * @param     boolean $includeLazyLoadColumns (optional) Whether to include lazy loaded columns. Defaults to TRUE.
-     * @param array   $alreadyDumpedObjects   List of objects to skip to avoid recursion
+     * @param     array $alreadyDumpedObjects List of objects to skip to avoid recursion
-     * @param boolean $includeForeignObjects  (optional) Whether to include hydrated related objects. Default to FALSE.
+     * @param     boolean $includeForeignObjects (optional) Whether to include hydrated related objects. Default to FALSE.
      *
      * @return array an associative array containing the field names (as keys) and field values
      */
@@ -1324,12 +1342,12 @@ abstract class Cart implements ActiveRecordInterface
     /**
      * Sets a field from the object by name passed in as a string.
      *
-     * @param  string $name
+     * @param      string $name
-     * @param  mixed  $value field value
+     * @param      mixed  $value field value
-     * @param  string $type  The type of fieldname the $name is of:
+     * @param      string $type The type of fieldname the $name is of:
-     *                       one of the class type constants TableMap::TYPE_PHPNAME, TableMap::TYPE_STUDLYPHPNAME
+     *                     one of the class type constants TableMap::TYPE_PHPNAME, TableMap::TYPE_STUDLYPHPNAME
-     *                       TableMap::TYPE_COLNAME, TableMap::TYPE_FIELDNAME, TableMap::TYPE_NUM.
+     *                     TableMap::TYPE_COLNAME, TableMap::TYPE_FIELDNAME, TableMap::TYPE_NUM.
-     *                       Defaults to TableMap::TYPE_PHPNAME.
+     *                     Defaults to TableMap::TYPE_PHPNAME.
      * @return void
      */
     public function setByName($name, $value, $type = TableMap::TYPE_PHPNAME)
@@ -1343,8 +1361,8 @@ abstract class Cart implements ActiveRecordInterface
      * Sets a field from the object by Position as specified in the xml schema.
      * Zero-based.
      *
-     * @param  int   $pos   position in xml schema
+     * @param      int $pos position in xml schema
-     * @param  mixed $value field value
+     * @param      mixed $value field value
      * @return void
      */
     public function setByPosition($pos, $value)
@@ -1393,8 +1411,8 @@ abstract class Cart implements ActiveRecordInterface
      * TableMap::TYPE_COLNAME, TableMap::TYPE_FIELDNAME, TableMap::TYPE_NUM.
      * The default key type is the column's TableMap::TYPE_PHPNAME.
      *
-     * @param  array  $arr     An array to populate the object from.
+     * @param      array  $arr     An array to populate the object from.
-     * @param  string $keyType The type of keys the array uses.
+     * @param      string $keyType The type of keys the array uses.
      * @return void
      */
     public function fromArray($arr, $keyType = TableMap::TYPE_PHPNAME)
@@ -1430,6 +1448,7 @@ abstract class Cart implements ActiveRecordInterface
         if ($this->isColumnModified(CartTableMap::DISCOUNT)) $criteria->add(CartTableMap::DISCOUNT, $this->discount);
         if ($this->isColumnModified(CartTableMap::CREATED_AT)) $criteria->add(CartTableMap::CREATED_AT, $this->created_at);
         if ($this->isColumnModified(CartTableMap::UPDATED_AT)) $criteria->add(CartTableMap::UPDATED_AT, $this->updated_at);
+
         return $criteria;
     }
 
@@ -1451,7 +1470,7 @@ abstract class Cart implements ActiveRecordInterface
 
     /**
      * Returns the primary key for this object (row).
-     * @return int
+     * @return   int
      */
     public function getPrimaryKey()
     {
@@ -1461,7 +1480,7 @@ abstract class Cart implements ActiveRecordInterface
     /**
      * Generic method to set the primary key (id column).
      *
-     * @param  int  $key Primary key.
+     * @param       int $key Primary key.
      * @return void
      */
     public function setPrimaryKey($key)
@@ -1475,6 +1494,7 @@ abstract class Cart implements ActiveRecordInterface
      */
     public function isPrimaryKeyNull()
     {
+
         return null === $this->getId();
     }
 
@@ -1484,9 +1504,9 @@ abstract class Cart implements ActiveRecordInterface
      * If desired, this method can also make copies of all associated (fkey referrers)
      * objects.
      *
-     * @param  object          $copyObj  An object of \Thelia\Model\Cart (or compatible) type.
+     * @param      object $copyObj An object of \Thelia\Model\Cart (or compatible) type.
-     * @param  boolean         $deepCopy Whether to also copy all rows that refer (by fkey) to the current row.
+     * @param      boolean $deepCopy Whether to also copy all rows that refer (by fkey) to the current row.
-     * @param  boolean         $makeNew  Whether to reset autoincrement PKs and make the object new.
+     * @param      boolean $makeNew Whether to reset autoincrement PKs and make the object new.
      * @throws PropelException
      */
     public function copyInto($copyObj, $deepCopy = false, $makeNew = true)
@@ -1527,8 +1547,8 @@ abstract class Cart implements ActiveRecordInterface
      * If desired, this method can also make copies of all associated (fkey referrers)
      * objects.
      *
-     * @param  boolean            $deepCopy Whether to also copy all rows that refer (by fkey) to the current row.
+     * @param      boolean $deepCopy Whether to also copy all rows that refer (by fkey) to the current row.
-     * @return \Thelia\Model\Cart Clone of current object.
+     * @return                 \Thelia\Model\Cart Clone of current object.
      * @throws PropelException
      */
     public function copy($deepCopy = false)
@@ -1544,8 +1564,8 @@ abstract class Cart implements ActiveRecordInterface
     /**
      * Declares an association between this object and a ChildCustomer object.
      *
-     * @param  ChildCustomer      $v
+     * @param                  ChildCustomer $v
-     * @return \Thelia\Model\Cart The current object (for fluent API support)
+     * @return                 \Thelia\Model\Cart The current object (for fluent API support)
      * @throws PropelException
      */
     public function setCustomer(ChildCustomer $v = null)
@@ -1564,6 +1584,7 @@ abstract class Cart implements ActiveRecordInterface
             $v->addCart($this);
         }
 
+
         return $this;
     }
 
@@ -1571,8 +1592,8 @@ abstract class Cart implements ActiveRecordInterface
     /**
      * Get the associated ChildCustomer object
      *
-     * @param  ConnectionInterface $con Optional Connection object.
+     * @param      ConnectionInterface $con Optional Connection object.
-     * @return ChildCustomer       The associated ChildCustomer object.
+     * @return                 ChildCustomer The associated ChildCustomer object.
      * @throws PropelException
      */
     public function getCustomer(ConnectionInterface $con = null)
@@ -1594,8 +1615,8 @@ abstract class Cart implements ActiveRecordInterface
     /**
      * Declares an association between this object and a ChildAddress object.
      *
-     * @param  ChildAddress       $v
+     * @param                  ChildAddress $v
-     * @return \Thelia\Model\Cart The current object (for fluent API support)
+     * @return                 \Thelia\Model\Cart The current object (for fluent API support)
      * @throws PropelException
      */
     public function setAddressRelatedByAddressDeliveryId(ChildAddress $v = null)
@@ -1614,6 +1635,7 @@ abstract class Cart implements ActiveRecordInterface
             $v->addCartRelatedByAddressDeliveryId($this);
         }
 
+
         return $this;
     }
 
@@ -1621,8 +1643,8 @@ abstract class Cart implements ActiveRecordInterface
     /**
      * Get the associated ChildAddress object
      *
-     * @param  ConnectionInterface $con Optional Connection object.
+     * @param      ConnectionInterface $con Optional Connection object.
-     * @return ChildAddress        The associated ChildAddress object.
+     * @return                 ChildAddress The associated ChildAddress object.
      * @throws PropelException
      */
     public function getAddressRelatedByAddressDeliveryId(ConnectionInterface $con = null)
@@ -1644,8 +1666,8 @@ abstract class Cart implements ActiveRecordInterface
     /**
      * Declares an association between this object and a ChildAddress object.
      *
-     * @param  ChildAddress       $v
+     * @param                  ChildAddress $v
-     * @return \Thelia\Model\Cart The current object (for fluent API support)
+     * @return                 \Thelia\Model\Cart The current object (for fluent API support)
      * @throws PropelException
      */
     public function setAddressRelatedByAddressInvoiceId(ChildAddress $v = null)
@@ -1664,6 +1686,7 @@ abstract class Cart implements ActiveRecordInterface
             $v->addCartRelatedByAddressInvoiceId($this);
         }
 
+
         return $this;
     }
 
@@ -1671,8 +1694,8 @@ abstract class Cart implements ActiveRecordInterface
     /**
      * Get the associated ChildAddress object
      *
-     * @param  ConnectionInterface $con Optional Connection object.
+     * @param      ConnectionInterface $con Optional Connection object.
-     * @return ChildAddress        The associated ChildAddress object.
+     * @return                 ChildAddress The associated ChildAddress object.
      * @throws PropelException
      */
     public function getAddressRelatedByAddressInvoiceId(ConnectionInterface $con = null)
@@ -1694,8 +1717,8 @@ abstract class Cart implements ActiveRecordInterface
     /**
      * Declares an association between this object and a ChildCurrency object.
      *
-     * @param  ChildCurrency      $v
+     * @param                  ChildCurrency $v
-     * @return \Thelia\Model\Cart The current object (for fluent API support)
+     * @return                 \Thelia\Model\Cart The current object (for fluent API support)
      * @throws PropelException
      */
     public function setCurrency(ChildCurrency $v = null)
@@ -1714,6 +1737,7 @@ abstract class Cart implements ActiveRecordInterface
             $v->addCart($this);
         }
 
+
         return $this;
     }
 
@@ -1721,8 +1745,8 @@ abstract class Cart implements ActiveRecordInterface
     /**
      * Get the associated ChildCurrency object
      *
-     * @param  ConnectionInterface $con Optional Connection object.
+     * @param      ConnectionInterface $con Optional Connection object.
-     * @return ChildCurrency       The associated ChildCurrency object.
+     * @return                 ChildCurrency The associated ChildCurrency object.
      * @throws PropelException
      */
     public function getCurrency(ConnectionInterface $con = null)
@@ -1747,7 +1771,7 @@ abstract class Cart implements ActiveRecordInterface
      * Avoids crafting an 'init[$relationName]s' method name
      * that wouldn't work when StandardEnglishPluralizer is used.
      *
-     * @param  string $relationName The name of the relation to initialize
+     * @param      string $relationName The name of the relation to initialize
      * @return void
      */
     public function initRelation($relationName)
@@ -1786,8 +1810,8 @@ abstract class Cart implements ActiveRecordInterface
      * however, you may wish to override this method in your stub class to provide setting appropriate
      * to your application -- for example, setting the initial array to the values stored in database.
      *
-     * @param boolean $overrideExisting If set to true, the method call initializes
+     * @param      boolean $overrideExisting If set to true, the method call initializes
-     *                                  the collection even if it is not empty
+     *                                        the collection even if it is not empty
      *
      * @return void
      */
@@ -1809,8 +1833,8 @@ abstract class Cart implements ActiveRecordInterface
      * If this ChildCart is new, it will return
      * an empty collection or the current collection; the criteria is ignored on a new object.
      *
-     * @param  Criteria                   $criteria optional Criteria object to narrow the query
+     * @param      Criteria $criteria optional Criteria object to narrow the query
-     * @param  ConnectionInterface        $con      optional connection object
+     * @param      ConnectionInterface $con optional connection object
      * @return Collection|ChildCartItem[] List of ChildCartItem objects
      * @throws PropelException
      */
@@ -1866,14 +1890,15 @@ abstract class Cart implements ActiveRecordInterface
      * It will also schedule objects for deletion based on a diff between old objects (aka persisted)
      * and new objects from the given Propel collection.
      *
-     * @param  Collection          $cartItems A Propel collection.
+     * @param      Collection $cartItems A Propel collection.
-     * @param  ConnectionInterface $con       Optional connection object
+     * @param      ConnectionInterface $con Optional connection object
-     * @return ChildCart           The current object (for fluent API support)
+     * @return   ChildCart The current object (for fluent API support)
      */
     public function setCartItems(Collection $cartItems, ConnectionInterface $con = null)
     {
         $cartItemsToDelete = $this->getCartItems(new Criteria(), $con)->diff($cartItems);
 
+
         $this->cartItemsScheduledForDeletion = $cartItemsToDelete;
 
         foreach ($cartItemsToDelete as $cartItemRemoved) {
@@ -1894,10 +1919,10 @@ abstract class Cart implements ActiveRecordInterface
     /**
      * Returns the number of related CartItem objects.
      *
-     * @param  Criteria            $criteria
+     * @param      Criteria $criteria
-     * @param  boolean             $distinct
+     * @param      boolean $distinct
-     * @param  ConnectionInterface $con
+     * @param      ConnectionInterface $con
-     * @return int                 Count of related CartItem objects.
+     * @return int             Count of related CartItem objects.
      * @throws PropelException
      */
     public function countCartItems(Criteria $criteria = null, $distinct = false, ConnectionInterface $con = null)
@@ -1929,8 +1954,8 @@ abstract class Cart implements ActiveRecordInterface
      * Method called to associate a ChildCartItem object to this object
      * through the ChildCartItem foreign key attribute.
      *
-     * @param  ChildCartItem      $l ChildCartItem
+     * @param    ChildCartItem $l ChildCartItem
-     * @return \Thelia\Model\Cart The current object (for fluent API support)
+     * @return   \Thelia\Model\Cart The current object (for fluent API support)
      */
     public function addCartItem(ChildCartItem $l)
     {
@@ -1956,7 +1981,7 @@ abstract class Cart implements ActiveRecordInterface
     }
 
     /**
-     * @param  CartItem  $cartItem The cartItem object to remove.
+     * @param  CartItem $cartItem The cartItem object to remove.
      * @return ChildCart The current object (for fluent API support)
      */
     public function removeCartItem($cartItem)
@@ -1974,6 +1999,7 @@ abstract class Cart implements ActiveRecordInterface
         return $this;
     }
 
+
     /**
      * If this collection has already been initialized with
      * an identical criteria, it returns the collection.
@@ -1985,9 +2011,9 @@ abstract class Cart implements ActiveRecordInterface
      * api reasonable.  You can provide public methods for those you
      * actually need in Cart.
      *
-     * @param  Criteria                   $criteria     optional Criteria object to narrow the query
+     * @param      Criteria $criteria optional Criteria object to narrow the query
-     * @param  ConnectionInterface        $con          optional connection object
+     * @param      ConnectionInterface $con optional connection object
-     * @param  string                     $joinBehavior optional join type to use (defaults to Criteria::LEFT_JOIN)
+     * @param      string $joinBehavior optional join type to use (defaults to Criteria::LEFT_JOIN)
      * @return Collection|ChildCartItem[] List of ChildCartItem objects
      */
     public function getCartItemsJoinProduct($criteria = null, $con = null, $joinBehavior = Criteria::LEFT_JOIN)
@@ -1998,6 +2024,7 @@ abstract class Cart implements ActiveRecordInterface
         return $this->getCartItems($query, $con);
     }
 
+
     /**
      * If this collection has already been initialized with
      * an identical criteria, it returns the collection.
@@ -2009,9 +2036,9 @@ abstract class Cart implements ActiveRecordInterface
      * api reasonable.  You can provide public methods for those you
      * actually need in Cart.
      *
-     * @param  Criteria                   $criteria     optional Criteria object to narrow the query
+     * @param      Criteria $criteria optional Criteria object to narrow the query
-     * @param  ConnectionInterface        $con          optional connection object
+     * @param      ConnectionInterface $con optional connection object
-     * @param  string                     $joinBehavior optional join type to use (defaults to Criteria::LEFT_JOIN)
+     * @param      string $joinBehavior optional join type to use (defaults to Criteria::LEFT_JOIN)
      * @return Collection|ChildCartItem[] List of ChildCartItem objects
      */
     public function getCartItemsJoinProductSaleElements($criteria = null, $con = null, $joinBehavior = Criteria::LEFT_JOIN)
@@ -2051,7 +2078,7 @@ abstract class Cart implements ActiveRecordInterface
      * objects with circular references (even in PHP 5.3). This is currently necessary
      * when using Propel in certain daemon or large-volume/high-memory operations.
      *
-     * @param boolean $deep Whether to also clear the references on all referrer objects.
+     * @param      boolean $deep Whether to also clear the references on all referrer objects.
      */
     public function clearAllReferences($deep = false)
     {
@@ -2085,7 +2112,7 @@ abstract class Cart implements ActiveRecordInterface
     /**
      * Mark the current object so that the update date doesn't get updated during next save
      *
-     * @return ChildCart The current object (for fluent API support)
+     * @return     ChildCart The current object (for fluent API support)
      */
     public function keepUpdateDateUnchanged()
     {
@@ -2170,6 +2197,7 @@ abstract class Cart implements ActiveRecordInterface
 
     }
 
+
     /**
      * Derived method to catches calls to undefined methods.
      *