Upgrade to doctrine bundle 2.0 and persistence 2.0

composer.json

@@ -17,7 +17,7 @@
     "require": {
         "php": "^7.2",
         "cocur/slugify": "^4.0",
-        "doctrine/doctrine-bundle": "^1.0",
+        "doctrine/doctrine-bundle": "^1.8 || ^2.0",
         "knplabs/knp-menu-bundle": "^2.1",
         "knplabs/knp-paginator-bundle": "^2.6",
         "kriswallsmith/buzz": "^0.15 || 0.16.0",
@@ -69,6 +69,7 @@
         "sonata-project/core-bundle": "<3.20"
     },
     "require-dev": {
+        "doctrine/persistence": "^1.3.6 || ^2.0",
         "friendsofsymfony/rest-bundle": "^2.2 || ^3.0",
         "jms/serializer-bundle": "^2.0 || ^3.0",
         "matthiasnoback/symfony-config-test": "^4.0",

tests/Component/Basket/BasketElementManagerTest.php

@@ -13,9 +13,9 @@
 
 namespace Sonata\Component\Tests\Basket;
 
-use Doctrine\Common\Persistence\ManagerRegistry;
 use Doctrine\ORM\EntityManager;
 use Doctrine\ORM\EntityRepository;
+use Doctrine\Persistence\ManagerRegistry;
 use PHPUnit\Framework\TestCase;
 use Sonata\Component\Basket\BasketElement;
 use Sonata\Component\Basket\BasketElementManager;

tests/Component/Basket/BasketManagerTest.php

@@ -13,9 +13,9 @@
 
 namespace Sonata\Component\Tests\Basket;
 
-use Doctrine\Common\Persistence\ManagerRegistry;
 use Doctrine\ORM\EntityManager;
 use Doctrine\ORM\EntityRepository;
+use Doctrine\Persistence\ManagerRegistry;
 use PHPUnit\Framework\TestCase;
 use Sonata\BasketBundle\Entity\BaseBasket;
 use Sonata\Component\Basket\Basket;

tests/Component/Currency/CurrencyManagerTest.php

@@ -13,7 +13,7 @@
 
 namespace Sonata\Component\Tests\Currency;
 
-use Doctrine\Common\Persistence\ManagerRegistry;
+use Doctrine\Persistence\ManagerRegistry;
 use PHPUnit\Framework\TestCase;
 use Sonata\Component\Currency\Currency;
 use Sonata\Component\Currency\CurrencyManager;

tests/Component/Product/BaseProductServiceTest.php

@@ -14,9 +14,9 @@
 namespace Sonata\Component\Tests\Product;
 
 use Doctrine\Common\Collections\ArrayCollection;
-use Doctrine\Common\Persistence\ManagerRegistry;
 use Doctrine\ORM\EntityManager;
 use Doctrine\ORM\EntityRepository;
+use Doctrine\Persistence\ManagerRegistry;
 use JMS\Serializer\SerializerInterface;
 use PHPUnit\Framework\TestCase;
 use Sonata\Component\Basket\BasketElement;

tests/CustomerBundle/Entity/AddressManagerTest.php

@@ -13,8 +13,8 @@
 
 namespace Sonata\CustomerBundle\Tests\Entity;
 
-use Doctrine\Common\Persistence\ManagerRegistry;
 use Doctrine\ORM\EntityManager;
+use Doctrine\Persistence\ManagerRegistry;
 use PHPUnit\Framework\TestCase;
 use Sonata\Component\Customer\AddressInterface;
 use Sonata\Component\Customer\CustomerInterface;

tests/CustomerBundle/Entity/CustomerManagerTest.php

@@ -13,7 +13,7 @@
 
 namespace Sonata\CustomerBundle\Tests\Entity;
 
-use Doctrine\Common\Persistence\ManagerRegistry;
+use Doctrine\Persistence\ManagerRegistry;
 use PHPUnit\Framework\TestCase;
 use Sonata\CustomerBundle\Entity\BaseCustomer;
 use Sonata\CustomerBundle\Entity\CustomerManager;

tests/InvoiceBundle/Entity/InvoiceManagerTest.php

@@ -13,7 +13,7 @@
 
 namespace Sonata\InvoiceBundle\Tests\Entity;
 
-use Doctrine\Common\Persistence\ManagerRegistry;
+use Doctrine\Persistence\ManagerRegistry;
 use PHPUnit\Framework\TestCase;
 use Sonata\Doctrine\Test\EntityManagerMockFactoryTrait;
 use Sonata\InvoiceBundle\Entity\BaseInvoice;

tests/OrderBundle/Entity/OrderManagerTest.php

@@ -13,8 +13,8 @@
 
 namespace Sonata\OrderBundle\Tests\Entity;
 
-use Doctrine\Common\Persistence\ManagerRegistry;
 use Doctrine\ORM\EntityManager;
+use Doctrine\Persistence\ManagerRegistry;
 use PHPUnit\Framework\TestCase;
 use Sonata\Doctrine\Test\EntityManagerMockFactoryTrait;
 use Sonata\OrderBundle\Entity\BaseOrder;

tests/PaymentBundle/Consumer/PaymentProcessOrderElementConsumerTest.php

@@ -13,7 +13,7 @@
 
 namespace Sonata\PaymentBundle\Tests\Consumer;
 
-use Doctrine\Common\Persistence\ManagerRegistry;
+use Doctrine\Persistence\ManagerRegistry;
 use PHPUnit\Framework\TestCase;
 use Sonata\Component\Order\OrderInterface;
 use Sonata\Component\Payment\TransactionInterface;

tests/ProductBundle/Entity/ProductManagerTest.php

@@ -13,7 +13,7 @@
 
 namespace Sonata\ProductBundle\Tests\Entity;
 
-use Doctrine\Common\Persistence\ManagerRegistry;
+use Doctrine\Persistence\ManagerRegistry;
 use PHPUnit\Framework\TestCase;
 use Sonata\Doctrine\Test\EntityManagerMockFactoryTrait;
 use Sonata\ProductBundle\Entity\BaseProduct;