Remove \Throwable support deprecation layer

fancyweb · fancyweb · commit b0ac75e8adcd · 2019-11-07T18:16:01.000+01:00
diff --git a/src/Symfony/Bridge/Doctrine/DataCollector/DoctrineDataCollector.php b/src/Symfony/Bridge/Doctrine/DataCollector/DoctrineDataCollector.php
@@ -52,10 +52,8 @@ public function addLogger(string $name, DebugStack $logger)
 
     /**
      * {@inheritdoc}
-     *
-     * @param \Throwable|null $exception
      */
-    public function collect(Request $request, Response $response/*, \Throwable $exception = null*/)
+    public function collect(Request $request, Response $response, \Throwable $exception = null)
     {
         $queries = [];
         foreach ($this->loggers as $name => $logger) {
diff --git a/src/Symfony/Bridge/Twig/DataCollector/TwigDataCollector.php b/src/Symfony/Bridge/Twig/DataCollector/TwigDataCollector.php
@@ -26,7 +26,7 @@
  *
  * @author Fabien Potencier <fabien@symfony.com>
  *
- * @final since Symfony 4.4
+ * @final
  */
 class TwigDataCollector extends DataCollector implements LateDataCollectorInterface
 {
@@ -43,7 +43,7 @@ public function __construct(Profile $profile, Environment $twig = null)
     /**
      * {@inheritdoc}
      */
-    public function collect(Request $request, Response $response, \Exception $exception = null)
+    public function collect(Request $request, Response $response, \Throwable $exception = null)
     {
     }
 
diff --git a/src/Symfony/Bridge/Twig/composer.json b/src/Symfony/Bridge/Twig/composer.json
@@ -51,6 +51,7 @@
         "symfony/console": "<4.4",
         "symfony/form": "<5.0",
         "symfony/http-foundation": "<4.4",
+        "symfony/http-kernel": "<4.4",
         "symfony/translation": "<5.0",
         "symfony/workflow": "<4.4"
     },
diff --git a/src/Symfony/Bundle/FrameworkBundle/DataCollector/RouterDataCollector.php b/src/Symfony/Bundle/FrameworkBundle/DataCollector/RouterDataCollector.php
@@ -20,7 +20,7 @@
  *
  * @author Fabien Potencier <fabien@symfony.com>
  *
- * @final since Symfony 4.4
+ * @final
  */
 class RouterDataCollector extends BaseRouterDataCollector
 {
diff --git a/src/Symfony/Bundle/SecurityBundle/DataCollector/SecurityDataCollector.php b/src/Symfony/Bundle/SecurityBundle/DataCollector/SecurityDataCollector.php
@@ -33,7 +33,7 @@
 /**
  * @author Fabien Potencier <fabien@symfony.com>
  *
- * @final since Symfony 4.4
+ * @final
  */
 class SecurityDataCollector extends DataCollector implements LateDataCollectorInterface
 {
@@ -59,7 +59,7 @@ public function __construct(TokenStorageInterface $tokenStorage = null, RoleHier
     /**
      * {@inheritdoc}
      */
-    public function collect(Request $request, Response $response, \Exception $exception = null)
+    public function collect(Request $request, Response $response, \Throwable $exception = null)
     {
         if (null === $this->tokenStorage) {
             $this->data = [
diff --git a/src/Symfony/Component/Cache/DataCollector/CacheDataCollector.php b/src/Symfony/Component/Cache/DataCollector/CacheDataCollector.php
@@ -22,7 +22,7 @@
  * @author Aaron Scherer <aequasi@gmail.com>
  * @author Tobias Nyholm <tobias.nyholm@gmail.com>
  *
- * @final since Symfony 4.4
+ * @final
  */
 class CacheDataCollector extends DataCollector implements LateDataCollectorInterface
 {
@@ -39,7 +39,7 @@ public function addInstance(string $name, TraceableAdapter $instance)
     /**
      * {@inheritdoc}
      */
-    public function collect(Request $request, Response $response, \Exception $exception = null)
+    public function collect(Request $request, Response $response, \Throwable $exception = null)
     {
         $empty = ['calls' => [], 'config' => [], 'options' => [], 'statistics' => []];
         $this->data = ['instances' => $empty, 'total' => $empty];
diff --git a/src/Symfony/Component/Cache/composer.json b/src/Symfony/Component/Cache/composer.json
@@ -41,7 +41,8 @@
     "conflict": {
         "doctrine/dbal": "<2.5",
         "symfony/dependency-injection": "<4.4",
-        "symfony/var-dumper": "<4.4"
+        "symfony/var-dumper": "<4.4",
+        "symfony/http-kernel": "<4.4"
     },
     "autoload": {
         "psr-4": { "Symfony\\Component\\Cache\\": "" },
diff --git a/src/Symfony/Component/Console/Application.php b/src/Symfony/Component/Console/Application.php
@@ -42,7 +42,6 @@
 use Symfony\Component\Console\Output\OutputInterface;
 use Symfony\Component\Console\Style\SymfonyStyle;
 use Symfony\Component\ErrorHandler\ErrorHandler;
-use Symfony\Component\ErrorHandler\Exception\ErrorException;
 use Symfony\Contracts\EventDispatcher\EventDispatcherInterface;
 use Symfony\Contracts\Service\ResetInterface;
 
@@ -758,79 +757,19 @@ public static function getAbbreviations(array $names)
         return $abbrevs;
     }
 
-    /**
-     * Renders a caught exception.
-     *
-     * @deprecated since Symfony 4.4, use "renderThrowable()" instead
-     */
-    public function renderException(\Exception $e, OutputInterface $output)
-    {
-        @trigger_error(sprintf('The "%s::renderException()" method is deprecated since Symfony 4.4, use "renderThrowable()" instead.', __CLASS__), E_USER_DEPRECATED);
-
-        $output->writeln('', OutputInterface::VERBOSITY_QUIET);
-
-        $this->doRenderException($e, $output);
-
-        $this->finishRenderThrowableOrException($output);
-    }
-
     public function renderThrowable(\Throwable $e, OutputInterface $output): void
     {
-        if (__CLASS__ !== \get_class($this) && __CLASS__ === (new \ReflectionMethod($this, 'renderThrowable'))->getDeclaringClass()->getName() && __CLASS__ !== (new \ReflectionMethod($this, 'renderException'))->getDeclaringClass()->getName()) {
-            @trigger_error(sprintf('The "%s::renderException()" method is deprecated since Symfony 4.4, use "renderThrowable()" instead.', __CLASS__), E_USER_DEPRECATED);
-
-            if (!$e instanceof \Exception) {
-                $e = class_exists(ErrorException::class) ? new ErrorException($e) : new \ErrorException($e->getMessage(), $e->getCode(), E_ERROR, $e->getFile(), $e->getLine());
-            }
-
-            $this->renderException($e, $output);
-
-            return;
-        }
-
         $output->writeln('', OutputInterface::VERBOSITY_QUIET);
 
         $this->doRenderThrowable($e, $output);
 
-        $this->finishRenderThrowableOrException($output);
-    }
-
-    private function finishRenderThrowableOrException(OutputInterface $output): void
-    {
         if (null !== $this->runningCommand) {
             $output->writeln(sprintf('<info>%s</info>', sprintf($this->runningCommand->getSynopsis(), $this->getName())), OutputInterface::VERBOSITY_QUIET);
             $output->writeln('', OutputInterface::VERBOSITY_QUIET);
         }
     }
 
-    /**
-     * @deprecated since Symfony 4.4, use "doRenderThrowable()" instead
-     */
-    protected function doRenderException(\Exception $e, OutputInterface $output)
-    {
-        @trigger_error(sprintf('The "%s::doRenderException()" method is deprecated since Symfony 4.4, use "doRenderThrowable()" instead.', __CLASS__), E_USER_DEPRECATED);
-
-        $this->doActuallyRenderThrowable($e, $output);
-    }
-
     protected function doRenderThrowable(\Throwable $e, OutputInterface $output): void
-    {
-        if (__CLASS__ !== \get_class($this) && __CLASS__ === (new \ReflectionMethod($this, 'doRenderThrowable'))->getDeclaringClass()->getName() && __CLASS__ !== (new \ReflectionMethod($this, 'doRenderException'))->getDeclaringClass()->getName()) {
-            @trigger_error(sprintf('The "%s::doRenderException()" method is deprecated since Symfony 4.4, use "doRenderThrowable()" instead.', __CLASS__), E_USER_DEPRECATED);
-
-            if (!$e instanceof \Exception) {
-                $e = class_exists(ErrorException::class) ? new ErrorException($e) : new \ErrorException($e->getMessage(), $e->getCode(), E_ERROR, $e->getFile(), $e->getLine());
-            }
-
-            $this->doRenderException($e, $output);
-
-            return;
-        }
-
-        $this->doActuallyRenderThrowable($e, $output);
-    }
-
-    private function doActuallyRenderThrowable(\Throwable $e, OutputInterface $output): void
     {
         do {
             $message = trim($e->getMessage());
diff --git a/src/Symfony/Component/Form/Extension/DataCollector/FormDataCollector.php b/src/Symfony/Component/Form/Extension/DataCollector/FormDataCollector.php
@@ -81,7 +81,7 @@ public function __construct(FormDataExtractorInterface $dataExtractor)
     /**
      * Does nothing. The data is collected during the form event listeners.
      */
-    public function collect(Request $request, Response $response, \Exception $exception = null)
+    public function collect(Request $request, Response $response, \Throwable $exception = null)
     {
     }
 
diff --git a/src/Symfony/Component/HttpClient/DataCollector/HttpClientDataCollector.php b/src/Symfony/Component/HttpClient/DataCollector/HttpClientDataCollector.php
@@ -34,7 +34,7 @@ public function registerClient(string $name, TraceableHttpClient $client)
     /**
      * {@inheritdoc}
      */
-    public function collect(Request $request, Response $response, \Exception $exception = null)
+    public function collect(Request $request, Response $response, \Throwable $exception = null)
     {
         $this->initData();
 
diff --git a/src/Symfony/Component/HttpClient/composer.json b/src/Symfony/Component/HttpClient/composer.json
@@ -36,6 +36,9 @@
         "symfony/service-contracts": "^1.0|^2",
         "symfony/var-dumper": "^4.4|^5.0"
     },
+    "conflict": {
+        "symfony/http-kernel": "<4.4"
+    },
     "autoload": {
         "psr-4": { "Symfony\\Component\\HttpClient\\": "" },
         "exclude-from-classmap": [
diff --git a/src/Symfony/Component/HttpKernel/DataCollector/AjaxDataCollector.php b/src/Symfony/Component/HttpKernel/DataCollector/AjaxDataCollector.php
@@ -19,11 +19,11 @@
  *
  * @author Bart van den Burg <bart@burgov.nl>
  *
- * @final since Symfony 4.4
+ * @final
  */
 class AjaxDataCollector extends DataCollector
 {
-    public function collect(Request $request, Response $response, \Exception $exception = null)
+    public function collect(Request $request, Response $response, \Throwable $exception = null)
     {
         // all collecting is done client side
     }
diff --git a/src/Symfony/Component/HttpKernel/DataCollector/ConfigDataCollector.php b/src/Symfony/Component/HttpKernel/DataCollector/ConfigDataCollector.php
@@ -20,7 +20,7 @@
 /**
  * @author Fabien Potencier <fabien@symfony.com>
  *
- * @final since Symfony 4.4
+ * @final
  */
 class ConfigDataCollector extends DataCollector implements LateDataCollectorInterface
 {
@@ -46,7 +46,7 @@ public function setKernel(KernelInterface $kernel = null)
     /**
      * {@inheritdoc}
      */
-    public function collect(Request $request, Response $response, \Exception $exception = null)
+    public function collect(Request $request, Response $response, \Throwable $exception = null)
     {
         $this->data = [
             'token' => $response->headers->get('X-Debug-Token'),
diff --git a/src/Symfony/Component/HttpKernel/DataCollector/DataCollectorInterface.php b/src/Symfony/Component/HttpKernel/DataCollector/DataCollectorInterface.php
@@ -24,10 +24,8 @@ interface DataCollectorInterface extends ResetInterface
 {
     /**
      * Collects data for the given Request and Response.
-     *
-     * @param \Throwable|null $exception
      */
-    public function collect(Request $request, Response $response/*, \Throwable $exception = null*/);
+    public function collect(Request $request, Response $response, \Throwable $exception = null);
 
     /**
      * Returns the name of the collector.
diff --git a/src/Symfony/Component/HttpKernel/DataCollector/DumpDataCollector.php b/src/Symfony/Component/HttpKernel/DataCollector/DumpDataCollector.php
@@ -98,7 +98,7 @@ public function dump(Data $data)
         }
     }
 
-    public function collect(Request $request, Response $response, \Exception $exception = null)
+    public function collect(Request $request, Response $response, \Throwable $exception = null)
     {
         if (!$this->dataCount) {
             $this->data = [];
diff --git a/src/Symfony/Component/HttpKernel/DataCollector/EventDataCollector.php b/src/Symfony/Component/HttpKernel/DataCollector/EventDataCollector.php
@@ -23,7 +23,7 @@
  *
  * @author Fabien Potencier <fabien@symfony.com>
  *
- * @final since Symfony 4.4
+ * @final
  */
 class EventDataCollector extends DataCollector implements LateDataCollectorInterface
 {
@@ -40,7 +40,7 @@ public function __construct(EventDispatcherInterface $dispatcher = null, Request
     /**
      * {@inheritdoc}
      */
-    public function collect(Request $request, Response $response, \Exception $exception = null)
+    public function collect(Request $request, Response $response, \Throwable $exception = null)
     {
         $this->currentRequest = $this->requestStack && $this->requestStack->getMasterRequest() !== $request ? $request : null;
         $this->data = [
diff --git a/src/Symfony/Component/HttpKernel/DataCollector/ExceptionDataCollector.php b/src/Symfony/Component/HttpKernel/DataCollector/ExceptionDataCollector.php
@@ -20,14 +20,14 @@
  *
  * @author Fabien Potencier <fabien@symfony.com>
  *
- * @final since Symfony 4.4
+ * @final
  */
 class ExceptionDataCollector extends DataCollector
 {
     /**
      * {@inheritdoc}
      */
-    public function collect(Request $request, Response $response, \Exception $exception = null)
+    public function collect(Request $request, Response $response, \Throwable $exception = null)
     {
         if (null !== $exception) {
             $this->data = [
diff --git a/src/Symfony/Component/HttpKernel/DataCollector/LoggerDataCollector.php b/src/Symfony/Component/HttpKernel/DataCollector/LoggerDataCollector.php
@@ -22,7 +22,7 @@
  *
  * @author Fabien Potencier <fabien@symfony.com>
  *
- * @final since Symfony 4.4
+ * @final
  */
 class LoggerDataCollector extends DataCollector implements LateDataCollectorInterface
 {
@@ -44,7 +44,7 @@ public function __construct($logger = null, string $containerPathPrefix = null,
     /**
      * {@inheritdoc}
      */
-    public function collect(Request $request, Response $response, \Exception $exception = null)
+    public function collect(Request $request, Response $response, \Throwable $exception = null)
     {
         $this->currentRequest = $this->requestStack && $this->requestStack->getMasterRequest() !== $request ? $request : null;
     }
diff --git a/src/Symfony/Component/HttpKernel/DataCollector/MemoryDataCollector.php b/src/Symfony/Component/HttpKernel/DataCollector/MemoryDataCollector.php
@@ -19,7 +19,7 @@
  *
  * @author Fabien Potencier <fabien@symfony.com>
  *
- * @final since Symfony 4.4
+ * @final
  */
 class MemoryDataCollector extends DataCollector implements LateDataCollectorInterface
 {
@@ -31,7 +31,7 @@ public function __construct()
     /**
      * {@inheritdoc}
      */
-    public function collect(Request $request, Response $response, \Exception $exception = null)
+    public function collect(Request $request, Response $response, \Throwable $exception = null)
     {
         $this->updateMemoryUsage();
     }
diff --git a/src/Symfony/Component/HttpKernel/DataCollector/RequestDataCollector.php b/src/Symfony/Component/HttpKernel/DataCollector/RequestDataCollector.php
@@ -23,7 +23,7 @@
 /**
  * @author Fabien Potencier <fabien@symfony.com>
  *
- * @final since Symfony 4.4
+ * @final
  */
 class RequestDataCollector extends DataCollector implements EventSubscriberInterface, LateDataCollectorInterface
 {
@@ -37,7 +37,7 @@ public function __construct()
     /**
      * {@inheritdoc}
      */
-    public function collect(Request $request, Response $response, \Exception $exception = null)
+    public function collect(Request $request, Response $response, \Throwable $exception = null)
     {
         // attributes are serialized and as they can be anything, they need to be converted to strings.
         $attributes = [];
diff --git a/src/Symfony/Component/HttpKernel/DataCollector/RouterDataCollector.php b/src/Symfony/Component/HttpKernel/DataCollector/RouterDataCollector.php
@@ -34,9 +34,9 @@ public function __construct()
     /**
      * {@inheritdoc}
      *
-     * @final since Symfony 4.4
+     * @final
      */
-    public function collect(Request $request, Response $response, \Exception $exception = null)
+    public function collect(Request $request, Response $response, \Throwable $exception = null)
     {
         if ($response instanceof RedirectResponse) {
             $this->data['redirect'] = true;
diff --git a/src/Symfony/Component/HttpKernel/DataCollector/TimeDataCollector.php b/src/Symfony/Component/HttpKernel/DataCollector/TimeDataCollector.php
@@ -20,7 +20,7 @@
 /**
  * @author Fabien Potencier <fabien@symfony.com>
  *
- * @final since Symfony 4.4
+ * @final
  */
 class TimeDataCollector extends DataCollector implements LateDataCollectorInterface
 {
@@ -36,7 +36,7 @@ public function __construct(KernelInterface $kernel = null, Stopwatch $stopwatch
     /**
      * {@inheritdoc}
      */
-    public function collect(Request $request, Response $response, \Exception $exception = null)
+    public function collect(Request $request, Response $response, \Throwable $exception = null)
     {
         if (null !== $this->kernel) {
             $startTime = $this->kernel->getStartTime();
diff --git a/src/Symfony/Component/HttpKernel/Profiler/Profiler.php b/src/Symfony/Component/HttpKernel/Profiler/Profiler.php
@@ -132,14 +132,10 @@ public function find(?string $ip, ?string $url, ?string $limit, ?string $method,
     /**
      * Collects data for the given Response.
      *
-     * @param \Throwable|null $exception
-     *
      * @return Profile|null A Profile instance or null if the profiler is disabled
      */
-    public function collect(Request $request, Response $response/*, \Throwable $exception = null*/)
+    public function collect(Request $request, Response $response, \Throwable $exception = null)
     {
-        $exception = 2 < \func_num_args() ? func_get_arg(2) : null;
-
         if (false === $this->enabled) {
             return null;
         }
diff --git a/src/Symfony/Component/HttpKernel/Tests/Fixtures/DataCollector/CloneVarDataCollector.php b/src/Symfony/Component/HttpKernel/Tests/Fixtures/DataCollector/CloneVarDataCollector.php
diff --git a/src/Symfony/Component/HttpKernel/composer.json b/src/Symfony/Component/HttpKernel/composer.json
diff --git a/src/Symfony/Component/Mailer/DataCollector/MessageDataCollector.php b/src/Symfony/Component/Mailer/DataCollector/MessageDataCollector.php
diff --git a/src/Symfony/Component/Mailer/composer.json b/src/Symfony/Component/Mailer/composer.json
diff --git a/src/Symfony/Component/Messenger/DataCollector/MessengerDataCollector.php b/src/Symfony/Component/Messenger/DataCollector/MessengerDataCollector.php
diff --git a/src/Symfony/Component/Notifier/DataCollector/NotificationDataCollector.php b/src/Symfony/Component/Notifier/DataCollector/NotificationDataCollector.php
diff --git a/src/Symfony/Component/Notifier/composer.json b/src/Symfony/Component/Notifier/composer.json
diff --git a/src/Symfony/Component/Translation/DataCollector/TranslationDataCollector.php b/src/Symfony/Component/Translation/DataCollector/TranslationDataCollector.php
diff --git a/src/Symfony/Component/Validator/DataCollector/ValidatorDataCollector.php b/src/Symfony/Component/Validator/DataCollector/ValidatorDataCollector.php

Original file line number	Diff line number	Diff line change
`@@ -26,7 +26,7 @@`
`26`	`26`	`*`
`27`	`27`	`* @author Fabien Potencier <fabien@symfony.com>`
`28`	`28`	`*`
`29`		`- * @final since Symfony 4.4`
	`29`	`+ * @final`
`30`	`30`	`*/`
`31`	`31`	`class TwigDataCollector extends DataCollector implements LateDataCollectorInterface`
`32`	`32`	`{`
`@@ -43,7 +43,7 @@ public function __construct(Profile $profile, Environment $twig = null)`
`43`	`43`	`/**`
`44`	`44`	`* {@inheritdoc}`
`45`	`45`	`*/`
`46`		`- public function collect(Request $request, Response $response, \Exception $exception = null)`
	`46`	`+ public function collect(Request $request, Response $response, \Throwable $exception = null)`
`47`	`47`	`{`
`48`	`48`	`}`
`49`	`49`
Original file line number	Diff line number	Diff line change
`@@ -20,7 +20,7 @@`
`20`	`20`	`*`
`21`	`21`	`* @author Fabien Potencier <fabien@symfony.com>`
`22`	`22`	`*`
`23`		`- * @final since Symfony 4.4`
	`23`	`+ * @final`
`24`	`24`	`*/`
`25`	`25`	`class RouterDataCollector extends BaseRouterDataCollector`
`26`	`26`	`{`
Original file line number	Diff line number	Diff line change
`@@ -33,7 +33,7 @@`
`33`	`33`	`/**`
`34`	`34`	`* @author Fabien Potencier <fabien@symfony.com>`
`35`	`35`	`*`
`36`		`- * @final since Symfony 4.4`
	`36`	`+ * @final`
`37`	`37`	`*/`
`38`	`38`	`class SecurityDataCollector extends DataCollector implements LateDataCollectorInterface`
`39`	`39`	`{`
`@@ -59,7 +59,7 @@ public function __construct(TokenStorageInterface $tokenStorage = null, RoleHier`
`59`	`59`	`/**`
`60`	`60`	`* {@inheritdoc}`
`61`	`61`	`*/`
`62`		`- public function collect(Request $request, Response $response, \Exception $exception = null)`
	`62`	`+ public function collect(Request $request, Response $response, \Throwable $exception = null)`
`63`	`63`	`{`
`64`	`64`	`if (null === $this->tokenStorage) {`
`65`	`65`	`$this->data = [`
Original file line number	Diff line number	Diff line change
`@@ -22,7 +22,7 @@`
`22`	`22`	`* @author Aaron Scherer <aequasi@gmail.com>`
`23`	`23`	`* @author Tobias Nyholm <tobias.nyholm@gmail.com>`
`24`	`24`	`*`
`25`		`- * @final since Symfony 4.4`
	`25`	`+ * @final`
`26`	`26`	`*/`
`27`	`27`	`class CacheDataCollector extends DataCollector implements LateDataCollectorInterface`
`28`	`28`	`{`
`@@ -39,7 +39,7 @@ public function addInstance(string $name, TraceableAdapter $instance)`
`39`	`39`	`/**`
`40`	`40`	`* {@inheritdoc}`
`41`	`41`	`*/`
`42`		`- public function collect(Request $request, Response $response, \Exception $exception = null)`
	`42`	`+ public function collect(Request $request, Response $response, \Throwable $exception = null)`
`43`	`43`	`{`
`44`	`44`	`$empty = ['calls' => [], 'config' => [], 'options' => [], 'statistics' => []];`
`45`	`45`	`$this->data = ['instances' => $empty, 'total' => $empty];`
Original file line number	Diff line number	Diff line change
`@@ -81,7 +81,7 @@ public function __construct(FormDataExtractorInterface $dataExtractor)`
`81`	`81`	`/**`
`82`	`82`	`* Does nothing. The data is collected during the form event listeners.`
`83`	`83`	`*/`
`84`		`- public function collect(Request $request, Response $response, \Exception $exception = null)`
	`84`	`+ public function collect(Request $request, Response $response, \Throwable $exception = null)`
`85`	`85`	`{`
`86`	`86`	`}`
`87`	`87`
Original file line number	Diff line number	Diff line change
`@@ -34,7 +34,7 @@ public function registerClient(string $name, TraceableHttpClient $client)`
`34`	`34`	`/**`
`35`	`35`	`* {@inheritdoc}`
`36`	`36`	`*/`
`37`		`- public function collect(Request $request, Response $response, \Exception $exception = null)`
	`37`	`+ public function collect(Request $request, Response $response, \Throwable $exception = null)`
`38`	`38`	`{`
`39`	`39`	`$this->initData();`
`40`	`40`