Commit 6395d4b1 authored by Fabien Potencier's avatar Fabien Potencier

merged branch igorw/stable-deps (PR #480)

Commits
-------

20124e93 Update doctrine constraint for fat skeleton as well (danke @stof)
99451f2a Update doctrine/dbal require-dev to 2.2 branch
a189265a Adjust minimum-stability in skeleton files
3bc1e736 Switch dependencies to stable versions

Discussion
----------

Switch dependencies to stable versions

---------------------------------------------------------------------------

by stof at 2012-09-08T20:12:19Z

you also need to update the files of the skeleton for the archives

---------------------------------------------------------------------------

by igorw at 2012-09-08T20:22:33Z

Both done.

---------------------------------------------------------------------------

by stof at 2012-09-08T20:51:06Z

Please update DBAL in the fat archive too
parents 8264be8e 20124e93
{ {
"minimum-stability": "dev",
"require": { "require": {
"silex/silex": "1.0.*", "silex/silex": "1.0.*",
"symfony/browser-kit": "2.1.*", "symfony/browser-kit": "2.1.*",
...@@ -19,7 +18,7 @@ ...@@ -19,7 +18,7 @@
"symfony/twig-bridge": "2.1.*", "symfony/twig-bridge": "2.1.*",
"monolog/monolog": ">=1.0.0,<1.2-dev", "monolog/monolog": ">=1.0.0,<1.2-dev",
"twig/twig": ">=1.2.0,<2.0-dev", "twig/twig": ">=1.2.0,<2.0-dev",
"doctrine/dbal": "2.1.*", "doctrine/dbal": "2.2.*",
"swiftmailer/swiftmailer": "4.1.*" "swiftmailer/swiftmailer": "4.1.*"
} }
} }
{ {
"minimum-stability": "dev",
"require": { "require": {
"silex/silex": "1.0.*" "silex/silex": "1.0.*"
} }
......
...@@ -37,7 +37,7 @@ ...@@ -37,7 +37,7 @@
"symfony/twig-bridge": "2.1.*", "symfony/twig-bridge": "2.1.*",
"symfony/validator": "2.1.*", "symfony/validator": "2.1.*",
"twig/twig": ">=1.8.0,<2.0-dev", "twig/twig": ">=1.8.0,<2.0-dev",
"doctrine/dbal": "2.1.*", "doctrine/dbal": "2.2.*",
"swiftmailer/swiftmailer": "4.2.*" "swiftmailer/swiftmailer": "4.2.*"
}, },
"suggest": { "suggest": {
...@@ -48,7 +48,6 @@ ...@@ -48,7 +48,6 @@
"autoload": { "autoload": {
"psr-0": { "Silex": "src/" } "psr-0": { "Silex": "src/" }
}, },
"minimum-stability": "dev",
"extra": { "extra": {
"branch-alias": { "branch-alias": {
"dev-master": "1.0-dev" "dev-master": "1.0-dev"
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment