TheCoreDev/sterivein
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

fix insert.sql syntax and downgrade propel version for validator

Browse Source 
compatibility
This commit is contained in:
Manuel Raynaud
2013-08-16 11:45:03 +02:00
parent 115a7dd893
commit ca954a3b81
4 changed files with 59 additions and 58 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
composer.json
View File

@@ -11,7 +11,7 @@
"php": ">=5.4",
"ezyang/htmlpurifier": "dev-master",
"ircmaxell/password-compat": "dev-master",
"propel/propel": "dev-master",
"propel/propel": "2.0.0-alpha1",
"psr/log" : "1.0",
"symfony/class-loader": "2.2.*",
"symfony/config" : "2.2.*",
@@ -27,7 +27,7 @@
"symfony-cmf/routing": "1.0.0",
"symfony/form": "2.2.*",
"symfony/validator": "2.2.*",
"symfony/validator": "2.3.*",
"smarty/smarty": "v3.1.14",
"kriswallsmith/assetic": "1.2.*@dev",

67
composer.lock generated
View File

@@ -3,7 +3,7 @@
"This file locks the dependencies of your project to a known state",
"Read more about it at http://getcomposer.org/doc/01-basic-usage.md#composer-lock-the-lock-file"
],
"hash": "21a698b038efa96e592a3673a760c065",
"hash": "978f18a84f0206422f94441fd85bb387",
"packages": [
{
"name": "ezyang/htmlpurifier",
@@ -254,30 +254,30 @@
},
{
"name": "propel/propel",
"version": "dev-master",
"version": "2.0.0-alpha1",
"source": {
"type": "git",
"url": "https://github.com/propelorm/Propel2.git",
"reference": "c33b5ade89d0d6c1be7dd9252102ddee6b620890"
"reference": "2.0.0-alpha1"
},
"dist": {
"type": "zip",
"url": "https://api.github.com/repos/propelorm/Propel2/zipball/c33b5ade89d0d6c1be7dd9252102ddee6b620890",
"reference": "c33b5ade89d0d6c1be7dd9252102ddee6b620890",
"url": "https://api.github.com/repos/propelorm/Propel2/zipball/2.0.0-alpha1",
"reference": "2.0.0-alpha1",
"shasum": ""
},
"require": {
"php": ">=5.4",
"psr/log": "~1.0",
"symfony/console": "~2.2",
"symfony/filesystem": "~2.2",
"symfony/finder": "~2.2",
"symfony/validator": "2.2.*@dev",
"symfony/yaml": "~2.2"
"psr/log": ">=1.0,<2.0",
"symfony/console": ">=2.2,<3.0",
"symfony/filesystem": ">=2.2,<3.0",
"symfony/finder": ">=2.2,<3.0",
"symfony/validator": ">=2.2,<3.0",
"symfony/yaml": ">=2.2,<3.0"
},
"require-dev": {
"behat/behat": "~2.4",
"monolog/monolog": "~1.3",
"behat/behat": ">=2.4,<3.0",
"monolog/monolog": ">=1.3,<2.0",
"phpunit/phpunit": "3.7.*"
},
"suggest": {
@@ -310,7 +310,7 @@
"orm",
"persistence"
],
"time": "2013-08-14 23:15:50"
"time": "2013-06-05 06:46:14"
},
{
"name": "psr/log",
@@ -1066,20 +1066,21 @@
},
{
"name": "symfony/icu",
"version": "v1.0.0",
"version": "v1.2.0",
"target-dir": "Symfony/Component/Icu",
"source": {
"type": "git",
"url": "https://github.com/symfony/Icu.git",
"reference": "v1.0.0"
"reference": "v1.2.0"
},
"dist": {
"type": "zip",
"url": "https://api.github.com/repos/symfony/Icu/zipball/v1.0.0",
"reference": "v1.0.0",
"url": "https://api.github.com/repos/symfony/Icu/zipball/v1.2.0",
"reference": "v1.2.0",
"shasum": ""
},
"require": {
"lib-icu": ">=4.4",
"php": ">=5.3.3",
"symfony/intl": ">=2.3,<3.0"
},
@@ -1109,7 +1110,7 @@
"icu",
"intl"
],
"time": "2013-06-03 18:32:07"
"time": "2013-06-03 18:32:58"
},
{
"name": "symfony/intl",
@@ -1508,17 +1509,17 @@
},
{
"name": "symfony/validator",
"version": "v2.2.5",
"version": "v2.3.3",
"target-dir": "Symfony/Component/Validator",
"source": {
"type": "git",
"url": "https://github.com/symfony/Validator.git",
"reference": "v2.2.5"
"reference": "v2.3.3"
},
"dist": {
"type": "zip",
"url": "https://api.github.com/repos/symfony/Validator/zipball/v2.2.5",
"reference": "v2.2.5",
"url": "https://api.github.com/repos/symfony/Validator/zipball/v2.3.3",
"reference": "v2.3.3",
"shasum": ""
},
"require": {
@@ -1526,22 +1527,22 @@
"symfony/translation": "~2.0"
},
"require-dev": {
"symfony/config": ">=2.2,<2.3-dev",
"symfony/config": "~2.2",
"symfony/http-foundation": "~2.1",
"symfony/locale": "~2.0",
"symfony/intl": "~2.3",
"symfony/yaml": "~2.0"
},
"suggest": {
"doctrine/common": "~2.2",
"symfony/config": "2.2.*",
"symfony/http-foundation": "2.2.*",
"symfony/locale": "2.2.*",
"symfony/yaml": "2.2.*"
"doctrine/common": "",
"symfony/config": "",
"symfony/http-foundation": "",
"symfony/intl": "",
"symfony/yaml": ""
},
"type": "library",
"extra": {
"branch-alias": {
"dev-master": "2.2-dev"
"dev-master": "2.3-dev"
}
},
"autoload": {
@@ -1565,7 +1566,7 @@
],
"description": "Symfony Validator Component",
"homepage": "http://symfony.com",
"time": "2013-08-06 05:59:38"
"time": "2013-08-06 05:59:49"
},
{
"name": "symfony/yaml",
@@ -2037,7 +2038,7 @@
"stability-flags": {
"ezyang/htmlpurifier": 20,
"ircmaxell/password-compat": 20,
"propel/propel": 20,
"propel/propel": 15,
"kriswallsmith/assetic": 20,
"leafo/lessphp": 20,
"ptachoire/cssembed": 20,

10
install/insert.sql
View File

@@ -6,11 +6,11 @@ INSERT INTO `lang`(`id`,`title`,`code`,`locale`,`url`,`by_default`,`position`,`c
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());
('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());
('images_library_path', 'local/media/images', 1, 0, NOW(), NOW());
('verifyStock', '1', 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()),
('images_library_path', 'local/media/images', 1, 0, NOW(), NOW()),
('image_cache_dir_from_web_root', 'cache/images', 1, 0, NOW(), NOW());

36
install/thelia.sql
View File

@@ -521,7 +521,7 @@ CREATE TABLE `lang`
`code` VARCHAR(10),
`locale` VARCHAR(45),
`url` VARCHAR(255),
`position` INTEGER NOT NULL,
`position` INTEGER,
`by_default` TINYINT,
`created_at` DATETIME,
`updated_at` DATETIME,
@@ -618,8 +618,8 @@ CREATE TABLE `product_image`
`created_at` DATETIME,
`updated_at` DATETIME,
PRIMARY KEY (`id`),
INDEX `idx_product_id` (`product_id`),
CONSTRAINT `fk_product_id`
INDEX `idx_product_image_product_id` (`product_id`),
CONSTRAINT `fk_product_image_product_id`
FOREIGN KEY (`product_id`)
REFERENCES `product` (`id`)
ON UPDATE RESTRICT
@@ -641,8 +641,8 @@ CREATE TABLE `product_document`
`created_at` DATETIME,
`updated_at` DATETIME,
PRIMARY KEY (`id`),
INDEX `idx_product_id` (`product_id`),
CONSTRAINT `fk_product_id`
INDEX `idx_product_document_product_id` (`product_id`),
CONSTRAINT `fk_product_document_product_id`
FOREIGN KEY (`product_id`)
REFERENCES `product` (`id`)
ON UPDATE RESTRICT
@@ -720,7 +720,7 @@ CREATE TABLE `currency`
`code` VARCHAR(45),
`symbol` VARCHAR(45),
`rate` FLOAT,
`position` INTEGER NOT NULL,
`position` INTEGER,
`by_default` TINYINT,
`created_at` DATETIME,
`updated_at` DATETIME,
@@ -1334,8 +1334,8 @@ CREATE TABLE `category_image`
`created_at` DATETIME,
`updated_at` DATETIME,
PRIMARY KEY (`id`),
INDEX `idx_category_id` (`category_id`),
CONSTRAINT `fk_category_id`
INDEX `idx_category_image_category_id` (`category_id`),
CONSTRAINT `fk_category_image_category_id`
FOREIGN KEY (`category_id`)
REFERENCES `category` (`id`)
ON UPDATE RESTRICT
@@ -1357,8 +1357,8 @@ CREATE TABLE `folder_image`
`created_at` DATETIME,
`updated_at` DATETIME,
PRIMARY KEY (`id`),
INDEX `idx_folder_id` (`folder_id`),
CONSTRAINT `fk_folder_id`
INDEX `idx_folder_image_folder_id` (`folder_id`),
CONSTRAINT `fk_folder_image_folder_id`
FOREIGN KEY (`folder_id`)
REFERENCES `folder` (`id`)
ON UPDATE RESTRICT
@@ -1380,8 +1380,8 @@ CREATE TABLE `content_image`
`created_at` DATETIME,
`updated_at` DATETIME,
PRIMARY KEY (`id`),
INDEX `idx_content_id` (`content_id`),
CONSTRAINT `fk_content_id`
INDEX `idx_content_image_content_id` (`content_id`),
CONSTRAINT `fk_content_image_content_id`
FOREIGN KEY (`content_id`)
REFERENCES `content` (`id`)
ON UPDATE RESTRICT
@@ -1403,8 +1403,8 @@ CREATE TABLE `category_document`
`created_at` DATETIME,
`updated_at` DATETIME,
PRIMARY KEY (`id`),
INDEX `idx_category_id` (`category_id`),
CONSTRAINT `fk_category_id`
INDEX `idx_category_document_category_id` (`category_id`),
CONSTRAINT `fk_catgory_document_category_id`
FOREIGN KEY (`category_id`)
REFERENCES `category` (`id`)
ON UPDATE RESTRICT
@@ -1426,8 +1426,8 @@ CREATE TABLE `content_document`
`created_at` DATETIME,
`updated_at` DATETIME,
PRIMARY KEY (`id`),
INDEX `idx_content_id` (`content_id`),
CONSTRAINT `fk_content_id`
INDEX `idx_content_document_content_id` (`content_id`),
CONSTRAINT `fk_content_document_content_id`
FOREIGN KEY (`content_id`)
REFERENCES `content` (`id`)
ON UPDATE RESTRICT
@@ -1449,8 +1449,8 @@ CREATE TABLE `folder_document`
`created_at` DATETIME,
`updated_at` DATETIME,
PRIMARY KEY (`id`),
INDEX `idx_folder_id` (`folder_id`),
CONSTRAINT `fk_folder_id`
INDEX `idx_folder_document_folder_id` (`folder_id`),
CONSTRAINT `fk_folder_document_folder_id`
FOREIGN KEY (`folder_id`)
REFERENCES `folder` (`id`)
ON UPDATE RESTRICT