bug #22443 [HttpKernel] Fix identifier in request data collector (ro0NL)

fabpot · fabpot · commit 9296a10b4b66 · 2017-04-17T14:33:40.000-06:00
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  | BC breaks? | no | Deprecations? | no  | Tests pass? | yes | Fixed tickets | #...  | License | MIT | Doc PR | symfony/symfony-docs#...  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
diff --git a/src/Symfony/Component/HttpKernel/DataCollector/RequestDataCollector.php b/src/Symfony/Component/HttpKernel/DataCollector/RequestDataCollector.php
@@ -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()
@@ -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'];
     }
 
     /**

Original file line number	Diff line number	Diff line change
`@@ -147,6 +147,8 @@ public function collect(Request $request, Response $response, \Exception $except`
`147`	`147`	`));`
`148`	`148`	`}`
`149`	`149`	`}`
	`150`	`+`
	`151`	`+ $this->data['identifier'] = $this->data['route'] ?: (is_array($this->data['controller']) ? $this->data['controller']['class'].'::'.$this->data['controller']['method'].'()' : $this->data['controller']);`
`150`	`152`	`}`
`151`	`153`
`152`	`154`	`public function lateCollect()`
`@@ -263,7 +265,7 @@ public function getRoute()`
`263`	`265`
`264`	`266`	`public function getIdentifier()`
`265`	`267`	`{`
`266`		`- return $this->data['route'] ?: (is_array($this->data['controller']) ? $this->data['controller']['class'].'::'.$this->data['controller']['method'].'()' : $this->data['controller']);`
	`268`	`+ return $this->data['identifier'];`
`267`	`269`	`}`
`268`	`270`
`269`	`271`	`/**`