Remove Driver and Middleware aliases

Author: Jean85

src/Tracing/Doctrine/DBAL/Compatibility/DriverInterface.php

@@ -5,6 +5,8 @@
 namespace Sentry\SentryBundle\Tracing\Doctrine\DBAL\Compatibility;
 
 /**
+ * TODO: can we remove this? We will need tests from #517 to check.
+ *
  * @internal
  */
 interface ExceptionConverterDriverInterface

src/Tracing/Doctrine/DBAL/Compatibility/ExceptionConverterDriverInterface.php

@@ -5,8 +5,7 @@
 namespace Sentry\SentryBundle\Tracing\Doctrine\DBAL;
 
 use Doctrine\DBAL\Connection;
-use Doctrine\DBAL\Driver\API\ExceptionConverter;
-use Doctrine\DBAL\Driver as DriverInterface;
+use Doctrine\DBAL\Driver as DBALDriver;
 use Doctrine\DBAL\Driver\DriverException as LegacyDriverExceptionInterface;
 use Doctrine\DBAL\Driver\ExceptionConverterDriver as ExceptionConverterDriverInterface;
 use Doctrine\DBAL\Driver\ResultStatement;
@@ -16,32 +15,30 @@
 use Sentry\State\HubInterface;
 
 /**
- * This is a simple implementation of the {@see DriverInterface} interface that
+ * This is a simple implementation of the {@see DBALDriver} interface that
  * decorates an existing driver to support distributed tracing capabilities.
- * This implementation IS and MUST be compatible with all versions of Doctrine
- * DBAL >= 2.10.
+ * This implementation IS cross-compatible with both DBAL 2 and 3 thanks to
+ * the FC layer provided since DBAL 2.13.
  *
  * @internal
  */
