Skip to content

Instantly share code, notes, and snippets.

@andreia
Created March 7, 2013 11:14
Show Gist options
  • Star 0 You must be signed in to star a gist
  • Fork 0 You must be signed in to fork a gist
  • Save andreia/5107367 to your computer and use it in GitHub Desktop.
Save andreia/5107367 to your computer and use it in GitHub Desktop.
From Symfony 2.1 to 2.2
diff --git a/composer.json b/composer.json
index 8f905d7..c2d7588 100644
--- a/composer.json
+++ b/composer.json
@@ -6,18 +6,18 @@
},
"require": {
"php": ">=5.3.3",
- "symfony/symfony": "2.1.*",
- "doctrine/orm": ">=2.2.3,=2.2.3",
+ "doctrine/doctrine-bundle": "1.2.*",
"twig/extensions": "1.0.*",
"symfony/assetic-bundle": "2.1.*",
- "symfony/swiftmailer-bundle": "2.1.*",
- "symfony/monolog-bundle": "2.1.*",
- "sensio/distribution-bundle": "2.1.*",
- "sensio/framework-extra-bundle": "2.1.*",
- "sensio/generator-bundle": "2.1.*",
- "jms/security-extra-bundle": "1.2.*",
- "jms/di-extra-bundle": "1.1.*"
+ "symfony/swiftmailer-bundle": "2.2.*",
+ "symfony/monolog-bundle": "2.2.*",
+ "sensio/distribution-bundle": "2.2.*",
+ "sensio/framework-extra-bundle": "2.2.*",
+ "sensio/generator-bundle": "2.2.*",
+ "jms/security-extra-bundle": "1.4.*",
+ "jms/di-extra-bundle": "1.3.*"
},
"scripts": {
"post-install-cmd": [
@@ -36,9 +36,12 @@
"config": {
"bin-dir": "bin"
},
- "minimum-stability": "dev",
+ "minimum-stability": "alpha",
"extra": {
"symfony-app-dir": "app",
- "symfony-web-dir": "web"
+ "symfony-web-dir": "web",
+ "branch-alias": {
+ "dev-master": "2.2-dev"
+ }
}
}
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment