Merge release 4.1.1 into master

CacheWarmer/HydratorCacheWarmer.php

@@ -4,9 +4,9 @@
 
 namespace Doctrine\Bundle\MongoDBBundle\CacheWarmer;
 
-use Doctrine\Common\Persistence\ManagerRegistry;
 use Doctrine\ODM\MongoDB\Configuration;
 use Doctrine\ODM\MongoDB\DocumentManager;
+use Doctrine\Persistence\ManagerRegistry;
 use RuntimeException;
 use Symfony\Component\DependencyInjection\ContainerInterface;
 use Symfony\Component\HttpKernel\CacheWarmer\CacheWarmerInterface;

CacheWarmer/PersistentCollectionCacheWarmer.php

@@ -4,9 +4,9 @@
 
 namespace Doctrine\Bundle\MongoDBBundle\CacheWarmer;
 
-use Doctrine\Common\Persistence\ManagerRegistry;
 use Doctrine\ODM\MongoDB\Configuration;
 use Doctrine\ODM\MongoDB\DocumentManager;
+use Doctrine\Persistence\ManagerRegistry;
 use RuntimeException;
 use Symfony\Component\DependencyInjection\ContainerInterface;
 use Symfony\Component\HttpKernel\CacheWarmer\CacheWarmerInterface;

CacheWarmer/ProxyCacheWarmer.php

@@ -4,10 +4,10 @@
 
 namespace Doctrine\Bundle\MongoDBBundle\CacheWarmer;
 
-use Doctrine\Common\Persistence\ManagerRegistry;
 use Doctrine\ODM\MongoDB\Configuration;
 use Doctrine\ODM\MongoDB\DocumentManager;
 use Doctrine\ODM\MongoDB\Mapping\ClassMetadata;
+use Doctrine\Persistence\ManagerRegistry;
 use RuntimeException;
 use Symfony\Component\DependencyInjection\ContainerInterface;
 use Symfony\Component\HttpKernel\CacheWarmer\CacheWarmerInterface;

DependencyInjection/Compiler/DoctrineMongoDBMappingsPass.php

@@ -4,11 +4,11 @@
 
 namespace Doctrine\Bundle\MongoDBBundle\DependencyInjection\Compiler;
 
-use Doctrine\Common\Persistence\Mapping\Driver\PHPDriver;
-use Doctrine\Common\Persistence\Mapping\Driver\StaticPHPDriver;
-use Doctrine\Common\Persistence\Mapping\Driver\SymfonyFileLocator;
 use Doctrine\ODM\MongoDB\Mapping\Driver\AnnotationDriver;
 use Doctrine\ODM\MongoDB\Mapping\Driver\XmlDriver;
+use Doctrine\Persistence\Mapping\Driver\PHPDriver;
+use Doctrine\Persistence\Mapping\Driver\StaticPHPDriver;
+use Doctrine\Persistence\Mapping\Driver\SymfonyFileLocator;
 use Symfony\Bridge\Doctrine\DependencyInjection\CompilerPass\RegisterMappingsPass;
 use Symfony\Component\DependencyInjection\Definition;
 use Symfony\Component\DependencyInjection\Reference;

Form/ChoiceList/MongoDBQueryBuilderLoader.php

@@ -5,8 +5,8 @@
 namespace Doctrine\Bundle\MongoDBBundle\Form\ChoiceList;
 
 use Closure;
-use Doctrine\Common\Persistence\ObjectManager;
 use Doctrine\ODM\MongoDB\Query\Builder;
+use Doctrine\Persistence\ObjectManager;
 use Symfony\Bridge\Doctrine\Form\ChoiceList\EntityLoaderInterface;
 use Symfony\Component\Form\Exception\UnexpectedTypeException;
 use function array_values;

Form/DoctrineMongoDBExtension.php

@@ -4,7 +4,7 @@
 
 namespace Doctrine\Bundle\MongoDBBundle\Form;
 
