Revert "Introduce TracingDriverForV32 for DBAL >= 3.2 (#723)"

This reverts commit 7d73be0.

Author: cleptric

.github/workflows/tests.yaml

@@ -30,8 +30,6 @@ jobs:
           - 6.*
         dependencies:
           - highest
-        doctrine-dbal:
-          - highest
         exclude:
           - php: '7.2'
             symfony-version: 6.*
@@ -43,18 +41,12 @@ jobs:
           - php: '7.2'
             symfony-version: 4.4.*
             dependencies: lowest
-            doctrine-dbal: '^2.13'
           - php: '7.2'
             symfony-version: 5.*
             dependencies: lowest
-            doctrine-dbal: '^2.13'
           - php: '8.0'
             symfony-version: 6.*
             dependencies: lowest
-            doctrine-dbal: '^2.13'
-          - php: '8.0'
-            symfony-version: 6.*
-            doctrine-dbal: '<3.2'
 
     steps:
       - name: Checkout
@@ -76,10 +68,6 @@ jobs:
         run: composer require --dev phpunit/phpunit ^9.3.9 --no-update
         if: matrix.php == '8.0' && matrix.dependencies == 'lowest'
 
-      - name: Update Doctrine DBAL
-        run: composer require --dev doctrine/dbal "${{ matrix.doctrine-dbal }}" --no-update
-        if: matrix.doctrine-dbal != 'highest'
-
       - name: Install dependencies
         uses: ramsey/composer-install@v1
         with:

composer.json

