Remove \Throwable support deprecation layer

fancyweb · nicolas-grekas · commit 2af0b8096170 · 2019-11-08T10:00:49.000+01:00
diff --git a/DataCollector/MessageDataCollector.php b/DataCollector/MessageDataCollector.php
@@ -32,7 +32,7 @@ public function __construct(MessageLoggerListener $logger)
     /**
      * {@inheritdoc}
      */
-    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/MessageDataCollector.php b/MessageDataCollector.php
@@ -32,7 +32,7 @@ public function __construct(MessageLoggerListener $logger)
     /**
      * {@inheritdoc}
      */
-    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
@@ -33,6 +33,9 @@
         "symfony/postmark-mailer": "^4.4|^5.0",
         "symfony/sendgrid-mailer": "^4.4|^5.0"
     },
+    "conflict": {
+        "symfony/http-kernel": "<4.4"
+    },
     "autoload": {
         "psr-4": { "Symfony\\Component\\Mailer\\": "" },
         "exclude-from-classmap": [

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