merged branch GromNaN/master (PR #7367)

fabpot · fabpot · commit de7b11e50c27 · 2013-03-14T12:36:31.000+01:00
This PR was merged into the master branch. Commits ------- cce3a6b [HttpKernel] Collect data if the controller is a Closure Discussion ---------- [HttpKernel] RequestDataCollector: collect data if the controller is a Closure | Q | A | ------------- | --- | Bug fix? | no | New feature? | yes | BC breaks? | no | Deprecations? | no | Tests pass? | yes | Fixed tickets | no | License | MIT | Doc PR | no Use the same format as object methods to describe closures and collect the file and the line where it's been declared. Currently, the `file` and `line` parameters are not shown by the webprofiler, but they could be useful to find a closure.
diff --git a/src/Symfony/Component/HttpKernel/DataCollector/RequestDataCollector.php b/src/Symfony/Component/HttpKernel/DataCollector/RequestDataCollector.php
@@ -133,7 +133,13 @@ public function collect(Request $request, Response $response, \Exception $except
                     }
                 }
             } elseif ($controller instanceof \Closure) {
-                $this->data['controller'] = 'Closure';
+                $r = new \ReflectionFunction($controller);
+                $this->data['controller'] = array(
+                    'class'  => $r->getName(),
+                    'method' => null,
+                    'file'   => $r->getFilename(),
+                    'line'   => $r->getStartLine(),
+                );
             } else {
                 $this->data['controller'] = (string) $controller ?: 'n/a';
             }
diff --git a/src/Symfony/Component/HttpKernel/Tests/DataCollector/RequestDataCollectorTest.php b/src/Symfony/Component/HttpKernel/Tests/DataCollector/RequestDataCollectorTest.php
@@ -81,7 +81,12 @@ public function testControllerInspection(Request $request, Response $response)
             array(
                 'Closure',
                 function() { return 'foo'; },
-                'Closure',
+                array(
+                    'class' => __NAMESPACE__ . '\{closure}',
+                    'method' => null,
+                    'file' => __FILE__,
+                    'line' => __LINE__ - 5,
+                ),
             ),
 
             array(

Original file line number	Diff line number	Diff line change
`@@ -133,7 +133,13 @@ public function collect(Request $request, Response $response, \Exception $except`
`133`	`133`	`}`
`134`	`134`	`}`
`135`	`135`	`} elseif ($controller instanceof \Closure) {`
`136`		`- $this->data['controller'] = 'Closure';`
	`136`	`+ $r = new \ReflectionFunction($controller);`
	`137`	`+ $this->data['controller'] = array(`
	`138`	`+ 'class' => $r->getName(),`
	`139`	`+ 'method' => null,`
	`140`	`+ 'file' => $r->getFilename(),`
	`141`	`+ 'line' => $r->getStartLine(),`
	`142`	`+ );`
`137`	`143`	`} else {`
`138`	`144`	`$this->data['controller'] = (string) $controller ?: 'n/a';`
`139`	`145`	`}`