feature #34332 Allow \Throwable $previous everywhere (fancyweb)

nicolas-grekas · nicolas-grekas · commit 686e9b7d720f · 2019-11-12T15:56:48.000+01:00
This PR was merged into the 4.4 branch. Discussion ---------- Allow \Throwable $previous everywhere | Q | A | ------------- | --- | Branch? | 4.4 | Bug fix? | no | New feature? | no | Deprecations? | no | Tickets | - | License | MIT | Doc PR | - Commits ------- 59e044d Allow \Throwable $previous everywhere
diff --git a/src/Symfony/Bundle/FrameworkBundle/Controller/ControllerTrait.php b/src/Symfony/Bundle/FrameworkBundle/Controller/ControllerTrait.php
@@ -288,7 +288,7 @@ protected function stream(string $view, array $parameters = [], StreamedResponse
      *
      * @final
      */
-    protected function createNotFoundException(string $message = 'Not Found', \Exception $previous = null): NotFoundHttpException
+    protected function createNotFoundException(string $message = 'Not Found', \Throwable $previous = null): NotFoundHttpException
     {
         return new NotFoundHttpException($message, $previous);
     }
@@ -304,7 +304,7 @@ protected function createNotFoundException(string $message = 'Not Found', \Excep
      *
      * @final
      */
-    protected function createAccessDeniedException(string $message = 'Access Denied.', \Exception $previous = null): AccessDeniedException
+    protected function createAccessDeniedException(string $message = 'Access Denied.', \Throwable $previous = null): AccessDeniedException
     {
         if (!class_exists(AccessDeniedException::class)) {
             throw new \LogicException('You can not use the "createAccessDeniedException" method if the Security component is not available. Try running "composer require symfony/security-bundle".');
diff --git a/src/Symfony/Component/Config/Exception/FileLoaderImportCircularReferenceException.php b/src/Symfony/Component/Config/Exception/FileLoaderImportCircularReferenceException.php
@@ -18,7 +18,7 @@
  */
 class FileLoaderImportCircularReferenceException extends LoaderLoadException
 {
-    public function __construct(array $resources, int $code = null, \Exception $previous = null)
+    public function __construct(array $resources, int $code = null, \Throwable $previous = null)
     {
         $message = sprintf('Circular reference detected in "%s" ("%s" > "%s").', $this->varToString($resources[0]), implode('" > "', $resources), $resources[0]);
 
diff --git a/src/Symfony/Component/Config/Exception/FileLocatorFileNotFoundException.php b/src/Symfony/Component/Config/Exception/FileLocatorFileNotFoundException.php
@@ -20,7 +20,7 @@ class FileLocatorFileNotFoundException extends \InvalidArgumentException
 {
     private $paths;
 
-    public function __construct(string $message = '', int $code = 0, \Exception $previous = null, array $paths = [])
+    public function __construct(string $message = '', int $code = 0, \Throwable $previous = null, array $paths = [])
     {
         parent::__construct($message, $code, $previous);
 
diff --git a/src/Symfony/Component/DependencyInjection/Exception/AutowiringFailedException.php b/src/Symfony/Component/DependencyInjection/Exception/AutowiringFailedException.php
@@ -19,7 +19,7 @@ class AutowiringFailedException extends RuntimeException
     private $serviceId;
     private $messageCallback;
 
-    public function __construct(string $serviceId, $message = '', int $code = 0, \Exception $previous = null)
+    public function __construct(string $serviceId, $message = '', int $code = 0, \Throwable $previous = null)
     {
         $this->serviceId = $serviceId;
 
diff --git a/src/Symfony/Component/DependencyInjection/Exception/EnvParameterException.php b/src/Symfony/Component/DependencyInjection/Exception/EnvParameterException.php
@@ -18,7 +18,7 @@
  */
 class EnvParameterException extends InvalidArgumentException
 {
-    public function __construct(array $envs, \Exception $previous = null, string $message = 'Incompatible use of dynamic environment variables "%s" found in parameters.')
+    public function __construct(array $envs, \Throwable $previous = null, string $message = 'Incompatible use of dynamic environment variables "%s" found in parameters.')
     {
         parent::__construct(sprintf($message, implode('", "', $envs)), 0, $previous);
     }
diff --git a/src/Symfony/Component/DependencyInjection/Exception/ParameterCircularReferenceException.php b/src/Symfony/Component/DependencyInjection/Exception/ParameterCircularReferenceException.php
@@ -20,7 +20,7 @@ class ParameterCircularReferenceException extends RuntimeException
 {
     private $parameters;
 
-    public function __construct(array $parameters, \Exception $previous = null)
+    public function __construct(array $parameters, \Throwable $previous = null)
     {
         parent::__construct(sprintf('Circular reference detected for parameter "%s" ("%s" > "%s").', $parameters[0], implode('" > "', $parameters), $parameters[0]), 0, $previous);
 
diff --git a/src/Symfony/Component/DependencyInjection/Exception/ParameterNotFoundException.php b/src/Symfony/Component/DependencyInjection/Exception/ParameterNotFoundException.php
@@ -30,11 +30,11 @@ class ParameterNotFoundException extends InvalidArgumentException implements Not
      * @param string      $key                  The requested parameter key
      * @param string      $sourceId             The service id that references the non-existent parameter
      * @param string      $sourceKey            The parameter key that references the non-existent parameter
-     * @param \Exception  $previous             The previous exception
+     * @param \Throwable  $previous             The previous exception
      * @param string[]    $alternatives         Some parameter name alternatives
      * @param string|null $nonNestedAlternative The alternative parameter name when the user expected dot notation for nested parameters
      */
-    public function __construct(string $key, string $sourceId = null, string $sourceKey = null, \Exception $previous = null, array $alternatives = [], string $nonNestedAlternative = null)
+    public function __construct(string $key, string $sourceId = null, string $sourceKey = null, \Throwable $previous = null, array $alternatives = [], string $nonNestedAlternative = null)
     {
         $this->key = $key;
         $this->sourceId = $sourceId;
diff --git a/src/Symfony/Component/DependencyInjection/Exception/ServiceCircularReferenceException.php b/src/Symfony/Component/DependencyInjection/Exception/ServiceCircularReferenceException.php
@@ -21,7 +21,7 @@ class ServiceCircularReferenceException extends RuntimeException
     private $serviceId;
     private $path;
 
-    public function __construct(string $serviceId, array $path, \Exception $previous = null)
+    public function __construct(string $serviceId, array $path, \Throwable $previous = null)
     {
         parent::__construct(sprintf('Circular reference detected for service "%s", path: "%s".', $serviceId, implode(' -> ', $path)), 0, $previous);
 
diff --git a/src/Symfony/Component/DependencyInjection/Exception/ServiceNotFoundException.php b/src/Symfony/Component/DependencyInjection/Exception/ServiceNotFoundException.php
@@ -24,7 +24,7 @@ class ServiceNotFoundException extends InvalidArgumentException implements NotFo
     private $sourceId;
     private $alternatives;
 
-    public function __construct(string $id, string $sourceId = null, \Exception $previous = null, array $alternatives = [], string $msg = null)
+    public function __construct(string $id, string $sourceId = null, \Throwable $previous = null, array $alternatives = [], string $msg = null)
     {
         if (null !== $msg) {
             // no-op
diff --git a/src/Symfony/Component/Dotenv/Exception/FormatException.php b/src/Symfony/Component/Dotenv/Exception/FormatException.php
@@ -20,7 +20,7 @@ final class FormatException extends \LogicException implements ExceptionInterfac
 {
     private $context;
 
-    public function __construct(string $message, FormatExceptionContext $context, int $code = 0, \Exception $previous = null)
+    public function __construct(string $message, FormatExceptionContext $context, int $code = 0, \Throwable $previous = null)
     {
         $this->context = $context;
 
diff --git a/src/Symfony/Component/Dotenv/Exception/PathException.php b/src/Symfony/Component/Dotenv/Exception/PathException.php
@@ -18,7 +18,7 @@
  */
 final class PathException extends \RuntimeException implements ExceptionInterface
 {
-    public function __construct(string $path, int $code = 0, \Exception $previous = null)
+    public function __construct(string $path, int $code = 0, \Throwable $previous = null)
     {
         parent::__construct(sprintf('Unable to read the "%s" environment file.', $path), $code, $previous);
     }
diff --git a/src/Symfony/Component/Filesystem/Exception/FileNotFoundException.php b/src/Symfony/Component/Filesystem/Exception/FileNotFoundException.php
@@ -19,7 +19,7 @@
  */
 class FileNotFoundException extends IOException
 {
-    public function __construct(string $message = null, int $code = 0, \Exception $previous = null, string $path = null)
+    public function __construct(string $message = null, int $code = 0, \Throwable $previous = null, string $path = null)
     {
         if (null === $message) {
             if (null === $path) {
diff --git a/src/Symfony/Component/Filesystem/Exception/IOException.php b/src/Symfony/Component/Filesystem/Exception/IOException.php
@@ -22,7 +22,7 @@ class IOException extends \RuntimeException implements IOExceptionInterface
 {
     private $path;
 
-    public function __construct(string $message, int $code = 0, \Exception $previous = null, string $path = null)
+    public function __construct(string $message, int $code = 0, \Throwable $previous = null, string $path = null)
     {
         $this->path = $path;
 
diff --git a/src/Symfony/Component/Mailer/Exception/HttpTransportException.php b/src/Symfony/Component/Mailer/Exception/HttpTransportException.php
@@ -20,7 +20,7 @@ class HttpTransportException extends TransportException
 {
     private $response;
 
-    public function __construct(string $message = null, ResponseInterface $response, int $code = 0, \Exception $previous = null)
+    public function __construct(string $message = null, ResponseInterface $response, int $code = 0, \Throwable $previous = null)
     {
         parent::__construct($message, $code, $previous);
 
diff --git a/src/Symfony/Component/Routing/Exception/MethodNotAllowedException.php b/src/Symfony/Component/Routing/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);
 
diff --git a/src/Symfony/Component/Security/Core/Exception/AccessDeniedException.php b/src/Symfony/Component/Security/Core/Exception/AccessDeniedException.php
@@ -21,7 +21,7 @@ class AccessDeniedException extends RuntimeException
     private $attributes = [];
     private $subject;
 
-    public function __construct(string $message = 'Access Denied.', \Exception $previous = null)
+    public function __construct(string $message = 'Access Denied.', \Throwable $previous = null)
     {
         parent::__construct($message, 403, $previous);
     }
diff --git a/src/Symfony/Component/Security/Core/Exception/CustomUserMessageAuthenticationException.php b/src/Symfony/Component/Security/Core/Exception/CustomUserMessageAuthenticationException.php
@@ -26,7 +26,7 @@ class CustomUserMessageAuthenticationException extends AuthenticationException
 
     private $messageData = [];
 
-    public function __construct(string $message = '', array $messageData = [], int $code = 0, \Exception $previous = null)
+    public function __construct(string $message = '', array $messageData = [], int $code = 0, \Throwable $previous = null)
     {
         parent::__construct($message, $code, $previous);
 
diff --git a/src/Symfony/Component/Security/Core/Exception/LogoutException.php b/src/Symfony/Component/Security/Core/Exception/LogoutException.php
@@ -18,7 +18,7 @@
  */
 class LogoutException extends RuntimeException
 {
-    public function __construct(string $message = 'Logout Exception', \Exception $previous = null)
+    public function __construct(string $message = 'Logout Exception', \Throwable $previous = null)
     {
         parent::__construct($message, 403, $previous);
     }
diff --git a/src/Symfony/Component/Serializer/Exception/ExtraAttributesException.php b/src/Symfony/Component/Serializer/Exception/ExtraAttributesException.php
@@ -20,7 +20,7 @@ class ExtraAttributesException extends RuntimeException
 {
     private $extraAttributes;
 
-    public function __construct(array $extraAttributes, \Exception $previous = null)
+    public function __construct(array $extraAttributes, \Throwable $previous = null)
     {
         $msg = sprintf('Extra attributes are not allowed ("%s" are unknown).', implode('", "', $extraAttributes));
 
diff --git a/src/Symfony/Component/VarDumper/Exception/ThrowingCasterException.php b/src/Symfony/Component/VarDumper/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);
     }
diff --git a/src/Symfony/Component/Yaml/Exception/ParseException.php b/src/Symfony/Component/Yaml/Exception/ParseException.php
@@ -30,7 +30,7 @@ class ParseException extends RuntimeException
      * @param string|null     $parsedFile The file name where the error occurred
      * @param \Exception|null $previous   The previous exception
      */
-    public function __construct(string $message, int $parsedLine = -1, string $snippet = null, string $parsedFile = null, \Exception $previous = null)
+    public function __construct(string $message, int $parsedLine = -1, string $snippet = null, string $parsedFile = null, \Throwable $previous = null)
     {
         $this->parsedFile = $parsedFile;
         $this->parsedLine = $parsedLine;

Original file line number	Diff line number	Diff line change
`@@ -288,7 +288,7 @@ protected function stream(string $view, array $parameters = [], StreamedResponse`
`288`	`288`	`*`
`289`	`289`	`* @final`
`290`	`290`	`*/`
`291`		`- protected function createNotFoundException(string $message = 'Not Found', \Exception $previous = null): NotFoundHttpException`
	`291`	`+ protected function createNotFoundException(string $message = 'Not Found', \Throwable $previous = null): NotFoundHttpException`
`292`	`292`	`{`
`293`	`293`	`return new NotFoundHttpException($message, $previous);`
`294`	`294`	`}`
`@@ -304,7 +304,7 @@ protected function createNotFoundException(string $message = 'Not Found', \Excep`
`304`	`304`	`*`
`305`	`305`	`* @final`
`306`	`306`	`*/`
`307`		`- protected function createAccessDeniedException(string $message = 'Access Denied.', \Exception $previous = null): AccessDeniedException`
	`307`	`+ protected function createAccessDeniedException(string $message = 'Access Denied.', \Throwable $previous = null): AccessDeniedException`
`308`	`308`	`{`
`309`	`309`	`if (!class_exists(AccessDeniedException::class)) {`
`310`	`310`	`throw new \LogicException('You can not use the "createAccessDeniedException" method if the Security component is not available. Try running "composer require symfony/security-bundle".');`
Original file line number	Diff line number	Diff line change
`@@ -18,7 +18,7 @@`
`18`	`18`	`*/`
`19`	`19`	`class FileLoaderImportCircularReferenceException extends LoaderLoadException`
`20`	`20`	`{`
`21`		`- public function __construct(array $resources, int $code = null, \Exception $previous = null)`
	`21`	`+ public function __construct(array $resources, int $code = null, \Throwable $previous = null)`
`22`	`22`	`{`
`23`	`23`	`$message = sprintf('Circular reference detected in "%s" ("%s" > "%s").', $this->varToString($resources[0]), implode('" > "', $resources), $resources[0]);`
`24`	`24`
Original file line number	Diff line number	Diff line change
`@@ -20,7 +20,7 @@ class FileLocatorFileNotFoundException extends \InvalidArgumentException`
`20`	`20`	`{`
`21`	`21`	`private $paths;`
`22`	`22`
`23`		`- public function __construct(string $message = '', int $code = 0, \Exception $previous = null, array $paths = [])`
	`23`	`+ public function __construct(string $message = '', int $code = 0, \Throwable $previous = null, array $paths = [])`
`24`	`24`	`{`
`25`	`25`	`parent::__construct($message, $code, $previous);`
`26`	`26`
Original file line number	Diff line number	Diff line change
`@@ -19,7 +19,7 @@ class AutowiringFailedException extends RuntimeException`
`19`	`19`	`private $serviceId;`
`20`	`20`	`private $messageCallback;`
`21`	`21`
`22`		`- public function __construct(string $serviceId, $message = '', int $code = 0, \Exception $previous = null)`
	`22`	`+ public function __construct(string $serviceId, $message = '', int $code = 0, \Throwable $previous = null)`
`23`	`23`	`{`
`24`	`24`	`$this->serviceId = $serviceId;`
`25`	`25`
Original file line number	Diff line number	Diff line change
`@@ -20,7 +20,7 @@ class ParameterCircularReferenceException extends RuntimeException`
`20`	`20`	`{`
`21`	`21`	`private $parameters;`
`22`	`22`
`23`		`- public function __construct(array $parameters, \Exception $previous = null)`
	`23`	`+ public function __construct(array $parameters, \Throwable $previous = null)`
`24`	`24`	`{`
`25`	`25`	`parent::__construct(sprintf('Circular reference detected for parameter "%s" ("%s" > "%s").', $parameters[0], implode('" > "', $parameters), $parameters[0]), 0, $previous);`
`26`	`26`
Original file line number	Diff line number	Diff line change
`@@ -21,7 +21,7 @@ class ServiceCircularReferenceException extends RuntimeException`
`21`	`21`	`private $serviceId;`
`22`	`22`	`private $path;`
`23`	`23`
`24`		`- public function __construct(string $serviceId, array $path, \Exception $previous = null)`
	`24`	`+ public function __construct(string $serviceId, array $path, \Throwable $previous = null)`
`25`	`25`	`{`
`26`	`26`	`parent::__construct(sprintf('Circular reference detected for service "%s", path: "%s".', $serviceId, implode(' -> ', $path)), 0, $previous);`
`27`	`27`
Original file line number	Diff line number	Diff line change
`@@ -24,7 +24,7 @@ class ServiceNotFoundException extends InvalidArgumentException implements NotFo`
`24`	`24`	`private $sourceId;`
`25`	`25`	`private $alternatives;`
`26`	`26`
`27`		`- public function __construct(string $id, string $sourceId = null, \Exception $previous = null, array $alternatives = [], string $msg = null)`
	`27`	`+ public function __construct(string $id, string $sourceId = null, \Throwable $previous = null, array $alternatives = [], string $msg = null)`
`28`	`28`	`{`
`29`	`29`	`if (null !== $msg) {`
`30`	`30`	`// no-op`
Original file line number	Diff line number	Diff line change
`@@ -20,7 +20,7 @@ final class FormatException extends \LogicException implements ExceptionInterfac`
`20`	`20`	`{`
`21`	`21`	`private $context;`
`22`	`22`
`23`		`- public function __construct(string $message, FormatExceptionContext $context, int $code = 0, \Exception $previous = null)`
	`23`	`+ public function __construct(string $message, FormatExceptionContext $context, int $code = 0, \Throwable $previous = null)`
`24`	`24`	`{`
`25`	`25`	`$this->context = $context;`
`26`	`26`
Original file line number	Diff line number	Diff line change
`@@ -19,7 +19,7 @@`
`19`	`19`	`*/`
`20`	`20`	`class FileNotFoundException extends IOException`
`21`	`21`	`{`
`22`		`- public function __construct(string $message = null, int $code = 0, \Exception $previous = null, string $path = null)`
	`22`	`+ public function __construct(string $message = null, int $code = 0, \Throwable $previous = null, string $path = null)`
`23`	`23`	`{`
`24`	`24`	`if (null === $message) {`
`25`	`25`	`if (null === $path) {`
Original file line number	Diff line number	Diff line change
`@@ -22,7 +22,7 @@ class IOException extends \RuntimeException implements IOExceptionInterface`
`22`	`22`	`{`
`23`	`23`	`private $path;`
`24`	`24`
`25`		`- public function __construct(string $message, int $code = 0, \Exception $previous = null, string $path = null)`
	`25`	`+ public function __construct(string $message, int $code = 0, \Throwable $previous = null, string $path = null)`
`26`	`26`	`{`
`27`	`27`	`$this->path = $path;`
`28`	`28`