Fix compatibility issue with Doctrine >= 2.6 (#608)

getsentry · Mar 31, 2022 · d6aedfd · d6aedfd
1 parent 348c5e0
commit d6aedfd
Show file tree

Hide file tree

Showing 6 changed files with 24 additions and 17 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -2,7 +2,7 @@
 
 ## Unreleased
 
-- ...
+- Fix compatibility issue with Doctrine Bundle `>= 2.6.0` (#608)
 
 ## 4.2.7 (2022-02-18)
 

diff --git a/phpstan-baseline.neon b/phpstan-baseline.neon
@@ -136,7 +136,7 @@ parameters:
  path: src/DependencyInjection/SentryExtension.php
 
  -
- message: "#^Parameter \\#2 \\$value of method Symfony\\\\Component\\\\DependencyInjection\\\\Container\\:\\:setParameter\\(\\) expects array\\|bool\\|float\\|int\\|string\\|null, mixed given\\.$#"
+ message: "#^Parameter \\#2 \\$value of method Symfony\\\\Component\\\\DependencyInjection\\\\Container\\:\\:setParameter\\(\\) expects array\\|bool\\|float\\|int\\|string\\|UnitEnum\\|null, mixed given\\.$#"
  count: 2
  path: src/DependencyInjection/SentryExtension.php
 

diff --git a/psalm-baseline.xml b/psalm-baseline.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<files psalm-version="4.20.0@f82a70e7edfc6cf2705e9374c8a0b6a974a779ed">
+<files psalm-version="4.22.0@fc2c6ab4d5fa5d644d8617089f012f3bb84b8703">
  <file src="src/DependencyInjection/SentryExtension.php">
  <UndefinedClass occurrences="1">
  <code>FatalErrorException</code>
@@ -31,6 +31,9 @@
  <code>iterable</code>
  </LessSpecificImplementedReturnType>
  </file>
+ <file src="src/Tracing/Doctrine/DBAL/Compatibility/MiddlewareInterface.php">
+ <UnrecognizedStatement occurrences="1"/>
+ </file>
  <file src="src/Tracing/Doctrine/DBAL/TracingDriverForV2.php">
  <UndefinedClass occurrences="1">
  <code>ExceptionConverterDriver</code>

diff --git a/src/Tracing/Doctrine/DBAL/Compatibility/MiddlewareInterface.php b/src/Tracing/Doctrine/DBAL/Compatibility/MiddlewareInterface.php
@@ -5,11 +5,21 @@
 namespace Sentry\SentryBundle\Tracing\Doctrine\DBAL\Compatibility;
 
 use Doctrine\DBAL\Driver as DriverInterface;
+use Doctrine\DBAL\Driver\Middleware as DoctrineMiddlewareInterface;
 
-/**
- * @internal
- */
-interface MiddlewareInterface
-{
- public function wrap(DriverInterface $driver): DriverInterface;
+if (interface_exists(DoctrineMiddlewareInterface::class)) {
+ /**
+ * @internal
+ */
+ interface MiddlewareInterface extends DoctrineMiddlewareInterface
+ {
+ }
+} else {
+ /**
+ * @internal
+ */
+ interface MiddlewareInterface
+ {
+ public function wrap(DriverInterface $driver): DriverInterface;
+ }
 }
diff --git a/src/Tracing/Doctrine/DBAL/TracingDriverMiddleware.php b/src/Tracing/Doctrine/DBAL/TracingDriverMiddleware.php
@@ -5,7 +5,7 @@
 namespace Sentry\SentryBundle\Tracing\Doctrine\DBAL;
 
 use Doctrine\DBAL\Driver;
-use Doctrine\DBAL\Driver\Middleware;
+use Sentry\SentryBundle\Tracing\Doctrine\DBAL\Compatibility\MiddlewareInterface;
 use Sentry\State\HubInterface;
 
 /**
@@ -14,7 +14,7 @@
  *
  * @internal since version 4.2
  */
-final class TracingDriverMiddleware implements Middleware
+final class TracingDriverMiddleware implements MiddlewareInterface
 {
  /**
  * @var TracingDriverConnectionFactoryInterface

diff --git a/src/aliases.php b/src/aliases.php
@@ -4,7 +4,6 @@
 
 namespace Sentry\SentryBundle;
 
-use Doctrine\DBAL\Driver\Middleware as DoctrineMiddlewareInterface;
 use Doctrine\DBAL\Result;
 use Sentry\SentryBundle\EventListener\ErrorListenerExceptionEvent;
 use Sentry\SentryBundle\EventListener\RequestListenerControllerEvent;
@@ -18,7 +17,6 @@
 use Sentry\SentryBundle\Tracing\Cache\TraceableTagAwareCacheAdapter;
 use Sentry\SentryBundle\Tracing\Cache\TraceableTagAwareCacheAdapterForV2;
 use Sentry\SentryBundle\Tracing\Cache\TraceableTagAwareCacheAdapterForV3;
-use Sentry\SentryBundle\Tracing\Doctrine\DBAL\Compatibility\MiddlewareInterface;
 use Sentry\SentryBundle\Tracing\Doctrine\DBAL\TracingDriverForV2;
 use Sentry\SentryBundle\Tracing\Doctrine\DBAL\TracingDriverForV3;
 use Sentry\SentryBundle\Tracing\Doctrine\DBAL\TracingStatementForV2;
@@ -107,10 +105,6 @@ class_alias(TraceableTagAwareCacheAdapterForV2::class, TraceableTagAwareCacheAda
  }
 }
 
-if (!interface_exists(DoctrineMiddlewareInterface::class)) {
- class_alias(MiddlewareInterface::class, DoctrineMiddlewareInterface::class);
-}
-
 if (!class_exists('Sentry\SentryBundle\Tracing\Doctrine\DBAL\TracingStatement')) {
  if (class_exists(Result::class)) {
  class_alias(TracingStatementForV3::class, 'Sentry\\SentryBundle\\Tracing\\Doctrine\\DBAL\\TracingStatement');