Merge branch '4.4'

nicolas-grekas · nicolas-grekas · commit f4e9a16c28b4 · 2019-11-12T15:58:10.000+01:00
* 4.4:
  Revert "feature #34329 [ExpressionLanguage] add XOR operator (ottaviano)"
  Allow \Throwable $previous everywhere
diff --git a/Exception/MethodNotAllowedException.php b/Exception/MethodNotAllowedException.php
@@ -22,7 +22,7 @@ class MethodNotAllowedException extends \RuntimeException implements ExceptionIn
 {
     protected $allowedMethods = [];
 
-    public function __construct(array $allowedMethods, string $message = null, int $code = 0, \Exception $previous = null)
+    public function __construct(array $allowedMethods, string $message = null, int $code = 0, \Throwable $previous = null)
     {
         $this->allowedMethods = array_map('strtoupper', $allowedMethods);
 

Original file line number	Diff line number	Diff line change
`@@ -22,7 +22,7 @@ class MethodNotAllowedException extends \RuntimeException implements ExceptionIn`
`22`	`22`	`{`
`23`	`23`	`protected $allowedMethods = [];`
`24`	`24`
`25`		`- public function __construct(array $allowedMethods, string $message = null, int $code = 0, \Exception $previous = null)`
	`25`	`+ public function __construct(array $allowedMethods, string $message = null, int $code = 0, \Throwable $previous = null)`
`26`	`26`	`{`
`27`	`27`	`$this->allowedMethods = array_map('strtoupper', $allowedMethods);`
`28`	`28`