Fix some \Throwable support remaining issues

fancyweb · nicolas-grekas · commit f73d7c800198 · 2019-11-12T18:18:47.000+01:00
diff --git a/DataCollector/MessageDataCollector.php b/DataCollector/MessageDataCollector.php
@@ -31,8 +31,10 @@ public function __construct(MessageLoggerListener $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*/)
     {
         $this->data['events'] = $this->events;
     }
diff --git a/composer.json b/composer.json
@@ -34,6 +34,7 @@
         "symfony/sendgrid-mailer": "^4.4|^5.0"
     },
     "conflict": {
+        "symfony/http-kernel": "<4.4",
         "symfony/sendgrid-mailer": "<4.4"
     },
     "autoload": {

Original file line number	Diff line number	Diff line change
`@@ -31,8 +31,10 @@ public function __construct(MessageLoggerListener $logger)`
`31`	`31`
`32`	`32`	`/**`
`33`	`33`	`* {@inheritdoc}`
	`34`	`+ *`
	`35`	`+ * @param \Throwable\|null $exception`
`34`	`36`	`*/`
`35`		`- public function collect(Request $request, Response $response, \Exception $exception = null)`
	`37`	`+ public function collect(Request $request, Response $response/, \Throwable $exception = null/)`
`36`	`38`	`{`
`37`	`39`	`$this->data['events'] = $this->events;`
`38`	`40`	`}`