Add compatibility with doctrine/orm 3

FriendsOfSymfony · May 29, 2024 · 93f8eef · 93f8eef
1 parent 9f3c43a
commit 93f8eef
Show file tree

Hide file tree

Showing 5 changed files with 13 additions and 4 deletions.
diff --git a/composer.json b/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",

diff --git a/src/Doctrine/RegisterListenersService.php b/src/Doctrine/RegisterListenersService.php
@@ -49,7 +49,11 @@ public function register(ObjectManager $manager, PagerInterface $pager, array $o
             });
         }
 
-        if (false === $options['debug_logging'] && $manager instanceof EntityManagerInterface) {
+        if (
+            false === $options['debug_logging']
+            && interface_exists('Doctrine\DBAL\Logging\SQLLogger')
+            && $manager instanceof EntityManagerInterface
+        ) {
             $configuration = $manager->getConnection()->getConfiguration();
             $logger = $configuration->getSQLLogger();
 

diff --git a/tests/Unit/Doctrine/ORM/ElasticaToModelTransformerTest.php b/tests/Unit/Doctrine/ORM/ElasticaToModelTransformerTest.php
@@ -12,6 +12,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 +133,7 @@ public function testTransformUsesDefaultQueryBuilderMethodConfiguration()
      */
     public function testUsesHintsConfigurationIfGiven()
     {
-        $query = $this->getMockBuilder(AbstractQuery::class)
+        $query = $this->getMockBuilder(Query::class)
             ->setMethods(['setHint', 'execute', 'setHydrationMode'])
             ->disableOriginalConstructor()
             ->getMockForAbstractClass()

diff --git a/tests/Unit/Doctrine/ORM/ListenerTest.php b/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()

diff --git a/tests/Unit/Doctrine/RegisterListenersServiceTest.php b/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')