[DoctrineBridge] Reopen DoctrineDataCollector to extensibility

fancyweb · fancyweb · commit 36fed5111822 · 2019-11-06T14:58:24.000+01:00
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -8,7 +8,6 @@ CHANGELOG
  * deprecated `RegistryInterface`, use `Doctrine\Common\Persistence\ManagerRegistry`
  * added support for invokable event listeners
  * added `getMetadataDriverClass` method to deprecate class parameters in service configuration files
- * Marked the `DoctrineDataCollector` class as `@final`.
 
 4.3.0
 -----
diff --git a/DataCollector/DoctrineDataCollector.php b/DataCollector/DoctrineDataCollector.php
@@ -23,8 +23,6 @@
  * DoctrineDataCollector.
  *
  * @author Fabien Potencier <fabien@symfony.com>
- *
- * @final since Symfony 4.4
  */
 class DoctrineDataCollector extends DataCollector
 {
@@ -56,8 +54,10 @@ public function addLogger($name, DebugStack $logger)
 
     /**
      * {@inheritdoc}
+     *
+     * @param \Throwable|null $exception
      */
-    public function collect(Request $request, Response $response, \Exception $exception = null)
+    public function collect(Request $request, Response $response/*, \Throwable $exception = null*/)
     {
         $queries = [];
         foreach ($this->loggers as $name => $logger) {

Original file line number	Diff line number	Diff line change
`@@ -23,8 +23,6 @@`
`23`	`23`	`* DoctrineDataCollector.`
`24`	`24`	`*`
`25`	`25`	`* @author Fabien Potencier <[email protected]>`
`26`		`- *`
`27`		`- * @final since Symfony 4.4`
`28`	`26`	`*/`
`29`	`27`	`class DoctrineDataCollector extends DataCollector`
`30`	`28`	`{`
`@@ -56,8 +54,10 @@ public function addLogger($name, DebugStack $logger)`
`56`	`54`
`57`	`55`	`/**`
`58`	`56`	`* {@inheritdoc}`
	`57`	`+ *`
	`58`	`+ * @param \Throwable\|null $exception`
`59`	`59`	`*/`
`60`		`- public function collect(Request $request, Response $response, \Exception $exception = null)`
	`60`	`+ public function collect(Request $request, Response $response/, \Throwable $exception = null/)`
`61`	`61`	`{`
`62`	`62`	`$queries = [];`
`63`	`63`	`foreach ($this->loggers as $name => $logger) {`