Merge pull request #271 from symfony-cmf/fix_deprecations

Fix deprecations
symfony-cmf · Jan 29, 2017 · 0674e5c · 0674e5c
2 parents 7b75f4a + f442124
commit 0674e5c
Show file tree

Hide file tree

Showing 8 changed files with 21 additions and 21 deletions.
diff --git a/composer.json b/composer.json
@@ -16,15 +16,15 @@
         "symfony/framework-bundle": "^2.8|^3.0",
         "doctrine/phpcr-bundle" :"^1.0",
         "doctrine/phpcr-odm": "^1.4|^2.0",
-        "sonata-project/block-bundle": "^2.2.12|^3.0",
+        "sonata-project/block-bundle": "^3.3",
         "symfony-cmf/core-bundle": "^2.0"
     },
     "require-dev": {
         "symfony-cmf/testing": "^1.3|^2.0",
         "symfony-cmf/menu-bundle": "^2.0",
         "symfony/phpunit-bridge": "^3.2",
         "sonata-project/cache-bundle": "^2.1.3,<2.3",
-        "sonata-project/core-bundle": "^2.2.5|^3.0",
+        "sonata-project/core-bundle": "^3.0",
         "twig/twig": "^1.14.2|^2.0"
     },
     "minimum-stability": "dev",

diff --git a/src/Block/ActionBlockService.php b/src/Block/ActionBlockService.php
@@ -11,16 +11,16 @@
 
 namespace Symfony\Cmf\Bundle\BlockBundle\Block;
 
-use Sonata\BlockBundle\Block\BaseBlockService;
 use Sonata\BlockBundle\Block\BlockContextInterface;
+use Sonata\BlockBundle\Block\Service\AbstractBlockService;
 use Symfony\Bundle\FrameworkBundle\Templating\EngineInterface;
 use Symfony\Cmf\Bundle\BlockBundle\Doctrine\Phpcr\ActionBlock;
 use Symfony\Component\HttpFoundation\RequestStack;
 use Symfony\Component\HttpFoundation\Response;
 use Symfony\Component\HttpKernel\Controller\ControllerReference;
 use Symfony\Component\HttpKernel\Fragment\FragmentHandler;
 
