Fix deprecated BlockService::setDefaultSettings usage

billsworld · Jun 15, 2015 · 9a180d6 · 9a180d6
1 parent a24131f
commit 9a180d6
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 3 deletions.
diff --git a/Block/TreeBlockService.php b/Block/TreeBlockService.php
@@ -17,7 +17,7 @@
 use Sonata\BlockBundle\Model\BlockInterface;
 use Symfony\Bundle\FrameworkBundle\Templating\EngineInterface;
 use Symfony\Component\HttpFoundation\Response;
-use Symfony\Component\OptionsResolver\OptionsResolverInterface;
+use Symfony\Component\OptionsResolver\OptionsResolver;
 
 class TreeBlockService extends BaseBlockService
 {
@@ -61,7 +61,7 @@ public function execute(BlockContextInterface $blockContext, Response $response
     /**
      * {@inheritDoc}
      */
-    public function setDefaultSettings(OptionsResolverInterface $resolver)
+    public function configureSettings(OptionsResolver $resolver)
     {
         $resolver->setDefaults(array(
             'template'         => 'SonataDoctrinePHPCRAdminBundle:Block:tree.html.twig',

diff --git a/composer.json b/composer.json
@@ -4,7 +4,6 @@
     "description": "Symfony Sonata / Integrate Doctrine PHPCR into the SonataAdminBundle",
     "keywords": ["Admin Generator", "admin", "sonata", "bootstrap"],
     "license": "MIT",
-    "minimum-stability": "dev",
     "authors": [
         {
             "name": "Nacho Martin",
@@ -19,6 +18,7 @@
     "require": {
         "php": ">=5.3.9",
         "sonata-project/admin-bundle": "~2.4",
+        "sonata-project/block-bundle": "^2.3.2",
         "symfony/framework-bundle": "~2.3",
         "symfony/property-access": "~2.2",
         "doctrine/phpcr-odm": "~1.1",
@@ -32,6 +32,8 @@
     "provide": {
         "sonata-project/admin-bundle-persistency-layer": "1.0.0"
     },
+    "minimum-stability": "dev",
+    "prefer-stable": true,
     "autoload": {
         "psr-4": { "Sonata\\DoctrinePHPCRAdminBundle\\": "" }
     },