Merge pull request #1946 from VincentLanglet/compatibility-orm-3

Add compatibility with doctrine/orm 3

Author: XWB

composer.json

@@ -43,7 +43,7 @@
     "require-dev": {
         "doctrine/doctrine-bundle": "^2.1.1",
         "doctrine/mongodb-odm": "^2.2",
-        "doctrine/orm": "^2.8",
+        "doctrine/orm": "^2.8 || ^3.2",
         "doctrine/phpcr-odm": "^1.5.3 || ^2.0",
         "ergebnis/composer-normalize": "^2.28",
         "jackalope/jackalope-doctrine-dbal": "^1.2 || ^2.0",

src/Doctrine/RegisterListenersService.php

@@ -49,17 +49,22 @@ public function register(ObjectManager $manager, PagerInterface $pager, array $o
             });
         }
 
-        if (false === $options['debug_logging'] && $manager instanceof EntityManagerInterface) {
+        if (
+            false === $options['debug_logging']
+            && $manager instanceof EntityManagerInterface
+        ) {
             $configuration = $manager->getConnection()->getConfiguration();
-            $logger = $configuration->getSQLLogger();
+            if (\method_exists($configuration, 'getSQLLogger') && \method_exists($configuration, 'setSQLLogger')) {
+                $logger = $configuration->getSQLLogger();
 
-            $this->addListener($pager, PreFetchObjectsEvent::class, function () use ($configuration) {
-                $configuration->setSQLLogger(null);
-            });
+                $this->addListener($pager, PreFetchObjectsEvent::class, function () use ($configuration) {
+                    $configuration->setSQLLogger(null);
+                });
 
-            $this->addListener($pager, PreInsertObjectsEvent::class, function () use ($configuration, $logger) {
-                $configuration->setSQLLogger($logger);
-            });
+                $this->addListener($pager, PreInsertObjectsEvent::class, function () use ($configuration, $logger) {
+                    $configuration->setSQLLogger($logger);
+                });
+            }
         }
     }
 

tests/Unit/Doctrine/ORM/ElasticaToModelTransformerTest.php

@@ -11,7 +11,7 @@
 
 namespace FOS\ElasticaBundle\Tests\Unit\Doctrine\ORM;
 
-use Doctrine\ORM\AbstractQuery;
+use Doctrine\ORM\Query;
 use Doctrine\ORM\Query\Expr;
 use Doctrine\ORM\QueryBuilder;
 use Doctrine\Persistence\ManagerRegistry;
@@ -132,7 +132,7 @@ public function testTransformUsesDefaultQueryBuilderMethodConfiguration()
      */
     public function testUsesHintsConfigurationIfGiven()
     {
-        $query = $this->getMockBuilder(AbstractQuery::class)
+        $query = $this->getMockBuilder(Query::class)
             ->setMethods(['setHint', 'execute', 'setHydrationMode'])
             ->disableOriginalConstructor()
             ->getMockForAbstractClass()

tests/Unit/Doctrine/ORM/ListenerTest.php

@@ -25,7 +25,7 @@ protected function getClassMetadataClass()
 
     protected function getLifecycleEventArgsClass()
     {
-        return \Doctrine\ORM\Event\LifecycleEventArgs::class;
+        return \Doctrine\Persistence\Event\LifecycleEventArgs::class;
     }
 
     protected function getListenerClass()

tests/Unit/Doctrine/RegisterListenersServiceTest.php

@@ -173,6 +173,10 @@ public function testShouldNotCallSleepListenerForAnotherPagers()
 
     public function testShouldRegisterDisableDebugLoggingByDefaultForEntityManager()
     {
+        if (!\interface_exists('Doctrine\DBAL\Logging\SQLLogger')) {
+            $this->markTestSkipped('This is only possible on doctrine/orm 2.');
+        }
+
         $dispatcher = $this->createDispatcherMock();
         $dispatcher->expects($this->exactly(2))
             ->method('addListener')