Merge pull request #445 from ezsystems/symfony2.3

Fix EZP-21019: Upgrade to Symfony 2.3
ezsystems · Jul 8, 2013 · e1280d5 · e1280d5
2 parents 8e26e2d + e5c2d8c
commit e1280d5
Show file tree

Hide file tree

Showing 7 changed files with 173 additions and 68 deletions.
diff --git a/composer.json b/composer.json
@@ -24,12 +24,12 @@
         "zetacomponents/signal-slot": "@dev",
         "zetacomponents/system-information": "@dev",
         "zetacomponents/webdav": "1.1.*",
-        "symfony/symfony": "2.2.*",
-        "symfony-cmf/routing": "1.0.*",
+        "symfony/symfony": "~2.3",
+        "symfony-cmf/routing": "1.1.*@beta",
         "qafoo/rmf": "1.0.*",
         "kriswallsmith/buzz": ">=0.9",
         "tedivm/stash-bundle": "0.2.*",
-        "sensio/distribution-bundle": "2.2.*"
+        "sensio/distribution-bundle": "~2.3"
     },
     "require-dev": {
         "ezsystems/ezpublish-legacy": "@dev",
@@ -49,6 +49,7 @@
     "extra": {
         "branch-alias": {
             "dev-master": "5.1.x-dev"
-        }
+        },
+        "ezpublish-legacy-dir": "vendor/ezsystems/ezpublish-legacy"
     }
 }