migrate ErrorElement

sonata-project · Mar 10, 2015 · 06fac25 · 06fac25 · krzysztof-alboszta · Mar 16, 2015
1 parent e8e0cd4
commit 06fac25
Show file tree

Hide file tree

Showing 12 changed files with 15 additions and 15 deletions.
diff --git a/Block/BaseBlockService.php b/Block/BaseBlockService.php
@@ -11,7 +11,7 @@
 
 namespace Sonata\BlockBundle\Block;
 
-use Sonata\AdminBundle\Validator\ErrorElement;
+use Sonata\CoreBundle\Validator\ErrorElement;
 use Symfony\Component\HttpFoundation\Response;
 use Symfony\Bundle\FrameworkBundle\Templating\EngineInterface;
 use Sonata\BlockBundle\Model\BlockInterface;

diff --git a/Block/BlockAdminServiceInterface.php b/Block/BlockAdminServiceInterface.php
@@ -13,7 +13,7 @@
 
 use Sonata\AdminBundle\Form\FormMapper;
 use Sonata\BlockBundle\Model\BlockInterface;
-use Sonata\AdminBundle\Validator\ErrorElement;
+use Sonata\CoreBundle\Validator\ErrorElement;
 
 interface BlockAdminServiceInterface
 {
@@ -43,7 +43,7 @@ public function validateBlock(ErrorElement $errorElement, BlockInterface $block)
 
     /**
      * @param null $code
-     * 
+     *
      * @return MetadataInterface
      */
     public function getBlockMetadata($code = null);

diff --git a/Block/BlockServiceInterface.php b/Block/BlockServiceInterface.php
@@ -13,7 +13,7 @@
 
 use Sonata\AdminBundle\Form\FormMapper;
 use Sonata\BlockBundle\Model\BlockInterface;
-use Sonata\AdminBundle\Validator\ErrorElement;
+use Sonata\CoreBundle\Validator\ErrorElement;
 
 use Symfony\Component\HttpFoundation\Response;
 use Symfony\Component\OptionsResolver\OptionsResolverInterface;

diff --git a/Block/BlockServiceManager.php b/Block/BlockServiceManager.php
@@ -13,7 +13,7 @@
 
 use Sonata\BlockBundle\Model\BlockInterface;
 
-use Sonata\AdminBundle\Validator\ErrorElement;
+use Sonata\CoreBundle\Validator\ErrorElement;
 
 use Psr\Log\LoggerInterface;
 use Symfony\Component\DependencyInjection\ContainerInterface;

diff --git a/Block/BlockServiceManagerInterface.php b/Block/BlockServiceManagerInterface.php
@@ -10,7 +10,7 @@
 
 namespace Sonata\BlockBundle\Block;
 
-use Sonata\AdminBundle\Validator\ErrorElement;
+use Sonata\CoreBundle\Validator\ErrorElement;
 use Sonata\BlockBundle\Model\BlockInterface;
 
 interface BlockServiceManagerInterface

diff --git a/Block/Service/ContainerBlockService.php b/Block/Service/ContainerBlockService.php
@@ -11,7 +11,7 @@
 namespace Sonata\BlockBundle\Block\Service;
 
 use Sonata\AdminBundle\Form\FormMapper;
-use Sonata\AdminBundle\Validator\ErrorElement;
+use Sonata\CoreBundle\Validator\ErrorElement;
 
 use Sonata\BlockBundle\Block\BaseBlockService;
 use Sonata\BlockBundle\Block\BlockContextInterface;

diff --git a/Block/Service/EmptyBlockService.php b/Block/Service/EmptyBlockService.php
@@ -15,7 +15,7 @@
 use Symfony\Component\HttpFoundation\Response;
 use Sonata\AdminBundle\Form\FormMapper;
 use Sonata\BlockBundle\Model\BlockInterface;
-use Sonata\AdminBundle\Validator\ErrorElement;
+use Sonata\CoreBundle\Validator\ErrorElement;
 use Sonata\BlockBundle\Block\BaseBlockService;
 
 class EmptyBlockService extends BaseBlockService

diff --git a/Block/Service/MenuBlockService.php b/Block/Service/MenuBlockService.php
@@ -14,7 +14,7 @@
 use Knp\Menu\ItemInterface;
 use Knp\Menu\Provider\MenuProviderInterface;
 use Sonata\AdminBundle\Form\FormMapper;
-use Sonata\AdminBundle\Validator\ErrorElement;
+use Sonata\CoreBundle\Validator\ErrorElement;
 use Sonata\BlockBundle\Block\BaseBlockService;
 use Sonata\BlockBundle\Block\BlockContextInterface;
 use Sonata\BlockBundle\Model\BlockInterface;

diff --git a/Block/Service/RssBlockService.php b/Block/Service/RssBlockService.php
@@ -15,7 +15,7 @@
 use Symfony\Component\OptionsResolver\OptionsResolverInterface;
 
 use Sonata\AdminBundle\Form\FormMapper;
-use Sonata\AdminBundle\Validator\ErrorElement;
+use Sonata\CoreBundle\Validator\ErrorElement;
 
 use Sonata\BlockBundle\Model\BlockInterface;
 use Sonata\BlockBundle\Block\BlockContextInterface;

diff --git a/Block/Service/TextBlockService.php b/Block/Service/TextBlockService.php
@@ -15,7 +15,7 @@
 use Symfony\Component\HttpFoundation\Response;
 
 use Sonata\AdminBundle\Form\FormMapper;
-use Sonata\AdminBundle\Validator\ErrorElement;
+use Sonata\CoreBundle\Validator\ErrorElement;
 
 use Sonata\BlockBundle\Model\BlockInterface;
 use Sonata\BlockBundle\Block\BaseBlockService;

diff --git a/Resources/doc/reference/your_first_block.rst b/Resources/doc/reference/your_first_block.rst
@@ -29,7 +29,7 @@ The current RSS block will extend this base class. The other `use` statements ar
     use Sonata\BlockBundle\Block\BlockContextInterface;
 
     use Sonata\AdminBundle\Form\FormMapper;
-    use Sonata\AdminBundle\Validator\ErrorElement;
+    use Sonata\CoreBundle\Validator\ErrorElement;
     use Sonata\BlockBundle\Block\BaseBlockService;
 
 Default settings
@@ -176,14 +176,14 @@ We are almost done! Now, just declare the block as a service:
 Or using YAML:
 
 .. code-block: yaml
-    
+
     services:
         sonata.block.service.rss:
             class: Sonata\BlockBundle\Block\Service\RssBlockService
             arguments:
                 - sonata.block.service.rss
                 - @templating
-            tags: 
+            tags:
                 - { name: sonata.block }
 
 Then, add the service to Sonata configuration:

diff --git a/composer.json b/composer.json
@@ -20,7 +20,7 @@
         "symfony/http-kernel": "~2.2",
         "symfony/form": "~2.2",
         "doctrine/common": "~2.3",
-        "sonata-project/core-bundle": "~2.2",
+        "sonata-project/core-bundle": "~2.3,>=2.3.1",
         "sonata-project/cache": "~1.0"
     },
     "require-dev": {