Merge branch '4.4'

nicolas-grekas · nicolas-grekas · commit 98c818996296 · 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/ThrowingCasterException.php b/Exception/ThrowingCasterException.php
@@ -17,9 +17,9 @@
 class ThrowingCasterException extends \Exception
 {
     /**
-     * @param \Exception $prev The exception thrown from the caster
+     * @param \Throwable $prev The exception thrown from the caster
      */
-    public function __construct(\Exception $prev)
+    public function __construct(\Throwable $prev)
     {
         parent::__construct('Unexpected '.\get_class($prev).' thrown from a caster: '.$prev->getMessage(), 0, $prev);
     }

Original file line number	Diff line number	Diff line change
`@@ -17,9 +17,9 @@`
`17`	`17`	`class ThrowingCasterException extends \Exception`
`18`	`18`	`{`
`19`	`19`	`/**`
`20`		`- * @param \Exception $prev The exception thrown from the caster`
	`20`	`+ * @param \Throwable $prev The exception thrown from the caster`
`21`	`21`	`*/`
`22`		`- public function __construct(\Exception $prev)`
	`22`	`+ public function __construct(\Throwable $prev)`
`23`	`23`	`{`
`24`	`24`	`parent::__construct('Unexpected '.\get_class($prev).' thrown from a caster: '.$prev->getMessage(), 0, $prev);`
`25`	`25`	`}`