Skip to content

Commit

Permalink
bug #22443 [HttpKernel] Fix identifier in request data collector (ro0NL)
Browse files Browse the repository at this point in the history
This PR was merged into the 3.3-dev branch.

Discussion
----------

[HttpKernel] Fix identifier in request data collector

| Q             | A
| ------------- | ---
| Branch?       | master
| Bug fix?      | yes
| New feature?  | no <!-- don't forget updating src/**/CHANGELOG.md files -->
| BC breaks?    | no
| Deprecations? | no <!-- don't forget updating UPGRADE-*.md files -->
| Tests pass?   | yes
| Fixed tickets | #... <!-- #-prefixed issue number(s), if any -->
| License       | MIT
| Doc PR        | symfony/symfony-docs#... <!--highly recommended for new features-->

3.2

![image](https://cloud.githubusercontent.com/assets/1047696/25063277/3fe8c57c-21e0-11e7-9bc3-c2edc679bd61.png)

master

![image](https://cloud.githubusercontent.com/assets/1047696/25063279/536803ec-21e0-11e7-8b95-c29c6e042c4f.png)

Commits
-------

009f87f [HttpKernel] Fix identifier in request data collector
  • Loading branch information
fabpot committed Apr 17, 2017
2 parents ac5cfee + 009f87f commit 9296a10
Showing 1 changed file with 3 additions and 1 deletion.
Expand Up @@ -147,6 +147,8 @@ public function collect(Request $request, Response $response, \Exception $except
));
}
}

$this->data['identifier'] = $this->data['route'] ?: (is_array($this->data['controller']) ? $this->data['controller']['class'].'::'.$this->data['controller']['method'].'()' : $this->data['controller']);
}

public function lateCollect()
Expand Down Expand Up @@ -263,7 +265,7 @@ public function getRoute()

public function getIdentifier()
{
return $this->data['route'] ?: (is_array($this->data['controller']) ? $this->data['controller']['class'].'::'.$this->data['controller']['method'].'()' : $this->data['controller']);
return $this->data['identifier'];
}

/**
Expand Down

0 comments on commit 9296a10

Please sign in to comment.