[HttpKernel] Collect data if the controller is a Closure

Use the same format as object methods to describe closures and collect the file and the line where it's been declared. These informations should be added in the views of the webprofiler.
symfony · Mar 13, 2013 · cce3a6b · cce3a6b
1 parent 2453a58
commit cce3a6b
Show file tree

Hide file tree

Showing 2 changed files with 13 additions and 2 deletions.
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(