Merge pull request #3025 from phansys/doctrine_persistence

Replace usages of old namespace `Doctrine\Common\Persistence\` with `Doctrine\Persistence\` ("doctrine/persistence" >= 1.3)

Author: stof

Resources/config/doctrine.xml

@@ -13,7 +13,7 @@
         </service>
 
         <!-- The factory is configured in the DI extension class to support more Symfony versions -->
-        <service id="fos_user.object_manager" class="Doctrine\Common\Persistence\ObjectManager" public="false">
+        <service id="fos_user.object_manager" class="Doctrine\Persistence\ObjectManager" public="false">
             <argument>%fos_user.model_manager_name%</argument>
         </service>
 

Tests/Doctrine/UserManagerTest.php

@@ -11,6 +11,9 @@
 
 namespace FOS\UserBundle\Tests\Doctrine;
 
+use Doctrine\Persistence\Mapping\ClassMetadata;
+use Doctrine\Persistence\ObjectManager;
+use Doctrine\Persistence\ObjectRepository;
 use FOS\UserBundle\Doctrine\UserManager;
 use FOS\UserBundle\Model\User;
 use PHPUnit\Framework\TestCase;
@@ -28,17 +31,17 @@ class UserManagerTest extends TestCase
 
     public function setUp()
     {
-        if (!interface_exists('Doctrine\Common\Persistence\ObjectManager')) {
-            $this->markTestSkipped('Doctrine Common has to be installed for this test to run.');
+        if (!interface_exists(ObjectManager::class)) {
+            $this->markTestSkipped('"doctrine/persistence" ^1.3 has to be installed for this test to run.');
         }
 
         $passwordUpdater = $this->getMockBuilder('FOS\UserBundle\Util\PasswordUpdaterInterface')->getMock();
         $fieldsUpdater = $this->getMockBuilder('FOS\UserBundle\Util\CanonicalFieldsUpdater')
             ->disableOriginalConstructor()
             ->getMock();
-        $class = $this->getMockBuilder('Doctrine\Common\Persistence\Mapping\ClassMetadata')->getMock();
-        $this->om = $this->getMockBuilder('Doctrine\Common\Persistence\ObjectManager')->getMock();
-        $this->repository = $this->getMockBuilder('Doctrine\Common\Persistence\ObjectRepository')->getMock();
+        $class = $this->getMockBuilder(ClassMetadata::class)->getMock();
+        $this->om = $this->getMockBuilder(ObjectManager::class)->getMock();
+        $this->repository = $this->getMockBuilder(ObjectRepository::class)->getMock();
 
         $this->om->expects($this->any())
             ->method('getRepository')