Merge branch 'master' of https://github.com/thelia/thelia into coupon

# By franck (9) and others
# Via franck (3) and Etienne Roudeix (1)
* 'master' of https://github.com/thelia/thelia:
  Added get/setLangId() method in session
  Refactored VariableXxxxx.php as ConfigXxxx.php
  Added name duplication check when creating a variable
  Completed the backoffice variable management
  update propel version and dependencies
  add some phpdoc
  Fixed getUrl()
  Typo :(
  Intriducec BaseI18nLoop, started variable config management
  Fixed URL::absoluteUrl()
  Fixed customer front controller, events, addec admion config.
  rewriting
  specific rewrittend url retrievement
  product page
  url global substitution
  sid : rewriting
  rewriting tables
  start rewriting

Conflicts:
	core/lib/Thelia/Config/Resources/routing/admin.xml
	core/lib/Thelia/Core/Event/TheliaEvents.php

install/faker.php

@@ -246,7 +246,7 @@ try {
     //categories and products
     $productIdList = array();
     $categoryIdList = array();
-    for($i=0; $i<4; $i++) {
+    for($i=1; $i<5; $i++) {
         $category = createCategory($faker, 0, $i, $categoryIdList, $contentIdList);
 
         for($j=1; $j<rand(0, 5); $j++) {
@@ -257,7 +257,7 @@ try {
             }
         }
 
-        for($k=0; $k<rand(1, 5); $k++) {
+        for($k=1; $k<rand(1, 6); $k++) {
             createProduct($faker, $category, $k, $productIdList);
         }
     }
@@ -388,7 +388,7 @@ function createProduct($faker, $category, $position, &$productIdList)
     $image = new ProductImage();
     $image->setProductId($productId);
     generate_image($image, 1, 'product', $productId);
-    
+
     return $product;
 }
 
@@ -423,7 +423,7 @@ function createCategory($faker, $parent, $position, &$categoryIdList, $contentId
     $image = new CategoryImage();
     $image->setCategoryId($categoryId);
     generate_image($image, 1, 'category', $categoryId);
-    
+
     return $category;
 }
 
@@ -545,4 +545,4 @@ Sed facilisis pellentesque nisl, eu tincidunt erat scelerisque a. Nullam malesua
     $coupon1->setIsCumulative(1);
     $coupon1->setIsRemovingPostage(0);
     $coupon1->save();
-}
+}

install/insert.sql

@@ -7,6 +7,8 @@ INSERT INTO `lang`(`id`,`title`,`code`,`locale`,`url`,`by_default`,`created_at`,
 INSERT INTO `config` (`name`, `value`, `secured`, `hidden`, `created_at`, `updated_at`) VALUES
 ('session_config.default', '1', 1, 1, NOW(), NOW()),
 ('verifyStock', '1', 1, 0, NOW(), NOW()),
+('default_lang_without_translation', '1', 1, 0, NOW(), NOW()),
+('rewriting_enable', '0', 1, 0, NOW(), NOW()),
 ('imagine_graphic_driver', 'gd', 1, 0, NOW(), NOW()),
 ('default_images_quality_percent', '75', 1, 0, NOW(), NOW()),
 ('original_image_delivery_mode', 'symlink', 1, 0, NOW(), NOW()),

install/thelia.sql

@@ -1443,9 +1443,9 @@ CREATE TABLE `rewriting_url`
 (
     `id` INTEGER NOT NULL AUTO_INCREMENT,
     `url` VARCHAR(255) NOT NULL,
-    `view` VARCHAR(255),
+    `view` VARCHAR(255) NOT NULL,
     `view_id` VARCHAR(255),
-    `view_locale` VARCHAR(255),
+    `view_locale` VARCHAR(255) NOT NULL,
     `redirected` INTEGER,
     `created_at` DATETIME,
     `updated_at` DATETIME,