Removed CoreBundle deprecations

sonata-project · Jan 15, 2019 · 5a3f9c4 · 5a3f9c4
1 parent 4303e3e
commit 5a3f9c4
Show file tree

Hide file tree

Showing 21 changed files with 27 additions and 27 deletions.
diff --git a/composer.json b/composer.json
@@ -24,12 +24,12 @@
         "php": "^7.1",
         "cocur/slugify": "^1.0 || ^2.0 || ^3.0",
         "sonata-project/admin-bundle": "^3.35",
-        "sonata-project/block-bundle": "^3.11",
+        "sonata-project/block-bundle": "^3.14",
         "sonata-project/cache": "^1.0.2 || ^2.0",
         "sonata-project/cache-bundle": "^2.4",
-        "sonata-project/core-bundle": "^3.9",
+        "sonata-project/core-bundle": "^3.14",
         "sonata-project/datagrid-bundle": "^2.3",
-        "sonata-project/doctrine-extensions": "^1.0",
+        "sonata-project/doctrine-extensions": "^1.1.3",
         "sonata-project/doctrine-orm-admin-bundle": "^3.5",
         "sonata-project/easy-extends-bundle": "^2.5",
         "sonata-project/notification-bundle": "^3.3",

diff --git a/src/Admin/SiteAdmin.php b/src/Admin/SiteAdmin.php
@@ -19,7 +19,7 @@
 use Sonata\AdminBundle\Form\FormMapper;
 use Sonata\AdminBundle\Route\RouteCollection;
 use Sonata\AdminBundle\Show\ShowMapper;
-use Sonata\CoreBundle\Form\Type\DateTimePickerType;
+use Sonata\Form\Type\DateTimePickerType;
 use Sonata\PageBundle\Route\RoutePageGenerator;
 use Symfony\Component\Form\Extension\Core\Type\LocaleType;
 use Symfony\Component\Form\Extension\Core\Type\TextareaType;

diff --git a/src/Admin/SnapshotAdmin.php b/src/Admin/SnapshotAdmin.php
@@ -18,7 +18,7 @@
 use Sonata\AdminBundle\Datagrid\ListMapper;
 use Sonata\AdminBundle\Form\FormMapper;
 use Sonata\Cache\CacheManagerInterface;
