diff --git a/webprofiler/src/DataCollector/DrupalDataCollectorTrait.php b/webprofiler/src/DataCollector/DrupalDataCollectorTrait.php index 98a3faf462b8a103a24b8695dcb4e4b65ff07b68..a523644a6d758785d578c4b777f9fbe27be1dc2e 100644 --- a/webprofiler/src/DataCollector/DrupalDataCollectorTrait.php +++ b/webprofiler/src/DataCollector/DrupalDataCollectorTrait.php @@ -7,6 +7,13 @@ namespace Drupal\webprofiler\DataCollector; */ trait DrupalDataCollectorTrait { + /** + * {@inheritdoc} + */ + public function reset() { + $this->data = array(); + } + /** * {@inheritdoc} */ diff --git a/webprofiler/src/DataCollector/RequestDataCollector.php b/webprofiler/src/DataCollector/RequestDataCollector.php index 9de8f4942f1d6be5d11136d8c9f38b384cc8b55d..229a632ee9e95fc135699572e5d8e03546ce35d3 100644 --- a/webprofiler/src/DataCollector/RequestDataCollector.php +++ b/webprofiler/src/DataCollector/RequestDataCollector.php @@ -52,6 +52,8 @@ class RequestDataCollector extends BaseRequestDataCollector implements DrupalDat * @param $service_id * @param $callable * @param $request + * + * @throws \ReflectionException */ public function addAccessCheck($service_id, $callable, Request $request) { $this->accessCheck[$request->getPathInfo()][] = [ @@ -60,6 +62,19 @@ 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} */ @@ -71,7 +86,7 @@ class RequestDataCollector extends BaseRequestDataCollector implements DrupalDat * {@inheritdoc} */ public function getPanelSummary() { - return $this->data['status_code'].' '.$this->data['status_text']; + return $this->data['status_code'] . ' ' . $this->data['status_text']; } /**