-class ActionBlockService extends BaseBlockService
+class ActionBlockService extends AbstractBlockService
 {
     /**
      * @var RequestStack

diff --git a/src/Block/ContainerBlockService.php b/src/Block/ContainerBlockService.php
@@ -11,16 +11,16 @@
 
 namespace Symfony\Cmf\Bundle\BlockBundle\Block;
 
-use Sonata\BlockBundle\Block\BaseBlockService;
 use Sonata\BlockBundle\Block\BlockContextInterface;
 use Sonata\BlockBundle\Block\BlockRendererInterface;
-use Sonata\BlockBundle\Block\BlockServiceInterface;
+use Sonata\BlockBundle\Block\Service\AbstractBlockService;
+use Sonata\BlockBundle\Block\Service\BlockServiceInterface;
 use Symfony\Bundle\FrameworkBundle\Templating\EngineInterface;
 use Symfony\Component\HttpFoundation\Response;
 use Symfony\Component\OptionsResolver\OptionsResolverInterface;
 use Symfony\Component\OptionsResolver\OptionsResolver;
 
-class ContainerBlockService extends BaseBlockService implements BlockServiceInterface
+class ContainerBlockService extends AbstractBlockService implements BlockServiceInterface
 {
     /**
      * @var BlockRendererInterface

diff --git a/src/Block/MenuBlockService.php b/src/Block/MenuBlockService.php
@@ -11,9 +11,9 @@
 
 namespace Symfony\Cmf\Bundle\BlockBundle\Block;
 
-use Sonata\BlockBundle\Block\BaseBlockService;
 use Sonata\BlockBundle\Block\BlockContextInterface;
-use Sonata\BlockBundle\Block\BlockServiceInterface;
+use Sonata\BlockBundle\Block\Service\BlockServiceInterface;
+use Sonata\BlockBundle\Block\Service\AbstractBlockService;
 use Symfony\Component\HttpFoundation\Response;
 use Symfony\Component\OptionsResolver\OptionsResolver;
 use Symfony\Component\OptionsResolver\OptionsResolverInterface;
@@ -23,7 +23,7 @@
  *
  * @author Philipp A. Mohrenweiser <phiamo@googlemail.com>
  */
-class MenuBlockService extends BaseBlockService implements BlockServiceInterface
+class MenuBlockService extends AbstractBlockService implements BlockServiceInterface
 {
     protected $template = 'CmfBlockBundle:Block:block_menu.html.twig';
 

diff --git a/src/Block/ReferenceBlockService.php b/src/Block/ReferenceBlockService.php
@@ -11,15 +11,15 @@
 
 namespace Symfony\Cmf\Bundle\BlockBundle\Block;
 
-use Sonata\BlockBundle\Block\BaseBlockService;
 use Sonata\BlockBundle\Block\BlockContextInterface;
 use Sonata\BlockBundle\Block\BlockContextManagerInterface;
 use Sonata\BlockBundle\Block\BlockRendererInterface;
-use Sonata\BlockBundle\Block\BlockServiceInterface;
+use Sonata\BlockBundle\Block\Service\BlockServiceInterface;
+use Sonata\BlockBundle\Block\Service\AbstractBlockService;
 use Symfony\Bundle\FrameworkBundle\Templating\EngineInterface;
 use Symfony\Component\HttpFoundation\Response;
 
-class ReferenceBlockService extends BaseBlockService implements BlockServiceInterface
+class ReferenceBlockService extends AbstractBlockService implements BlockServiceInterface
 {
     protected $blockRenderer;
     protected $blockContextManager;

diff --git a/src/Block/SimpleBlockService.php b/src/Block/SimpleBlockService.php
@@ -11,14 +11,14 @@
 
 namespace Symfony\Cmf\Bundle\BlockBundle\Block;
 
-use Sonata\BlockBundle\Block\BaseBlockService;
 use Sonata\BlockBundle\Block\BlockContextInterface;
-use Sonata\BlockBundle\Block\BlockServiceInterface;
+use Sonata\BlockBundle\Block\Service\AbstractBlockService;
+use Sonata\BlockBundle\Block\Service\BlockServiceInterface;
 use Symfony\Component\HttpFoundation\Response;
 use Symfony\Component\OptionsResolver\OptionsResolver;
 use Symfony\Component\OptionsResolver\OptionsResolverInterface;
 
-class SimpleBlockService extends BaseBlockService implements BlockServiceInterface
+class SimpleBlockService extends AbstractBlockService implements BlockServiceInterface
 {
     protected $template = 'CmfBlockBundle:Block:block_simple.html.twig';
 

diff --git a/src/Block/StringBlockService.php b/src/Block/StringBlockService.php
@@ -11,14 +11,14 @@
 
 namespace Symfony\Cmf\Bundle\BlockBundle\Block;
 
-use Sonata\BlockBundle\Block\BaseBlockService;
 use Sonata\BlockBundle\Block\BlockContextInterface;
-use Sonata\BlockBundle\Block\BlockServiceInterface;
+use Sonata\BlockBundle\Block\Service\BlockServiceInterface;
+use Sonata\BlockBundle\Block\Service\AbstractBlockService;
 use Symfony\Component\HttpFoundation\Response;
 use Symfony\Component\OptionsResolver\OptionsResolver;
 use Symfony\Component\OptionsResolver\OptionsResolverInterface;
 
-class StringBlockService extends BaseBlockService implements BlockServiceInterface
+class StringBlockService extends AbstractBlockService implements BlockServiceInterface
 {
     protected $template = 'CmfBlockBundle:Block:block_string.html.twig';
 

diff --git a/src/Doctrine/Phpcr/AbstractBlock.php b/src/Doctrine/Phpcr/AbstractBlock.php
@@ -48,13 +48,13 @@ public function getParentDocument()
     /**
      * Validate settings.
      *
-     * @param ExecutionContext $context
+     * @param ExecutionContextInterface $context
      */
     public function isSettingsValid(ExecutionContextInterface $context)
     {
         foreach ($this->getSettings() as $value) {
             if (is_array($value)) {
-                $context->addViolationAt('settings', 'A multidimensional array is not allowed, only use key-value pairs.');
+                $context->addViolation('settings', 'A multidimensional array is not allowed, only use key-value pairs.');
             }
         }
     }