Add support for doctrine/persistence 2

sonata-project · Dec 18, 2020 · 28a3b93 · 28a3b93
1 parent 6a6b934
commit 28a3b93
Show file tree

Hide file tree

Showing 5 changed files with 6 additions and 6 deletions.
diff --git a/composer.json b/composer.json
@@ -23,7 +23,7 @@
     "require": {
         "php": "^7.3",
         "doctrine/doctrine-bundle": "^1.12 || ^2.0",
-        "doctrine/persistence": "^1.3",
+        "doctrine/persistence": "^1.3 || ^2.0",
         "laminas/laminas-diagnostics": "^1.6",
         "sonata-project/datagrid-bundle": "^3.0",
         "sonata-project/doctrine-extensions": "^1.10.1",

diff --git a/src/Selector/ErroneousMessagesSelector.php b/src/Selector/ErroneousMessagesSelector.php
@@ -13,7 +13,7 @@
 
 namespace Sonata\NotificationBundle\Selector;
 
-use Doctrine\Common\Persistence\ManagerRegistry;
+use Doctrine\Persistence\ManagerRegistry;
 use Sonata\NotificationBundle\Model\MessageInterface;
 
 class ErroneousMessagesSelector

diff --git a/tests/Entity/MessageManagerTest.php b/tests/Entity/MessageManagerTest.php
@@ -13,12 +13,12 @@
 
 namespace Sonata\NotificationBundle\Tests\Entity;
 
-use Doctrine\Common\Persistence\ManagerRegistry;
-use Doctrine\Common\Persistence\Mapping\ClassMetadata;
 use Doctrine\ORM\AbstractQuery;
 use Doctrine\ORM\EntityManager;
 use Doctrine\ORM\EntityRepository;
 use Doctrine\ORM\QueryBuilder;
+use Doctrine\Persistence\ManagerRegistry;
+use Doctrine\Persistence\Mapping\ClassMetadata;
 use PHPUnit\Framework\TestCase;
 use Sonata\NotificationBundle\Entity\BaseMessage;
 use Sonata\NotificationBundle\Entity\MessageManager;

diff --git a/tests/Iterator/MessageManagerMessageIterator.php b/tests/Iterator/MessageManagerMessageIterator.php
@@ -13,7 +13,7 @@
 
 namespace Sonata\NotificationBundle\Tests\Iterator;
 
-use Doctrine\Common\Persistence\ManagerRegistry;
+use Doctrine\Persistence\ManagerRegistry;
 use Sonata\NotificationBundle\Iterator\MessageManagerMessageIterator as Iterator;
 use Sonata\NotificationBundle\Model\Message;
 use Sonata\NotificationBundle\Tests\Entity\MessageManagerMock;

diff --git a/tests/Iterator/MessageManagerMessageIteratorTest.php b/tests/Iterator/MessageManagerMessageIteratorTest.php
@@ -13,7 +13,7 @@
 
 namespace Sonata\NotificationBundle\Tests\Iterator;
 
-use Doctrine\Common\Persistence\ManagerRegistry;
+use Doctrine\Persistence\ManagerRegistry;
 use PHPUnit\Framework\TestCase;
 
 /**