-use Doctrine\Common\Persistence\ManagerRegistry;
+use Doctrine\Persistence\ManagerRegistry;
 use Symfony\Component\Form\AbstractExtension;
 
 /**

Form/DoctrineMongoDBTypeGuesser.php

@@ -5,8 +5,8 @@
 namespace Doctrine\Bundle\MongoDBBundle\Form;
 
 use Doctrine\Bundle\MongoDBBundle\Form\Type\DocumentType;
-use Doctrine\Common\Persistence\ManagerRegistry;
-use Doctrine\Common\Persistence\Mapping\MappingException;
+use Doctrine\Persistence\ManagerRegistry;
+use Doctrine\Persistence\Mapping\MappingException;
 use Symfony\Component\Form\AbstractType;
 use Symfony\Component\Form\Extension\Core\Type\CheckboxType;
 use Symfony\Component\Form\Extension\Core\Type\CollectionType;

Form/Type/DocumentType.php

@@ -5,12 +5,13 @@
 namespace Doctrine\Bundle\MongoDBBundle\Form\Type;
 
 use Doctrine\Bundle\MongoDBBundle\Form\ChoiceList\MongoDBQueryBuilderLoader;
-use Doctrine\Common\Persistence\ObjectManager;
 use Doctrine\ODM\MongoDB\DocumentManager;
+use Doctrine\Persistence\ObjectManager;
 use InvalidArgumentException;
 use Symfony\Bridge\Doctrine\Form\Type\DoctrineType;
 use Symfony\Component\OptionsResolver\Options;
 use Symfony\Component\OptionsResolver\OptionsResolver;
+use function interface_exists;
 
 /**
  * Form type for a MongoDB document
@@ -83,3 +84,5 @@ public function getName()
         return $this->getBlockPrefix();
     }
 }
+
+interface_exists(ObjectManager::class);

Repository/ContainerRepositoryFactory.php

@@ -5,11 +5,11 @@
 namespace Doctrine\Bundle\MongoDBBundle\Repository;
 
 use Doctrine\Bundle\MongoDBBundle\DependencyInjection\Compiler\ServiceRepositoryCompilerPass;
-use Doctrine\Common\Persistence\ObjectRepository;
 use Doctrine\ODM\MongoDB\DocumentManager;
 use Doctrine\ODM\MongoDB\Mapping\ClassMetadata;
 use Doctrine\ODM\MongoDB\Repository\DocumentRepository;
 use Doctrine\ODM\MongoDB\Repository\RepositoryFactory;
+use Doctrine\Persistence\ObjectRepository;
 use Psr\Container\ContainerInterface;
 use RuntimeException;
 use function class_exists;

Repository/ServiceRepositoryTrait.php

@@ -4,8 +4,8 @@
 
 namespace Doctrine\Bundle\MongoDBBundle\Repository;
 
-use Doctrine\Common\Persistence\ManagerRegistry;
 use Doctrine\ODM\MongoDB\DocumentManager;
+use Doctrine\Persistence\ManagerRegistry;
 use LogicException;
 use function sprintf;
 

Resources/config/mongodb.xml

@@ -30,7 +30,7 @@
         <parameter key="doctrine_mongodb.odm.cache.xcache.class">Doctrine\Common\Cache\XcacheCache</parameter>
 
         <!-- metadata -->
-        <parameter key="doctrine_mongodb.odm.metadata.driver_chain.class">Doctrine\Common\Persistence\Mapping\Driver\MappingDriverChain</parameter>
+        <parameter key="doctrine_mongodb.odm.metadata.driver_chain.class">Doctrine\Persistence\Mapping\Driver\MappingDriverChain</parameter>
         <parameter key="doctrine_mongodb.odm.metadata.annotation.class">Doctrine\ODM\MongoDB\Mapping\Driver\AnnotationDriver</parameter>
         <parameter key="doctrine_mongodb.odm.metadata.xml.class">Doctrine\Bundle\MongoDBBundle\Mapping\Driver\XmlDriver</parameter>
 

Tests/CacheWarmer/PersistentCollectionCacheWarmerTest.php

@@ -6,9 +6,9 @@
 
 use Doctrine\Bundle\MongoDBBundle\CacheWarmer\PersistentCollectionCacheWarmer;
 use Doctrine\Bundle\MongoDBBundle\Tests\TestCase;
-use Doctrine\Common\Persistence\ManagerRegistry;
 use Doctrine\ODM\MongoDB\Configuration;
 use Doctrine\ODM\MongoDB\PersistentCollection\PersistentCollectionGenerator;
+use Doctrine\Persistence\ManagerRegistry;
 use Symfony\Component\DependencyInjection\Container;
 use Symfony\Component\DependencyInjection\ContainerInterface;
 use function sys_get_temp_dir;

Tests/DependencyInjection/AbstractMongoDBExtensionTest.php

@@ -13,10 +13,10 @@
 use Doctrine\Common\Cache\MemcachedCache;
 use Doctrine\Common\Cache\XcacheCache;
 use Doctrine\Common\EventSubscriber;
-use Doctrine\Common\Persistence\Mapping\Driver\MappingDriverChain;
 use Doctrine\ODM\MongoDB\Configuration;
 use Doctrine\ODM\MongoDB\DocumentManager;
 use Doctrine\ODM\MongoDB\Mapping\Driver\AnnotationDriver;
+use Doctrine\Persistence\Mapping\Driver\MappingDriverChain;
 use MongoDB\Client;
 use PHPUnit\Framework\ExpectationFailedException;
 use PHPUnit_Framework_AssertionFailedError;

Tests/Fixtures/FooBundle/DataFixtures/DependentOnRequiredConstructorArgsFixtures.php

@@ -6,7 +6,7 @@
 
 use Doctrine\Bundle\MongoDBBundle\Fixture\ODMFixtureInterface;
 use Doctrine\Common\DataFixtures\DependentFixtureInterface;
-use Doctrine\Common\Persistence\ObjectManager;
+use Doctrine\Persistence\ObjectManager;
 
 class DependentOnRequiredConstructorArgsFixtures implements ODMFixtureInterface, DependentFixtureInterface
 {

Tests/Fixtures/FooBundle/DataFixtures/OtherFixtures.php

@@ -6,7 +6,7 @@
 
 use Doctrine\Bundle\MongoDBBundle\Fixture\FixtureGroupInterface;
 use Doctrine\Bundle\MongoDBBundle\Fixture\ODMFixtureInterface;
-use Doctrine\Common\Persistence\ObjectManager;
+use Doctrine\Persistence\ObjectManager;
 
 class OtherFixtures implements ODMFixtureInterface, FixtureGroupInterface
 {

Tests/Fixtures/FooBundle/DataFixtures/RequiredConstructorArgsFixtures.php

@@ -5,7 +5,7 @@
 namespace Doctrine\Bundle\MongoDBBundle\Tests\Fixtures\FooBundle\DataFixtures;
 
 use Doctrine\Bundle\MongoDBBundle\Fixture\ODMFixtureInterface;
-use Doctrine\Common\Persistence\ObjectManager;
+use Doctrine\Persistence\ObjectManager;
 
 class RequiredConstructorArgsFixtures implements ODMFixtureInterface
 {

Tests/Fixtures/FooBundle/DataFixtures/WithDependenciesFixtures.php

@@ -7,7 +7,7 @@
 use Doctrine\Bundle\MongoDBBundle\Fixture\FixtureGroupInterface;
 use Doctrine\Bundle\MongoDBBundle\Fixture\ODMFixtureInterface;
 use Doctrine\Common\DataFixtures\DependentFixtureInterface;
-use Doctrine\Common\Persistence\ObjectManager;
+use Doctrine\Persistence\ObjectManager;
 
 class WithDependenciesFixtures implements ODMFixtureInterface, DependentFixtureInterface, FixtureGroupInterface
 {

Tests/Form/Type/DocumentTypeTest.php

@@ -9,8 +9,8 @@
 use Doctrine\Bundle\MongoDBBundle\Tests\Fixtures\Form\Category;
 use Doctrine\Bundle\MongoDBBundle\Tests\Fixtures\Form\Document;
 use Doctrine\Bundle\MongoDBBundle\Tests\TestCase;
-use Doctrine\Common\Persistence\ManagerRegistry;
 use Doctrine\ODM\MongoDB\DocumentManager;
+use Doctrine\Persistence\ManagerRegistry;
 use MongoDB\BSON\ObjectId;
 use PHPUnit_Framework_MockObject_MockObject;
 use Symfony\Component\Form\AbstractType;

Tests/Form/Type/TypeGuesserTest.php

@@ -9,8 +9,8 @@
 use Doctrine\Bundle\MongoDBBundle\Tests\Fixtures\Form\Document;
 use Doctrine\Bundle\MongoDBBundle\Tests\Fixtures\Form\Guesser;
 use Doctrine\Bundle\MongoDBBundle\Tests\TestCase;
-use Doctrine\Common\Persistence\ManagerRegistry;
 use Doctrine\ODM\MongoDB\DocumentManager;
+use Doctrine\Persistence\ManagerRegistry;
 use PHPUnit_Framework_MockObject_MockObject;
 use Symfony\Component\Form\AbstractType;
 use Symfony\Component\Form\Test\TypeTestCase;

Tests/Mapping/Driver/AbstractDriverTest.php

@@ -4,7 +4,7 @@
 
 namespace Doctrine\Bundle\MongoDBBundle\Tests\Mapping\Driver;
 
-use Doctrine\Common\Persistence\Mapping\Driver\FileDriver;
+use Doctrine\Persistence\Mapping\Driver\FileDriver;
 use PHPUnit\Framework\TestCase;
 use ReflectionProperty;
 
@@ -38,7 +38,7 @@ public function testFindMappingFileInSubnamespace()
     }
 
     /**
-     * @expectedException Doctrine\Common\Persistence\Mapping\MappingException
+     * @expectedException Doctrine\Persistence\Mapping\MappingException
      */
     public function testFindMappingFileNamespacedFoundFileNotFound()
     {
@@ -49,7 +49,7 @@ public function testFindMappingFileNamespacedFoundFileNotFound()
     }
 
     /**
-     * @expectedException Doctrine\Common\Persistence\Mapping\MappingException
+     * @expectedException Doctrine\Persistence\Mapping\MappingException
      */
     public function testFindMappingNamespaceNotFound()
     {

composer.json

@@ -15,6 +15,7 @@
         "php": "^7.2",
         "doctrine/annotations": "^1.2",
         "doctrine/mongodb-odm": "^2.0.0",
+        "doctrine/persistence": "^1.3.6",
         "psr/log": "^1.0",
         "symfony/console": "^4.3.3|^5.0",
         "symfony/dependency-injection": "^4.3.3|^5.0",