Update dependencies

sensi · Mar 20, 2012 · abf2df4 · abf2df4
1 parent 6a664a3
commit abf2df4
Show file tree

Hide file tree

Showing 3 changed files with 4 additions and 5 deletions.
diff --git a/.travis.yml b/.travis.yml
@@ -4,7 +4,6 @@ php:
   # - 5.4
 
 env:
-  - SYMFONY_VERSION=v2.0.11
   - SYMFONY_VERSION=origin/master
 
 before_script: php Tests/tests/vendors.php

diff --git a/Tests/tests/vendors.php b/Tests/tests/vendors.php
@@ -11,7 +11,7 @@
 $deps = array(
     array('symfony', 'git://github.com/symfony/symfony.git', isset($_SERVER['SYMFONY_VERSION']) ? $_SERVER['SYMFONY_VERSION'] : 'origin/master'),
     array('knpmenu', 'git://github.com/KnpLabs/KnpMenu.git', 'origin/master'),
-    array('twig', 'git://github.com/fabpot/Twig.git', '1.3.0'),
+    array('twig', 'git://github.com/fabpot/Twig.git', '1.6.2'),
     array('exporter', 'git://github.com/sonata-project/exporter.git', 'origin/master'),
 );
 

diff --git a/composer.json b/composer.json
@@ -18,15 +18,15 @@
     ],
     "require": {
         "php": ">=5.3.2",
-        "symfony/framework-bundle": "2.*",
-        "symfony/security-bundle": "2.*",
+        "symfony/framework-bundle": "master-dev",
+        "symfony/security-bundle": "master-dev",
         "knplabs/knp-menu-bundle": "master-dev",
         "sonata-project/jquery-bundle": "master-dev",
         "sonata-project/exporter": "master-dev",
         "sonata-project/block-bundle": "master-dev"
     },
     "suggest": {
-        "sonata-project/doctrine-orm-admin-bundle": "*",
+        "sonata-project/doctrine-orm-admin-bundle": "master-dev",
         "sonata-project/intl-bundle": "master-dev"
     },
     "autoload": {
-Original file line number
+Diff line change
@@ Expand Up / @@ -4,7 +4,6 @@ php: @@
       # - 5.4
     env:
-      - SYMFONY_VERSION=v2.0.11
       - SYMFONY_VERSION=origin/master
     before_script: php Tests/tests/vendors.php
@@ Expand Down @@