From ad7acac640a834716b0d19fbc03bf869a7defa51 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Gr=C3=A9goire=20Paris?= Date: Thu, 30 Jan 2020 21:51:27 +0100 Subject: [PATCH] Address deprecations from various bundles --- composer.json | 2 +- src/Entity/UserManager.php | 2 +- src/Entity/UserManagerProxy.php | 2 +- src/Model/GroupManagerInterface.php | 4 ++-- src/Model/UserManagerInterface.php | 4 ++-- 5 files changed, 7 insertions(+), 7 deletions(-) diff --git a/composer.json b/composer.json index 95a2ae7b0..e6738b644 100644 --- a/composer.json +++ b/composer.json @@ -25,7 +25,7 @@ "friendsofsymfony/user-bundle": "^2.0", "sonata-project/admin-bundle": "^3.34", "sonata-project/core-bundle": "^3.18", - "sonata-project/datagrid-bundle": "^2.2.1", + "sonata-project/datagrid-bundle": "^2.4.0", "sonata-project/doctrine-extensions": "^1.5.1", "sonata-project/easy-extends-bundle": "^2.2", "swiftmailer/swiftmailer": "^4.3 || ^5.0 || ^6.0", diff --git a/src/Entity/UserManager.php b/src/Entity/UserManager.php index eed8e4fd9..60c887c2f 100644 --- a/src/Entity/UserManager.php +++ b/src/Entity/UserManager.php @@ -14,9 +14,9 @@ namespace Sonata\UserBundle\Entity; use FOS\UserBundle\Doctrine\UserManager as BaseUserManager; -use Sonata\CoreBundle\Model\ManagerInterface; use Sonata\DatagridBundle\Pager\Doctrine\Pager; use Sonata\DatagridBundle\ProxyQuery\Doctrine\ProxyQuery; +use Sonata\Doctrine\Model\ManagerInterface; use Sonata\UserBundle\Model\UserInterface; use Sonata\UserBundle\Model\UserManagerInterface; diff --git a/src/Entity/UserManagerProxy.php b/src/Entity/UserManagerProxy.php index d7ad1bf7a..ff11ae79f 100644 --- a/src/Entity/UserManagerProxy.php +++ b/src/Entity/UserManagerProxy.php @@ -14,7 +14,7 @@ namespace Sonata\UserBundle\Entity; use Doctrine\Common\Persistence\ManagerRegistry; -use Sonata\CoreBundle\Model\BaseEntityManager; +use Sonata\Doctrine\Entity\BaseEntityManager; /** * This UserManageProxy class is used to keep UserManager compatible with Sonata ManagerInterface implementation diff --git a/src/Model/GroupManagerInterface.php b/src/Model/GroupManagerInterface.php index 5f627b0b3..774ae56fd 100644 --- a/src/Model/GroupManagerInterface.php +++ b/src/Model/GroupManagerInterface.php @@ -15,12 +15,12 @@ use FOS\UserBundle\Model\GroupInterface; use FOS\UserBundle\Model\GroupManagerInterface as BaseInterface; -use Sonata\CoreBundle\Model\PageableManagerInterface; +use Sonata\DatagridBundle\Pager\PageableInterface; /** * @author Hugo Briand */ -interface GroupManagerInterface extends BaseInterface, PageableManagerInterface +interface GroupManagerInterface extends BaseInterface, PageableInterface { /** * Alias for the repository method. diff --git a/src/Model/UserManagerInterface.php b/src/Model/UserManagerInterface.php index 7b7147ea8..fad925736 100644 --- a/src/Model/UserManagerInterface.php +++ b/src/Model/UserManagerInterface.php @@ -14,12 +14,12 @@ namespace Sonata\UserBundle\Model; use FOS\UserBundle\Model\UserManagerInterface as BaseInterface; -use Sonata\CoreBundle\Model\PageableManagerInterface; +use Sonata\DatagridBundle\Pager\PageableInterface; /** * @author Hugo Briand */ -interface UserManagerInterface extends BaseInterface, PageableManagerInterface +interface UserManagerInterface extends BaseInterface, PageableInterface { /** * Alias for the repository method.