@@ -42,7 +42,7 @@
     "require-dev": {
         "doctrine/dbal": "^2.13||^3.0",
         "doctrine/doctrine-bundle": "^1.12||^2.5",
-        "friendsofphp/php-cs-fixer": "^2.19||<=3.16.0",
+        "friendsofphp/php-cs-fixer": "^2.19||^3.6",
         "jangregor/phpstan-prophecy": "^1.0",
         "monolog/monolog": "^1.3||^2.0",
         "phpspec/prophecy": "!=1.11.0",

phpstan-baseline.neon

@@ -231,7 +231,7 @@ parameters:
 			path: src/Tracing/Doctrine/DBAL/TracingServerInfoAwareDriverConnection.php
 
 		-
-			message: "#^Parameter \\#2 \\$callback of method Sentry\\\\SentryBundle\\\\Tracing\\\\Doctrine\\\\DBAL\\\\AbstractTracingStatement\\:\\:traceFunction\\(\\) expects callable\\(mixed \\.\\.\\.\\)\\: Doctrine\\\\DBAL\\\\Driver\\\\Result, array\\{Doctrine\\\\DBAL\\\\Driver\\\\Statement, 'execute'\\} given\\.$#"
+			message: "#^Parameter \\#2 \\$callback of method Sentry\\\\SentryBundle\\\\Tracing\\\\Doctrine\\\\DBAL\\\\AbstractTracingStatement\\:\\:traceFunction\\(\\) expects callable\\(\\.\\.\\.mixed\\)\\: Doctrine\\\\DBAL\\\\Driver\\\\Result, array\\{Doctrine\\\\DBAL\\\\Driver\\\\Statement, 'execute'\\} given\\.$#"
 			count: 1
 			path: src/Tracing/Doctrine/DBAL/TracingStatementForV3.php
 

psalm-baseline.xml

@@ -50,17 +50,6 @@
       <code>$params</code>
     </MoreSpecificImplementedParamType>
   </file>
-  <file src="src/Tracing/Doctrine/DBAL/TracingDriverForV32.php">
-    <InvalidReturnStatement occurrences="1">
-      <code>$this-&gt;decoratedDriver-&gt;getSchemaManager($conn, $platform)</code>
-    </InvalidReturnStatement>
-    <InvalidReturnType occurrences="1">
-      <code>AbstractSchemaManager&lt;T&gt;</code>
-    </InvalidReturnType>
-    <MoreSpecificImplementedParamType occurrences="1">
-      <code>$params</code>
-    </MoreSpecificImplementedParamType>
-  </file>
   <file src="src/Tracing/HttpClient/TraceableResponseForV5.php">
     <UndefinedInterfaceMethod occurrences="1">
       <code>toStream</code>

src/Tracing/Doctrine/DBAL/TracingDriverForV32.php

@@ -4,7 +4,6 @@
 
 namespace Sentry\SentryBundle;
 
-use Doctrine\DBAL\Exception\SchemaDoesNotExist;
 use Doctrine\DBAL\Result;
 use Sentry\SentryBundle\Tracing\Cache\TraceableCacheAdapter;
 use Sentry\SentryBundle\Tracing\Cache\TraceableCacheAdapterForV2;
@@ -15,7 +14,6 @@
 use Sentry\SentryBundle\Tracing\Doctrine\DBAL\TracingDriver;
 use Sentry\SentryBundle\Tracing\Doctrine\DBAL\TracingDriverForV2;
 use Sentry\SentryBundle\Tracing\Doctrine\DBAL\TracingDriverForV3;
-use Sentry\SentryBundle\Tracing\Doctrine\DBAL\TracingDriverForV32;
 use Sentry\SentryBundle\Tracing\Doctrine\DBAL\TracingStatement;
 use Sentry\SentryBundle\Tracing\Doctrine\DBAL\TracingStatementForV2;
 use Sentry\SentryBundle\Tracing\Doctrine\DBAL\TracingStatementForV3;
@@ -55,12 +53,7 @@ class_alias(TraceableTagAwareCacheAdapterForV2::class, TraceableTagAwareCacheAda
 if (!class_exists(TracingStatement::class)) {
     if (class_exists(Result::class)) {
         class_alias(TracingStatementForV3::class, TracingStatement::class);
-
-        if (class_exists(SchemaDoesNotExist::class)) {
-            class_alias(TracingDriverForV32::class, TracingDriver::class);
-        } else {
-            class_alias(TracingDriverForV3::class, TracingDriver::class);
-        }
+        class_alias(TracingDriverForV3::class, TracingDriver::class);
     } elseif (interface_exists(Result::class)) {
         class_alias(TracingStatementForV2::class, TracingStatement::class);
         class_alias(TracingDriverForV2::class, TracingDriver::class);

src/aliases.php

@@ -7,7 +7,6 @@
 use Doctrine\Bundle\DoctrineBundle\DoctrineBundle;
 use Doctrine\DBAL\Driver;
 use Doctrine\DBAL\Driver\ResultStatement;
-use Doctrine\DBAL\Exception\SchemaDoesNotExist;
 use PHPUnit\Framework\TestCase;
 
 abstract class DoctrineTestCase extends TestCase
@@ -29,12 +28,6 @@ protected static function isDoctrineDBALVersion3Installed(): bool
             && !self::isDoctrineDBALVersion2Installed();
     }
 
-    protected static function isDoctrineDBALVersion32Installed(): bool
-    {
-        return self::isDoctrineDBALInstalled()
-            && class_exists(SchemaDoesNotExist::class);
-    }
-
     protected static function isDoctrineBundlePackageInstalled(): bool
     {
         return class_exists(DoctrineBundle::class);

tests/DoctrineTestCase.php

@@ -11,7 +11,7 @@
 
 class MainCommand extends Command
 {
-    protected function configure(): void
+    protected function configure()
     {
         $this
             ->addOption('option1', null, InputOption::VALUE_NONE)

tests/End2End/App/Command/MainCommand.php

@@ -26,8 +26,8 @@ final class TracingDriverForV3Test extends DoctrineTestCase
 
     public static function setUpBeforeClass(): void
     {
-        if (!self::isDoctrineDBALVersion3Installed() || self::isDoctrineDBALVersion32Installed()) {
-            self::markTestSkipped('This test requires the version of the "doctrine/dbal" Composer package to be >= 3.0 <= 3.2.');
+        if (!self::isDoctrineDBALVersion3Installed()) {
+            self::markTestSkipped('This test requires the version of the "doctrine/dbal" Composer package to be >= 3.0.');
         }
     }
 

tests/Tracing/Doctrine/DBAL/TracingDriverForV32Test.php

@@ -55,9 +55,6 @@ public function testBindValue(): void
         $this->assertTrue($this->statement->bindValue('foo', 'bar', ParameterType::INTEGER));
     }
 
-    /**
-     * @group legacy
-     */
     public function testBindParam(): void
     {
         $variable = 'bar';