diff --git a/webprofiler/src/Controller/ToolbarController.php b/webprofiler/src/Controller/ToolbarController.php index de0e240e5d2cc4500bd46322eb1032f694a877df..b79a18278709481e6cb0e39aa82f780e7d0b0ca9 100644 --- a/webprofiler/src/Controller/ToolbarController.php +++ b/webprofiler/src/Controller/ToolbarController.php @@ -62,7 +62,9 @@ class ToolbarController extends ControllerBase { * * @param Profile $profile * - * @return array + * @return \Symfony\Component\HttpFoundation\Response + * + * @throws \Exception */ public function toolbarAction(Profile $profile) { $this->profiler->disable(); diff --git a/webprofiler/src/DataCollector/DrupalDataCollectorTrait.php b/webprofiler/src/DataCollector/DrupalDataCollectorTrait.php index a523644a6d758785d578c4b777f9fbe27be1dc2e..8fdede4f96e6cf9196d0a06be81ea91412637bac 100644 --- a/webprofiler/src/DataCollector/DrupalDataCollectorTrait.php +++ b/webprofiler/src/DataCollector/DrupalDataCollectorTrait.php @@ -54,8 +54,6 @@ trait DrupalDataCollectorTrait { * @param $method * * @return array - * - * @throws \ReflectionException */ public function getMethodData($class, $method) { $class = is_object($class) ? get_class($class) : $class; diff --git a/webprofiler/src/DataCollector/RequestDataCollector.php b/webprofiler/src/DataCollector/RequestDataCollector.php index 229a632ee9e95fc135699572e5d8e03546ce35d3..dc15848fd9d9223a23e4e6b99cb502050a5c0fd4 100644 --- a/webprofiler/src/DataCollector/RequestDataCollector.php +++ b/webprofiler/src/DataCollector/RequestDataCollector.php @@ -51,9 +51,8 @@ class RequestDataCollector extends BaseRequestDataCollector implements DrupalDat /** * @param $service_id * @param $callable - * @param $request + * @param \Symfony\Component\HttpFoundation\Request $request * - * @throws \ReflectionException */ public function addAccessCheck($service_id, $callable, Request $request) { $this->accessCheck[$request->getPathInfo()][] = [ @@ -62,19 +61,6 @@ class RequestDataCollector extends BaseRequestDataCollector implements DrupalDat ]; } - /** - * {@inheritdoc} - * - * In Symfony 3 the data for the RequestDataCollector are converted to string - * with \Symfony\Component\HttpKernel\DataCollector/DataCollector::cloneVar() - * in - * \Symfony\Component\HttpKernel\DataCollector\RequestDataCollector::lateCollect(), - * but for some reasons they aren't unserialized back to array later. At the - * moment we simply override that method to avoid conversion. - */ - public function lateCollect() { - } - /** * {@inheritdoc} */