Merge pull request #1181 from fruitwasp/doctrine-persistence2

Allow doctrine/persistence 2.x
doctrine · Aug 24, 2020 · 22add17 · 22add17
2 parents 828ecf0 + c18432d
commit 22add17
Show file tree

Hide file tree

Showing 5 changed files with 7 additions and 9 deletions.
diff --git a/DependencyInjection/Compiler/DoctrineOrmMappingsPass.php b/DependencyInjection/Compiler/DoctrineOrmMappingsPass.php
@@ -59,7 +59,7 @@ public function __construct($driver, array $namespaces, array $managerParameters
      */
     public static function createXmlMappingDriver(array $namespaces, array $managerParameters = [], $enabledParameter = false, array $aliasMap = [])
     {
-        $locator = new Definition('Doctrine\Common\Persistence\Mapping\Driver\SymfonyFileLocator', [$namespaces, '.orm.xml']);
+        $locator = new Definition('Doctrine\Persistence\Mapping\Driver\SymfonyFileLocator', [$namespaces, '.orm.xml']);
         $driver  = new Definition('Doctrine\ORM\Mapping\Driver\XmlDriver', [$locator]);
 
         return new DoctrineOrmMappingsPass($driver, $namespaces, $managerParameters, $enabledParameter, $aliasMap);
@@ -80,7 +80,7 @@ public static function createXmlMappingDriver(array $namespaces, array $managerP
      */
     public static function createYamlMappingDriver(array $namespaces, array $managerParameters = [], $enabledParameter = false, array $aliasMap = [])
     {
-        $locator = new Definition('Doctrine\Common\Persistence\Mapping\Driver\SymfonyFileLocator', [$namespaces, '.orm.yml']);
+        $locator = new Definition('Doctrine\Persistence\Mapping\Driver\SymfonyFileLocator', [$namespaces, '.orm.yml']);
         $driver  = new Definition('Doctrine\ORM\Mapping\Driver\YamlDriver', [$locator]);
 
         return new DoctrineOrmMappingsPass($driver, $namespaces, $managerParameters, $enabledParameter, $aliasMap);
@@ -101,8 +101,8 @@ public static function createYamlMappingDriver(array $namespaces, array $manager
      */
     public static function createPhpMappingDriver(array $namespaces, array $managerParameters = [], $enabledParameter = false, array $aliasMap = [])
     {
-        $locator = new Definition('Doctrine\Common\Persistence\Mapping\Driver\SymfonyFileLocator', [$namespaces, '.php']);
-        $driver  = new Definition('Doctrine\Common\Persistence\Mapping\Driver\PHPDriver', [$locator]);
+        $locator = new Definition('Doctrine\Persistence\Mapping\Driver\SymfonyFileLocator', [$namespaces, '.php']);
+        $driver  = new Definition('Doctrine\Persistence\Mapping\Driver\PHPDriver', [$locator]);
 
         return new DoctrineOrmMappingsPass($driver, $namespaces, $managerParameters, $enabledParameter, $aliasMap);
     }
@@ -145,7 +145,7 @@ public static function createAnnotationMappingDriver(array $namespaces, array $d
      */
     public static function createStaticPhpMappingDriver(array $namespaces, array $directories, array $managerParameters = [], $enabledParameter = false, array $aliasMap = [])
     {
-        $driver = new Definition('Doctrine\Common\Persistence\Mapping\Driver\StaticPHPDriver', [$directories]);
+        $driver = new Definition('Doctrine\Persistence\Mapping\Driver\StaticPHPDriver', [$directories]);
 
         return new DoctrineOrmMappingsPass($driver, $namespaces, $managerParameters, $enabledParameter, $aliasMap);
     }

diff --git a/DependencyInjection/DoctrineExtension.php b/DependencyInjection/DoctrineExtension.php
@@ -883,7 +883,6 @@ private function createPoolCacheDefinition(ContainerBuilder $container, string $
 
         $definition = $container->register($serviceId, DoctrineProvider::class);
         $definition->addArgument(new Reference($poolName));
-        $definition->setPrivate(true);
 
         return $serviceId;
     }

diff --git a/Resources/config/dbal.xml b/Resources/config/dbal.xml
@@ -67,7 +67,6 @@
             <tag name="kernel.reset" method="reset" />
         </service>
         <service id="Doctrine\Persistence\ManagerRegistry" alias="doctrine" public="false" />
-        <service id="Doctrine\Common\Persistence\ManagerRegistry" alias="doctrine" public="false" />
 
         <service id="doctrine.twig.doctrine_extension" class="Doctrine\Bundle\DoctrineBundle\Twig\DoctrineExtension" public="false">
             <tag name="twig.extension" />

diff --git a/Tests/DataCollector/DoctrineDataCollectorTest.php b/Tests/DataCollector/DoctrineDataCollectorTest.php
@@ -23,7 +23,7 @@ public function testCollectEntities() : void
 
         $manager   = $this->getMockBuilder('Doctrine\ORM\EntityManager')->disableOriginalConstructor()->getMock();
         $config    = $this->getMockBuilder('Doctrine\ORM\Configuration')->getMock();
-        $factory   = $this->getMockBuilder('Doctrine\Common\Persistence\Mapping\AbstractClassMetadataFactory')
+        $factory   = $this->getMockBuilder('Doctrine\Persistence\Mapping\AbstractClassMetadataFactory')
             ->setMethods(['getLoadedMetadata'])->getMockForAbstractClass();
         $collector = $this->createCollector(['default' => $manager]);
 

diff --git a/composer.json b/composer.json
@@ -27,7 +27,7 @@
     "require": {
         "php": "^7.1 || ^8.0",
         "doctrine/dbal": "^2.9.0|^3.0",
-        "doctrine/persistence": "^1.3.3",
+        "doctrine/persistence": "^1.3.3|^2.0",
         "doctrine/sql-formatter": "^1.0.1",
         "symfony/cache": "^4.3.3|^5.0",
         "symfony/config": "^4.3.3|^5.0",