replace deprecated service and interface, use correct method

Author: ElectricMaxxx

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

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

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 <[email protected]>
  */
-class MenuBlockService extends BaseBlockService implements BlockServiceInterface
+class MenuBlockService extends AbstractBlockService implements BlockServiceInterface
 {
     protected $template = 'CmfBlockBundle:Block:block_menu.html.twig';
 

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;

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';
 

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';
 

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.');
             }
         }
     }