Merge branch '5.4' into 6.2

* 5.4:
  Avoid call on null
  [Notifier] Document Firebase options object in readme
  [ErrorHandler] Fix sending Vary header with SerializerErrorRenderer
  Fix intl data tests
  [DoctrineBridge] fix issue with missing stopwatch events
  [HttpClient] Fix canceling MockResponse

Author: nicolas-grekas

Middleware/Debug/Connection.php

@@ -42,6 +42,7 @@ public function prepare(string $sql): DriverStatement
             $this->debugDataHolder,
             $this->connectionName,
             $sql,
+            $this->stopwatch,
         );
     }
 

Middleware/Debug/Statement.php

@@ -15,6 +15,7 @@
 use Doctrine\DBAL\Driver\Result as ResultInterface;
 use Doctrine\DBAL\Driver\Statement as StatementInterface;
 use Doctrine\DBAL\ParameterType;
+use Symfony\Component\Stopwatch\Stopwatch;
 
 /**
  * @author Laurent VOULLEMIER <[email protected]>
@@ -30,6 +31,7 @@ public function __construct(
         private DebugDataHolder $debugDataHolder,
         private string $connectionName,
         string $sql,
+        private ?Stopwatch $stopwatch = null,
     ) {
         parent::__construct($statement);
 
@@ -59,12 +61,14 @@ public function execute($params = null): ResultInterface
         // clone to prevent variables by reference to change
         $this->debugDataHolder->addQuery($this->connectionName, $query = clone $this->query);
 
+        $this->stopwatch?->start('doctrine', 'doctrine');
         $query->start();
 
         try {
             $result = parent::execute($params);
         } finally {
             $query->stop();
+            $this->stopwatch?->stop('doctrine');
         }
 
         return $result;

Tests/Middleware/Debug/MiddlewareTest.php

@@ -156,10 +156,6 @@ public function testWithParamBound(callable $executeMethod)
         $executeMethod($stmt);
 
         // Debug data should not be affected by these changes
-        $product = 'product2';
-        $price = 13.5;
-        $stock = 4;
-
         $debug = $this->debugDataHolder->getData()['default'] ?? [];
         $this->assertCount(2, $debug);
         $this->assertSame('INSERT INTO products(name, price, stock) VALUES (?, ?, ?)', $debug[1]['sql']);
@@ -219,6 +215,14 @@ public static function provideExecuteAndEndTransactionMethods(): array
                 static fn (Connection $conn, string $sql) => $conn->executeQuery($sql),
                 static fn (Connection $conn) => $conn->rollBack(),
             ],
+            'prepared statement' => [
+                static function (Connection $conn, string $sql): Result {
+                    return $conn->prepare($sql)->executeQuery();
+                },
+                static function (Connection $conn): bool {
+                    return $conn->commit();
+                },
+            ],
         ];
     }