diff --git a/Tests/Block/FakeBlockService.php b/Tests/Block/FakeBlockService.php
index 470889ca8f..be66f9ed09 100644
--- a/Tests/Block/FakeBlockService.php
+++ b/Tests/Block/FakeBlockService.php
@@ -12,16 +12,16 @@
 namespace Sonata\AdminBundle\Tests\Block;
 
 use Sonata\AdminBundle\Block\AdminListBlockService;
-use Symfony\Component\OptionsResolver\OptionsResolverInterface;
+use Symfony\Component\OptionsResolver\OptionsResolver;
 
 /**
  * @author Sullivan Senechal <soullivaneuh@gmail.com>
  */
 class FakeBlockService extends AdminListBlockService
 {
-    public function setDefaultSettings(OptionsResolverInterface $resolver)
+    public function configureSettings(OptionsResolver $resolver)
     {
-        parent::setDefaultSettings($resolver);
+        parent::configureSettings($resolver);
 
         $resolver
             ->setDefaults(array(
diff --git a/composer.json b/composer.json
index e806d0edbf..47fbe189bb 100644
--- a/composer.json
+++ b/composer.json
@@ -17,36 +17,37 @@
         }
     ],
     "require": {
-        "symfony/http-foundation": "~2.3|~3.0",
-        "symfony/form": "^2.3.5|~3.0",
-        "symfony/validator": "~2.3|~3.0",
-        "symfony/security-bundle": "~2.3|~3.0",
-        "symfony/routing": "~2.3|~3.0",
-        "symfony/config": "^2.3.9|~3.0",
-        "symfony/console": "~2.3|~3.0",
-        "symfony/twig-bridge": "^2.3.5|~3.0",
-        "symfony/class-loader":"~2.3|~3.0",
-        "symfony/expression-language": "~2.4|~3.0",
-        "symfony/templating":"~2.3|~3.0",
-        "symfony/translation":"~2.3|~3.0",
-        "symfony/dependency-injection": "^2.3.3|~3.0",
-        "symfony/property-access": "~2.3|~3.0",
-        "symfony/security-acl": "~2.3|~3.0",
-        "twig/twig": "~1.23",
-        "twig/extensions": "~1.0",
-        "sonata-project/exporter": "~1.0",
-        "sonata-project/block-bundle": "^2.3.9",
-        "sonata-project/core-bundle": "^2.3.10",
-        "doctrine/common": "~2.2",
-        "doctrine/inflector": "~1.0",
+        "php": "^5.3 || ^7.0",
+        "symfony/http-foundation": "^2.3 || ^3.0",
+        "symfony/form": "^2.3.5 || ^3.0",
+        "symfony/validator": "^2.3 || ^3.0",
+        "symfony/security-bundle": "^2.3 || ^3.0",
+        "symfony/routing": "^2.3 || ^3.0",
+        "symfony/config": "^2.3.9 || ^3.0",
+        "symfony/console": "^2.3 || ^3.0",
+        "symfony/twig-bridge": "^2.3.5 || ^3.0",
+        "symfony/class-loader":"^2.3 || ^3.0",
+        "symfony/expression-language": "^2.4 || ^3.0",
+        "symfony/templating":"^2.3 || ^3.0",
+        "symfony/translation":"^2.3 || ^3.0",
+        "symfony/dependency-injection": "^2.3.3 || ^3.0",
+        "symfony/property-access": "^2.3 || ^3.0",
+        "symfony/security-acl": "^2.3 || ^3.0",
+        "twig/twig": "^1.23",
+        "twig/extensions": "^1.0",
+        "sonata-project/exporter": "^1.0",
+        "sonata-project/block-bundle": "3.x-dev@dev",
+        "sonata-project/core-bundle": "3.x-dev@dev",
+        "doctrine/common": "^2.2",
+        "doctrine/inflector": "^1.0",
         "knplabs/knp-menu-bundle": "^2.1.1"
     },
     "require-dev": {
-        "jms/di-extra-bundle": "~1.7",
-        "sensio/generator-bundle": "~2.3|~3.0",
-        "symfony/yaml": "~2.3|~3.0",
+        "jms/di-extra-bundle": "^1.7",
+        "sensio/generator-bundle": "^2.3 || ^3.0",
+        "symfony/yaml": "^2.3 || ^3.0",
         "sonata-project/intl-bundle": "^2.2.4",
-        "symfony/phpunit-bridge": "~2.7|~3.0"
+        "symfony/phpunit-bridge": "^2.7 || ^3.0"
     },
     "conflict": {
         "jms/di-extra-bundle": "<1.7.0"