-final class TracingDriver implements DriverInterface, VersionAwarePlatformDriverInterface, ExceptionConverterDriverInterface
+final class TracingDriver implements DBALDriver, VersionAwarePlatformDriverInterface, ExceptionConverterDriverInterface
 {
     /**
      * @var HubInterface The current hub
      */
     private $hub;
 
     /**
-     * @var DriverInterface|VersionAwarePlatformDriverInterface|ExceptionConverterDriverInterface The instance of the decorated driver
+     * @var DBALDriver|VersionAwarePlatformDriverInterface|ExceptionConverterDriverInterface The instance of the decorated driver
      */
     private $decoratedDriver;
 
     /**
-     * Constructor.
-     *
-     * @param HubInterface    $hub             The current hub
-     * @param DriverInterface $decoratedDriver The instance of the driver to decorate
+     * @param HubInterface $hub             The current hub
+     * @param DBALDriver   $decoratedDriver The instance of the driver to decorate
      */
-    public function __construct(HubInterface $hub, DriverInterface $decoratedDriver)
+    public function __construct(HubInterface $hub, DBALDriver $decoratedDriver)
     {
         $this->hub = $hub;
         $this->decoratedDriver = $decoratedDriver;

src/Tracing/Doctrine/DBAL/Compatibility/MiddlewareInterface.php

@@ -4,15 +4,15 @@
 
 namespace Sentry\SentryBundle\Tracing\Doctrine\DBAL;
 
-use Doctrine\DBAL\Driver as DriverInterface;
-use Doctrine\DBAL\Driver\Middleware as MiddlewareInterface;
+use Doctrine\DBAL\Driver;
+use Doctrine\DBAL\Driver\Middleware;
 use Sentry\State\HubInterface;
 
 /**
- * This middleware wraps a {@see DriverInterface} instance into one that
+ * This middleware wraps a {@see Driver} instance into one that
  * supports the distributed tracing feature of Sentry.
  */
-final class TracingDriverMiddleware implements MiddlewareInterface
+final class TracingDriverMiddleware implements Middleware
 {
     /**
      * @var HubInterface The current hub
@@ -32,7 +32,7 @@ public function __construct(HubInterface $hub)
     /**
      * {@inheritdoc}
      */
-    public function wrap(DriverInterface $driver): DriverInterface
+    public function wrap(Driver $driver): Driver
     {
         return new TracingDriver($this->hub, $driver);
     }

src/Tracing/Doctrine/DBAL/TracingDriver.php

@@ -4,22 +4,14 @@
 
 namespace Sentry\SentryBundle;
 
-use Doctrine\DBAL\Driver as DoctrineDriverInterface;
-use Doctrine\DBAL\Driver\DriverException as LegacyDriverExceptionInterface;
-use Doctrine\DBAL\Driver\Exception as DriverExceptionInterface;
 use Doctrine\DBAL\Driver\ExceptionConverterDriver as LegacyExceptionConverterDriverInterface;
-use Doctrine\DBAL\Driver\Middleware as DoctrineMiddlewareInterface;
-use Doctrine\DBAL\Driver\Result;
-use Doctrine\DBAL\Driver\Statement;
 use Sentry\SentryBundle\EventListener\ErrorListenerExceptionEvent;
 use Sentry\SentryBundle\EventListener\RequestListenerControllerEvent;
 use Sentry\SentryBundle\EventListener\RequestListenerRequestEvent;
 use Sentry\SentryBundle\EventListener\RequestListenerResponseEvent;
 use Sentry\SentryBundle\EventListener\RequestListenerTerminateEvent;
 use Sentry\SentryBundle\EventListener\SubRequestListenerRequestEvent;
-use Sentry\SentryBundle\Tracing\Doctrine\DBAL\Compatibility\DriverInterface;
 use Sentry\SentryBundle\Tracing\Doctrine\DBAL\Compatibility\ExceptionConverterDriverInterface;
-use Sentry\SentryBundle\Tracing\Doctrine\DBAL\Compatibility\MiddlewareInterface;
 use Symfony\Component\HttpKernel\Event\ControllerEvent;
 use Symfony\Component\HttpKernel\Event\ExceptionEvent;
 use Symfony\Component\HttpKernel\Event\FilterControllerEvent;
@@ -94,26 +86,6 @@ class_alias(GetResponseEvent::class, SubRequestListenerRequestEvent::class);
     }
 }
 
-if (interface_exists(Statement::class) && !interface_exists(Result::class)) {
-    /** @psalm-suppress UndefinedClass */
-    class_alias(Statement::class, Result::class);
-}
-
-if (interface_exists(DriverExceptionInterface::class) && !interface_exists(LegacyDriverExceptionInterface::class)) {
-    /** @psalm-suppress UndefinedClass */
-    class_alias(DriverExceptionInterface::class, LegacyDriverExceptionInterface::class);
-}
-
-if (!interface_exists(DoctrineMiddlewareInterface::class)) {
-    /** @psalm-suppress UndefinedClass */
-    class_alias(MiddlewareInterface::class, DoctrineMiddlewareInterface::class);
-}
-
-if (!interface_exists(DoctrineDriverInterface::class)) {
-    /** @psalm-suppress UndefinedClass */
-    class_alias(DriverInterface::class, DoctrineDriverInterface::class);
-}
-
 if (!interface_exists(LegacyExceptionConverterDriverInterface::class)) {
     /** @psalm-suppress UndefinedClass */
     class_alias(ExceptionConverterDriverInterface::class, LegacyExceptionConverterDriverInterface::class);

src/Tracing/Doctrine/DBAL/TracingDriverMiddleware.php

@@ -5,6 +5,7 @@
 namespace Sentry\SentryBundle\Tests\Tracing\Doctrine\DBAL;
 
 use Doctrine\DBAL\Driver as DriverInterface;
+use Doctrine\DBAL\Driver\Middleware;
 use PHPUnit\Framework\MockObject\MockObject;
 use Sentry\SentryBundle\Tests\DoctrineTestCase;
 use Sentry\SentryBundle\Tracing\Doctrine\DBAL\TracingDriver;
@@ -25,7 +26,7 @@ final class TracingDriverMiddlewareTest extends DoctrineTestCase
 
     public static function setUpBeforeClass(): void
     {
-        if (!self::isDoctrineBundlePackageInstalled()) {
+        if (!class_exists(Middleware::class)) {
             self::markTestSkipped();
         }
     }