summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorLuca Lusso2018-07-24 09:30:58 (GMT)
committerLuca Lusso2018-07-24 09:30:58 (GMT)
commit1946b8800a8b46d6284fa7a47386936ee0084110 (patch)
tree0cf8483d1d0dfa65a44f19d5982f659c269b7a76
parente0498e13e0d154254795e32cb5c52acc77336392 (diff)
Remove the lateCollect override
-rw-r--r--webprofiler/src/Controller/ToolbarController.php4
-rw-r--r--webprofiler/src/DataCollector/DrupalDataCollectorTrait.php2
-rw-r--r--webprofiler/src/DataCollector/RequestDataCollector.php16
3 files changed, 4 insertions, 18 deletions
diff --git a/webprofiler/src/Controller/ToolbarController.php b/webprofiler/src/Controller/ToolbarController.php
index de0e240..b79a182 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 a523644..8fdede4 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 229a632..dc15848 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()][] = [
@@ -64,19 +63,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}
*/
public function getTitle() {
return $this->t('Request');