update propel version and dependencies

This commit is contained in:
Manuel Raynaud
2013-09-01 19:26:13 +02:00
parent ef8e98d415
commit 932bf00532
2 changed files with 17 additions and 17 deletions

View File

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

30
composer.lock generated
View File

@@ -3,7 +3,7 @@
"This file locks the dependencies of your project to a known state", "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" "Read more about it at http://getcomposer.org/doc/01-basic-usage.md#composer-lock-the-lock-file"
], ],
"hash": "458aeccc06b7394d7653a9063b6fd981", "hash": "050e3da6bd52d5743a46e09992cf67c0",
"packages": [ "packages": [
{ {
"name": "ezyang/htmlpurifier", "name": "ezyang/htmlpurifier",
@@ -254,16 +254,16 @@
}, },
{ {
"name": "propel/propel", "name": "propel/propel",
"version": "2.0.0-alpha1", "version": "dev-master",
"source": { "source": {
"type": "git", "type": "git",
"url": "https://github.com/propelorm/Propel2.git", "url": "https://github.com/propelorm/Propel2.git",
"reference": "3b9ea45a6e1b9fb3903cb910a31fbbac4a66c184" "reference": "58a25ded43c3d04313cad2b738342d307988b1b5"
}, },
"dist": { "dist": {
"type": "zip", "type": "zip",
"url": "https://api.github.com/repos/propelorm/Propel2/zipball/3b9ea45a6e1b9fb3903cb910a31fbbac4a66c184", "url": "https://api.github.com/repos/propelorm/Propel2/zipball/58a25ded43c3d04313cad2b738342d307988b1b5",
"reference": "3b9ea45a6e1b9fb3903cb910a31fbbac4a66c184", "reference": "58a25ded43c3d04313cad2b738342d307988b1b5",
"shasum": "" "shasum": ""
}, },
"require": { "require": {
@@ -310,7 +310,7 @@
"orm", "orm",
"persistence" "persistence"
], ],
"time": "2013-06-05 06:46:14" "time": "2013-09-01 13:29:51"
}, },
{ {
"name": "psr/log", "name": "psr/log",
@@ -1066,22 +1066,23 @@
}, },
{ {
"name": "symfony/icu", "name": "symfony/icu",
"version": "v1.0.0", "version": "v1.2.0",
"target-dir": "Symfony/Component/Icu", "target-dir": "Symfony/Component/Icu",
"source": { "source": {
"type": "git", "type": "git",
"url": "https://github.com/symfony/Icu.git", "url": "https://github.com/symfony/Icu.git",
"reference": "v1.0.0" "reference": "7299cd3d8d6602103d1ebff5d0a9917b7bc6de72"
}, },
"dist": { "dist": {
"type": "zip", "type": "zip",
"url": "https://api.github.com/repos/symfony/Icu/zipball/v1.0.0", "url": "https://api.github.com/repos/symfony/Icu/zipball/7299cd3d8d6602103d1ebff5d0a9917b7bc6de72",
"reference": "v1.0.0", "reference": "7299cd3d8d6602103d1ebff5d0a9917b7bc6de72",
"shasum": "" "shasum": ""
}, },
"require": { "require": {
"lib-icu": ">=4.4",
"php": ">=5.3.3", "php": ">=5.3.3",
"symfony/intl": ">=2.3,<3.0" "symfony/intl": "~2.3"
}, },
"type": "library", "type": "library",
"autoload": { "autoload": {
@@ -1109,7 +1110,7 @@
"icu", "icu",
"intl" "intl"
], ],
"time": "2013-06-03 18:32:07" "time": "2013-06-03 18:32:58"
}, },
{ {
"name": "symfony/intl", "name": "symfony/intl",
@@ -1508,7 +1509,7 @@
}, },
{ {
"name": "symfony/validator", "name": "symfony/validator",
"version": "2.3.x-dev", "version": "v2.3.4",
"target-dir": "Symfony/Component/Validator", "target-dir": "Symfony/Component/Validator",
"source": { "source": {
"type": "git", "type": "git",
@@ -2037,8 +2038,7 @@
"stability-flags": { "stability-flags": {
"ezyang/htmlpurifier": 20, "ezyang/htmlpurifier": 20,
"ircmaxell/password-compat": 20, "ircmaxell/password-compat": 20,
"propel/propel": 15, "propel/propel": 20,
"symfony/validator": 20,
"kriswallsmith/assetic": 20, "kriswallsmith/assetic": 20,
"leafo/lessphp": 20, "leafo/lessphp": 20,
"ptachoire/cssembed": 20, "ptachoire/cssembed": 20,