-use Sonata\CoreBundle\Form\Type\DateTimePickerType;
+use Sonata\Form\Type\DateTimePickerType;
 
 /**
  * Admin definition for the Snapshot class.

diff --git a/src/Block/ChildrenPagesBlockService.php b/src/Block/ChildrenPagesBlockService.php
@@ -17,7 +17,7 @@
 use Sonata\BlockBundle\Block\BlockContextInterface;
 use Sonata\BlockBundle\Block\Service\AbstractAdminBlockService;
 use Sonata\BlockBundle\Model\BlockInterface;
-use Sonata\CoreBundle\Form\Type\ImmutableArrayType;
+use Sonata\Form\Type\ImmutableArrayType;
 use Sonata\PageBundle\CmsManager\CmsManagerSelectorInterface;
 use Sonata\PageBundle\Exception\PageNotFoundException;
 use Sonata\PageBundle\Form\Type\PageSelectorType;

diff --git a/src/Block/PageListBlockService.php b/src/Block/PageListBlockService.php
@@ -16,9 +16,9 @@
 use Sonata\AdminBundle\Form\FormMapper;
 use Sonata\BlockBundle\Block\BlockContextInterface;
 use Sonata\BlockBundle\Block\Service\AbstractAdminBlockService;
+use Sonata\BlockBundle\Meta\Metadata;
 use Sonata\BlockBundle\Model\BlockInterface;
-use Sonata\CoreBundle\Form\Type\ImmutableArrayType;
-use Sonata\CoreBundle\Model\Metadata;
+use Sonata\Form\Type\ImmutableArrayType;
 use Sonata\PageBundle\Model\Page;
 use Sonata\PageBundle\Model\PageManagerInterface;
 use Symfony\Bundle\FrameworkBundle\Templating\EngineInterface;

diff --git a/src/Block/SharedBlockBlockService.php b/src/Block/SharedBlockBlockService.php
@@ -20,8 +20,8 @@
 use Sonata\BlockBundle\Block\Service\AbstractAdminBlockService;
 use Sonata\BlockBundle\Model\BlockInterface;
 use Sonata\BlockBundle\Model\BlockManagerInterface;
-use Sonata\CoreBundle\Form\Type\ImmutableArrayType;
 use Sonata\CoreBundle\Validator\ErrorElement;
+use Sonata\Form\Type\ImmutableArrayType;
 use Sonata\PageBundle\Admin\SharedBlockAdmin;
 use Sonata\PageBundle\Model\Block;
 use Symfony\Component\DependencyInjection\ContainerInterface;

diff --git a/src/Entity/BlockManager.php b/src/Entity/BlockManager.php
@@ -14,9 +14,9 @@
 namespace Sonata\PageBundle\Entity;
 
 use Sonata\BlockBundle\Model\BlockManagerInterface;
-use Sonata\CoreBundle\Model\BaseEntityManager;
 use Sonata\DatagridBundle\Pager\Doctrine\Pager;
 use Sonata\DatagridBundle\ProxyQuery\Doctrine\ProxyQuery;
+use Sonata\Doctrine\Entity\BaseEntityManager;
 
 /**
  * This class manages BlockInterface persistency with the Doctrine ORM.

diff --git a/src/Entity/PageManager.php b/src/Entity/PageManager.php
@@ -14,9 +14,9 @@
 namespace Sonata\PageBundle\Entity;
 
 use Doctrine\Common\Persistence\ManagerRegistry;
-use Sonata\CoreBundle\Model\BaseEntityManager;
 use Sonata\DatagridBundle\Pager\Doctrine\Pager;
 use Sonata\DatagridBundle\ProxyQuery\Doctrine\ProxyQuery;
+use Sonata\Doctrine\Entity\BaseEntityManager;
 use Sonata\PageBundle\Model\Page;
 use Sonata\PageBundle\Model\PageInterface;
 use Sonata\PageBundle\Model\PageManagerInterface;

diff --git a/src/Entity/SiteManager.php b/src/Entity/SiteManager.php
@@ -13,9 +13,9 @@
 
 namespace Sonata\PageBundle\Entity;
 
-use Sonata\CoreBundle\Model\BaseEntityManager;
 use Sonata\DatagridBundle\Pager\Doctrine\Pager;
 use Sonata\DatagridBundle\ProxyQuery\Doctrine\ProxyQuery;
+use Sonata\Doctrine\Entity\BaseEntityManager;
 use Sonata\PageBundle\Model\SiteManagerInterface;
 
 /**

diff --git a/src/Entity/SnapshotManager.php b/src/Entity/SnapshotManager.php
@@ -14,9 +14,9 @@
 namespace Sonata\PageBundle\Entity;
 
 use Doctrine\Common\Persistence\ManagerRegistry;
-use Sonata\CoreBundle\Model\BaseEntityManager;
 use Sonata\DatagridBundle\Pager\Doctrine\Pager;
 use Sonata\DatagridBundle\ProxyQuery\Doctrine\ProxyQuery;
+use Sonata\Doctrine\Entity\BaseEntityManager;
 use Sonata\PageBundle\Model\PageInterface;
 use Sonata\PageBundle\Model\SnapshotInterface;
 use Sonata\PageBundle\Model\SnapshotManagerInterface;

diff --git a/src/Form/Type/ApiBlockType.php b/src/Form/Type/ApiBlockType.php
@@ -13,7 +13,7 @@
 
 namespace Sonata\PageBundle\Form\Type;
 
-use Sonata\CoreBundle\Form\Type\BaseDoctrineORMSerializationType;
+use Sonata\Form\Type\BaseDoctrineORMSerializationType;
 
 class ApiBlockType extends BaseDoctrineORMSerializationType
 {

diff --git a/src/Form/Type/ApiPageType.php b/src/Form/Type/ApiPageType.php
@@ -13,7 +13,7 @@
 
 namespace Sonata\PageBundle\Form\Type;
 
-use Sonata\CoreBundle\Form\Type\BaseDoctrineORMSerializationType;
+use Sonata\Form\Type\BaseDoctrineORMSerializationType;
 
 class ApiPageType extends BaseDoctrineORMSerializationType
 {

diff --git a/src/Form/Type/ApiSiteType.php b/src/Form/Type/ApiSiteType.php
@@ -13,7 +13,7 @@
 
 namespace Sonata\PageBundle\Form\Type;
 
-use Sonata\CoreBundle\Form\Type\BaseDoctrineORMSerializationType;
+use Sonata\Form\Type\BaseDoctrineORMSerializationType;
 
 class ApiSiteType extends BaseDoctrineORMSerializationType
 {

diff --git a/src/Model/PageManagerInterface.php b/src/Model/PageManagerInterface.php
@@ -13,8 +13,8 @@
 
 namespace Sonata\PageBundle\Model;
 
-use Sonata\CoreBundle\Model\ManagerInterface;
-use Sonata\CoreBundle\Model\PageableManagerInterface;
+use Sonata\Doctrine\Model\ManagerInterface;
+use Sonata\Doctrine\Model\PageableManagerInterface;
 
 /**
  * Defines methods to interact with the persistency layer of a PageInterface.

diff --git a/src/Model/SiteManagerInterface.php b/src/Model/SiteManagerInterface.php
@@ -13,8 +13,8 @@
 
 namespace Sonata\PageBundle\Model;
 
-use Sonata\CoreBundle\Model\ManagerInterface;
-use Sonata\CoreBundle\Model\PageableManagerInterface;
+use Sonata\Doctrine\Model\ManagerInterface;
+use Sonata\Doctrine\Model\PageableManagerInterface;
 
 /**
  * SiteManagerInterface.

diff --git a/src/Model/SnapshotManagerInterface.php b/src/Model/SnapshotManagerInterface.php
@@ -13,8 +13,8 @@
 
 namespace Sonata\PageBundle\Model;
 
-use Sonata\CoreBundle\Model\ManagerInterface;
-use Sonata\CoreBundle\Model\PageableManagerInterface;
+use Sonata\Doctrine\Model\ManagerInterface;
+use Sonata\Doctrine\Model\PageableManagerInterface;
 
 /**
  * Defines methods to interact with the persistency layer of a SnapshotInterface.

diff --git a/src/Resources/config/validation.xml b/src/Resources/config/validation.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <constraint-mapping xmlns="http://symfony.com/schema/dic/constraint-mapping" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://symfony.com/schema/dic/constraint-mapping         http://symfony.com/schema/dic/services/constraint-mapping-1.0.xsd">
     <class name="Sonata\BlockBundle\Model\BaseBlock">
-        <constraint name="Sonata\CoreBundle\Validator\Constraints\InlineConstraint">
+        <constraint name="Sonata\Form\Validator\Constraints\InlineConstraint">
             <option name="service">sonata.block.manager</option>
             <option name="method">validate</option>
         </constraint>

diff --git a/src/Serializer/BlockSerializerHandler.php b/src/Serializer/BlockSerializerHandler.php
@@ -13,7 +13,7 @@
 
 namespace Sonata\PageBundle\Serializer;
 
-use Sonata\CoreBundle\Serializer\BaseSerializerHandler;
+use Sonata\Serializer\BaseSerializerHandler;
 
 /**
  * @author Sylvain Deloux <[email protected]>

diff --git a/src/Serializer/PageSerializerHandler.php b/src/Serializer/PageSerializerHandler.php
@@ -13,7 +13,7 @@
 
 namespace Sonata\PageBundle\Serializer;
 
-use Sonata\CoreBundle\Serializer\BaseSerializerHandler;
+use Sonata\Serializer\BaseSerializerHandler;
 
 /**
  * @author Sylvain Deloux <[email protected]>

diff --git a/src/Serializer/SiteSerializerHandler.php b/src/Serializer/SiteSerializerHandler.php
@@ -13,7 +13,7 @@
 
 namespace Sonata\PageBundle\Serializer;
 
-use Sonata\CoreBundle\Serializer\BaseSerializerHandler;
+use Sonata\Serializer\BaseSerializerHandler;
 
 /**
  * @author Sylvain Deloux <[email protected]>

diff --git a/src/Serializer/SnapshotSerializerHandler.php b/src/Serializer/SnapshotSerializerHandler.php
@@ -13,7 +13,7 @@
 
 namespace Sonata\PageBundle\Serializer;
 
-use Sonata\CoreBundle\Serializer\BaseSerializerHandler;
+use Sonata\Serializer\BaseSerializerHandler;
 
 /**
  * @author Benoit de JAcobet <[email protected]>