diff --git a/src/Symfony/Bundle/FrameworkBundle/Controller/Controller.php b/src/Symfony/Bundle/FrameworkBundle/Controller/Controller.php index a0c3e6e19d4bf..db436a03c40be 100644 --- a/src/Symfony/Bundle/FrameworkBundle/Controller/Controller.php +++ b/src/Symfony/Bundle/FrameworkBundle/Controller/Controller.php @@ -65,8 +65,10 @@ protected function generateUrl($route, $parameters = array(), $referenceType = U */ protected function forward($controller, array $path = array(), array $query = array()) { + $request = $this->container->get('request_stack')->getCurrentRequest(); + $path['_forwarded'] = $request->attributes; $path['_controller'] = $controller; - $subRequest = $this->container->get('request_stack')->getCurrentRequest()->duplicate($query, null, $path); + $subRequest = $request->duplicate($query, null, $path); return $this->container->get('http_kernel')->handle($subRequest, HttpKernelInterface::SUB_REQUEST); } diff --git a/src/Symfony/Bundle/FrameworkBundle/DataCollector/RequestDataCollector.php b/src/Symfony/Bundle/FrameworkBundle/DataCollector/RequestDataCollector.php new file mode 100644 index 0000000000000..55355bdee705e --- /dev/null +++ b/src/Symfony/Bundle/FrameworkBundle/DataCollector/RequestDataCollector.php @@ -0,0 +1,77 @@ + + * + * For the full copyright and license information, please view the LICENSE + * file that was distributed with this source code. + */ + +namespace Symfony\Bundle\FrameworkBundle\DataCollector; + +use Symfony\Component\HttpFoundation\ParameterBag; +use Symfony\Component\HttpFoundation\Request; +use Symfony\Component\HttpFoundation\Response; +use Symfony\Component\HttpKernel\DataCollector\RequestDataCollector as BaseRequestCollector; +use Symfony\Component\HttpKernel\Event\FilterControllerEvent; +use Symfony\Component\EventDispatcher\EventSubscriberInterface; + +/** + * RequestDataCollector. + * + * @author Jules Pietri + */ +class RequestDataCollector extends BaseRequestCollector implements EventSubscriberInterface +{ + /** + * {@inheritdoc} + */ + public function collect(Request $request, Response $response, \Exception $exception = null) + { + parent::collect($request, $response, $exception); + + if ($parentRequestAttributes = $request->attributes->get('_forwarded')) { + if ($parentRequestAttributes instanceof ParameterBag) { + $parentRequestAttributes->set('_forward_token', $response->headers->get('x-debug-token')); + } + } + if ($request->attributes->has('_forward_controller')) { + $this->data['forward'] = array( + 'token' => $request->attributes->get('_forward_token'), + 'controller' => $this->parseController($request->attributes->get('_forward_controller')), + ); + } + } + + /** + * Gets the parsed forward controller. + * + * @return array|bool An array with keys 'token' the forward profile token, and + * 'controller' the parsed forward controller, false otherwise + */ + public function getForward() + { + return isset($this->data['forward']) ? $this->data['forward'] : false; + } + + public function onKernelController(FilterControllerEvent $event) + { + $this->controllers[$event->getRequest()] = $event->getController(); + + if ($parentRequestAttributes = $event->getRequest()->attributes->get('_forwarded')) { + if ($parentRequestAttributes instanceof ParameterBag) { + $parentRequestAttributes->set('_forward_controller', $event->getController()); + } + } + } + + /** + * {@inheritdoc} + */ + public function getName() + { + return 'request'; + } +} diff --git a/src/Symfony/Bundle/FrameworkBundle/Resources/config/collectors.xml b/src/Symfony/Bundle/FrameworkBundle/Resources/config/collectors.xml index b3b80e1a4efe0..afebe6da98fd8 100644 --- a/src/Symfony/Bundle/FrameworkBundle/Resources/config/collectors.xml +++ b/src/Symfony/Bundle/FrameworkBundle/Resources/config/collectors.xml @@ -10,7 +10,7 @@ - + diff --git a/src/Symfony/Bundle/WebProfilerBundle/Resources/views/Collector/request.html.twig b/src/Symfony/Bundle/WebProfilerBundle/Resources/views/Collector/request.html.twig index db842c5e0e64d..18f20834f08f3 100644 --- a/src/Symfony/Bundle/WebProfilerBundle/Resources/views/Collector/request.html.twig +++ b/src/Symfony/Bundle/WebProfilerBundle/Resources/views/Collector/request.html.twig @@ -2,59 +2,99 @@ {% block toolbar %} {% set request_handler %} - {% if collector.controller.class is defined %} - {% set link = collector.controller.file|file_link(collector.controller.line) %} - {% if link %}{% else %}{% endif %} + {% import _self as helper %} + {{ helper.set_handler(collector.controller) }} + {% endset %} - {{ collector.controller.class|abbr_class|striptags }} + {% if collector.redirect %} + {% set redirect_handler %} + {% import _self as helper %} + {{ helper.set_handler(collector.redirect.controller, collector.redirect.route, 'GET' != collector.redirect.method ? collector.redirect.method) }} + {% endset %} + {% endif %} - {%- if collector.controller.method -%} -  :: {{ collector.controller.method }} - {%- endif -%} - - {% if link %}{% else %}{% endif %} - {% else %} - {{ collector.controller }} - {% endif %} - {% endset %} + {% if collector.forward %} + {% set forward_handler %} + {% import _self as helper %} + {{ helper.set_handler(collector.forward.controller) }} + {% endset %} + {% endif %} {% set request_status_code_color = (collector.statuscode >= 400) ? 'red' : (collector.statuscode >= 300) ? 'yellow' : 'green' %} {% set icon %} {{ collector.statuscode }} {% if collector.route %} - @ + {% if collector.redirect %}{{ include('@WebProfiler/Icon/redirect.svg') }}{% endif %} + {% if collector.forward %}{{ include('@WebProfiler/Icon/forward.svg') }}{% endif %} + {{ 'GET' != collector.method ? collector.method }} @ {{ collector.route }} {% endif %} {% endset %} {% set text %} -
- HTTP status - {{ collector.statuscode }} {{ collector.statustext }} -
+
+
+ HTTP status + {{ collector.statuscode }} {{ collector.statustext }} +
-
- Controller - {{ request_handler }} -
+ {% if 'GET' != collector.method -%} +
+ Method + {{ collector.method }} +
+ {%- endif %} - {% if collector.controller.class is defined %}
- Controller class - {{ collector.controller.class }} + Controller + {{ request_handler }}
- {% endif %} -
- Route name - {{ collector.route|default('NONE') }} -
+ {% if collector.controller.class is defined -%} +
+ Controller class + {{ collector.controller.class }} +
+ {%- endif %} -
- Has session - {% if collector.sessionmetadata|length %}yes{% else %}no{% endif %} +
+ Route name + {{ collector.route|default('NONE') }} +
+ +
+ Has session + {% if collector.sessionmetadata|length %}yes{% else %}no{% endif %} +
+ + {% if redirect_handler is defined -%} +
+
+ + {{ collector.redirect.status_code }} + Redirect from + + + {{ redirect_handler }} + ({{ collector.redirect.token }}) + +
+
+ {% endif %} + + {% if forward_handler is defined %} +
+
+ Forwarded to + + {{ forward_handler }} + ({{ collector.forward.token }}) + +
+
+ {% endif %} {% endset %} {{ include('@WebProfiler/Profiler/toolbar_item.html.twig', { link: profiler_url }) }} @@ -224,3 +264,22 @@ {% endif %}
{% endblock %} + +{% macro set_handler(controller, route, method) %} + {% if controller.class is defined -%} + {%- if method|default(false) %}{{ method }}{% endif -%} + {%- set link = controller.file|file_link(controller.line) %} + {%- if link %}{% else %}{% endif %} + + {%- if route|default(false) -%} + @{{ route }} + {%- else -%} + {{- controller.class|abbr_class|striptags -}} + {{- controller.method ? ' :: ' ~ controller.method -}} + {%- endif -%} + + {%- if link %}{% else %}{% endif %} + {%- else -%} + {{ route|default(controller) }} + {%- endif %} +{% endmacro %} diff --git a/src/Symfony/Bundle/WebProfilerBundle/Resources/views/Icon/forward.svg b/src/Symfony/Bundle/WebProfilerBundle/Resources/views/Icon/forward.svg new file mode 100644 index 0000000000000..acb128509a9f5 --- /dev/null +++ b/src/Symfony/Bundle/WebProfilerBundle/Resources/views/Icon/forward.svg @@ -0,0 +1,4 @@ + + + diff --git a/src/Symfony/Bundle/WebProfilerBundle/Resources/views/Icon/redirect.svg b/src/Symfony/Bundle/WebProfilerBundle/Resources/views/Icon/redirect.svg new file mode 100644 index 0000000000000..9cb3b89bcfbdd --- /dev/null +++ b/src/Symfony/Bundle/WebProfilerBundle/Resources/views/Icon/redirect.svg @@ -0,0 +1,10 @@ + + + diff --git a/src/Symfony/Bundle/WebProfilerBundle/Resources/views/Profiler/layout.html.twig b/src/Symfony/Bundle/WebProfilerBundle/Resources/views/Profiler/layout.html.twig index e2bc8f8013443..7193158b2b802 100644 --- a/src/Symfony/Bundle/WebProfilerBundle/Resources/views/Profiler/layout.html.twig +++ b/src/Symfony/Bundle/WebProfilerBundle/Resources/views/Profiler/layout.html.twig @@ -19,6 +19,47 @@ {% endif %} + {% set request_collector = profile.collectors.request|default(false) %} + {% if request_collector is defined and request_collector.redirect -%} + {%- set redirect = request_collector.redirect -%} + {%- set controller = redirect.controller -%} + {%- set redirect_route = '@' ~ redirect.route %} +
+
+ {{ redirect.status_code }} + Redirect from +
+
+ {{ 'GET' != redirect.method ? redirect.method }} + {% if redirect.controller.class is defined -%} + {%- set link = controller.file|file_link(controller.line) -%} + {% if link %}{% endif -%} + {{ redirect_route }} + {%- if link %}{% endif -%} + {%- else -%} + {{ redirect_route }} + {%- endif %} + ({{ redirect.token }}) +
+
+ {%- endif %} + + {% if request_collector and request_collector.forward and request_collector.forward.controller.class is defined -%} + {%- set forward = request_collector.forward -%} + {%- set controller = forward.controller -%} +
+
Forwarded to
+
+ {% set link = controller.file|file_link(controller.line) -%} + {%- if link %}{% endif -%} + {{- controller.class|abbr_class|striptags -}} + {{- controller.method ? ' :: ' ~ controller.method }} + {%- if link %}{% endif %} + ({{ forward.token }}) +
+
+ {%- endif %} +
Method
{{ profile.method|upper }}
diff --git a/src/Symfony/Bundle/WebProfilerBundle/Resources/views/Profiler/profiler.css.twig b/src/Symfony/Bundle/WebProfilerBundle/Resources/views/Profiler/profiler.css.twig index 9b6ba13d0908e..feabb5c8b062f 100644 --- a/src/Symfony/Bundle/WebProfilerBundle/Resources/views/Profiler/profiler.css.twig +++ b/src/Symfony/Bundle/WebProfilerBundle/Resources/views/Profiler/profiler.css.twig @@ -483,11 +483,11 @@ tr.status-warning td { #summary .status-error { background: {{ colors.error|raw }}; } #summary .status-success h2, -#summary .status-success h2 a, +#summary .status-success a, #summary .status-warning h2, -#summary .status-warning h2 a, +#summary .status-warning a, #summary .status-error h2, -#summary .status-error h2 a { +#summary .status-error a { color: #FFF; } @@ -510,6 +510,10 @@ tr.status-warning td { margin: 0 1.5em 0 0; } +#summary dl.metadata .label { + background: rgba(255, 255, 255, 0.2); +} + {# Sidebar ========================================================================= #} #sidebar { diff --git a/src/Symfony/Bundle/WebProfilerBundle/Resources/views/Profiler/toolbar.css.twig b/src/Symfony/Bundle/WebProfilerBundle/Resources/views/Profiler/toolbar.css.twig index 723541fc8298a..6990f98fecbd1 100644 --- a/src/Symfony/Bundle/WebProfilerBundle/Resources/views/Profiler/toolbar.css.twig +++ b/src/Symfony/Bundle/WebProfilerBundle/Resources/views/Profiler/toolbar.css.twig @@ -36,7 +36,7 @@ .sf-toolbarreset { background-color: #222; bottom: 0; - box-shadow: 0 -1px 0px rgba(0, 0, 0, 0.2); + box-shadow: 0 -1px 0 rgba(0, 0, 0, 0.2); color: #EEE; font: 11px Arial, sans-serif; left: 0; @@ -138,7 +138,7 @@ .sf-toolbar-block .sf-toolbar-info-piece .sf-toolbar-status { padding: 2px 5px; - margin-bottom: 0px; + margin-bottom: 0; } .sf-toolbar-block .sf-toolbar-info-piece .sf-toolbar-status + .sf-toolbar-status { margin-left: 4px; @@ -232,6 +232,16 @@ .sf-toolbar-block-request .sf-toolbar-info-piece a:hover { text-decoration: underline; } +.sf-toolbar-block-request .sf-toolbar-redirection-status { + font-weight: normal; + padding: 2px 4px; + line-height: 18px; +} +.sf-toolbar-block-request .sf-toolbar-info-piece span.sf-toolbar-redirection-method { + font-size: 12px; + height: 17px; + line-height: 17px; +} .sf-toolbar-status-green .sf-toolbar-label, .sf-toolbar-status-yellow .sf-toolbar-label, @@ -380,7 +390,7 @@ .sf-toolbarreset { bottom: auto; - box-shadow: 0 1px 0px rgba(0, 0, 0, 0.2); + box-shadow: 0 1px 0 rgba(0, 0, 0, 0.2); top: 0; } @@ -450,9 +460,12 @@ padding-left: 0; padding-right: 0; } - .sf-toolbar-block-request .sf-toolbar-status + .sf-toolbar-label { - margin-left: 4px; + .sf-toolbar-block-request .sf-toolbar-status { + margin-right: 5px; } + .sf-toolbar-block-request .sf-toolbar-icon svg + .sf-toolbar-label { + margin-left: 0; + } .sf-toolbar-block-request .sf-toolbar-label + .sf-toolbar-value { margin-right: 10px; } diff --git a/src/Symfony/Component/HttpKernel/DataCollector/RequestDataCollector.php b/src/Symfony/Component/HttpKernel/DataCollector/RequestDataCollector.php index 9a499a737ad02..004d6362c7101 100644 --- a/src/Symfony/Component/HttpKernel/DataCollector/RequestDataCollector.php +++ b/src/Symfony/Component/HttpKernel/DataCollector/RequestDataCollector.php @@ -27,6 +27,7 @@ */ class RequestDataCollector extends DataCollector implements EventSubscriberInterface { + /** @var \SplObjectStorage */ protected $controllers; public function __construct() @@ -89,6 +90,7 @@ public function collect(Request $request, Response $response, \Exception $except $statusCode = $response->getStatusCode(); $this->data = array( + 'method' => $request->getMethod(), 'format' => $request->getRequestFormat(), 'content' => $content, 'content_type' => $response->headers->get('Content-Type', 'text/html'), @@ -122,48 +124,42 @@ public function collect(Request $request, Response $response, \Exception $except } if (isset($this->controllers[$request])) { - $controller = $this->controllers[$request]; - if (is_array($controller)) { - try { - $r = new \ReflectionMethod($controller[0], $controller[1]); - $this->data['controller'] = array( - 'class' => is_object($controller[0]) ? get_class($controller[0]) : $controller[0], - 'method' => $controller[1], - 'file' => $r->getFileName(), - 'line' => $r->getStartLine(), - ); - } catch (\ReflectionException $e) { - if (is_callable($controller)) { - // using __call or __callStatic - $this->data['controller'] = array( - 'class' => is_object($controller[0]) ? get_class($controller[0]) : $controller[0], - 'method' => $controller[1], - 'file' => 'n/a', - 'line' => 'n/a', - ); - } - } - } elseif ($controller instanceof \Closure) { - $r = new \ReflectionFunction($controller); - $this->data['controller'] = array( - 'class' => $r->getName(), - 'method' => null, - 'file' => $r->getFileName(), - 'line' => $r->getStartLine(), - ); - } elseif (is_object($controller)) { - $r = new \ReflectionClass($controller); - $this->data['controller'] = array( - 'class' => $r->getName(), - 'method' => null, - 'file' => $r->getFileName(), - 'line' => $r->getStartLine(), - ); - } else { - $this->data['controller'] = (string) $controller ?: 'n/a'; - } + $this->data['controller'] = $this->parseController($this->controllers[$request]); unset($this->controllers[$request]); } + + if ($request->hasSession() && $request->getSession()->has('sf_redirect')) { + $this->data['redirect'] = $request->getSession()->get('sf_redirect'); + $request->getSession()->remove('sf_redirect'); + } + + if ($request->hasSession() && $response->isRedirect()) { + $request->getSession()->set('sf_redirect', array( + 'token' => $response->headers->get('x-debug-token'), + 'route' => $request->attributes->get('_route', 'n/a'), + 'method' => $request->getMethod(), + 'controller' => $this->parseController($request->attributes->get('_controller')), + 'status_code' => $statusCode, + 'status_text' => Response::$statusTexts[(int) $statusCode], + )); + } + + if ($parentRequestAttributes = $request->attributes->get('_forwarded')) { + if ($parentRequestAttributes instanceof ParameterBag) { + $parentRequestAttributes->set('_forward_token', $response->headers->get('x-debug-token')); + } + } + if ($request->attributes->has('_forward_controller')) { + $this->data['forward'] = array( + 'token' => $request->attributes->get('_forward_token'), + 'controller' => $this->parseController($request->attributes->get('_forward_controller')), + ); + } + } + + public function getMethod() + { + return $this->data['method']; } public function getPathInfo() @@ -276,15 +272,27 @@ public function getRouteParams() } /** - * Gets the controller. + * Gets the parsed controller. * - * @return string The controller as a string + * @return array|string The controller as a string or array of data + * with keys 'class', 'method', 'file' and 'line' */ public function getController() { return $this->data['controller']; } + /** + * Gets the previous request attributes. + * + * @return array|bool A legacy array of data from the previous redirection response + * or false otherwise + */ + public function getRedirect() + { + return isset($this->data['redirect']) ? $this->data['redirect'] : false; + } + public function onKernelController(FilterControllerEvent $event) { $this->controllers[$event->getRequest()] = $event->getController(); @@ -303,6 +311,67 @@ public function getName() return 'request'; } + /** + * Parse a controller. + * + * @param mixed $controller The controller to parse + * + * @return array|string An array of controller data or a simple string + */ + protected function parseController($controller) + { + if (is_string($controller) && false !== strpos($controller, '::')) { + $controller = explode('::', $controller); + } + + if (is_array($controller)) { + try { + $r = new \ReflectionMethod($controller[0], $controller[1]); + + return array( + 'class' => is_object($controller[0]) ? get_class($controller[0]) : $controller[0], + 'method' => $controller[1], + 'file' => $r->getFileName(), + 'line' => $r->getStartLine(), + ); + } catch (\ReflectionException $e) { + if (is_callable($controller)) { + // using __call or __callStatic + return array( + 'class' => is_object($controller[0]) ? get_class($controller[0]) : $controller[0], + 'method' => $controller[1], + 'file' => 'n/a', + 'line' => 'n/a', + ); + } + } + } + + if ($controller instanceof \Closure) { + $r = new \ReflectionFunction($controller); + + return array( + 'class' => $r->getName(), + 'method' => null, + 'file' => $r->getFileName(), + 'line' => $r->getStartLine(), + ); + } + + if (is_object($controller)) { + $r = new \ReflectionClass($controller); + + return array( + 'class' => $r->getName(), + 'method' => null, + 'file' => $r->getFileName(), + 'line' => $r->getStartLine(), + ); + } + + return (string) $controller ?: 'n/a'; + } + private function getCookieHeader($name, $value, $expires, $path, $domain, $secure, $httponly) { $cookie = sprintf('%s=%s', $name, urlencode($value)); diff --git a/src/Symfony/Component/HttpKernel/Tests/DataCollector/RequestDataCollectorTest.php b/src/Symfony/Component/HttpKernel/Tests/DataCollector/RequestDataCollectorTest.php index 2eb1c41e8dda8..4234b90832d6a 100644 --- a/src/Symfony/Component/HttpKernel/Tests/DataCollector/RequestDataCollectorTest.php +++ b/src/Symfony/Component/HttpKernel/Tests/DataCollector/RequestDataCollectorTest.php @@ -66,7 +66,7 @@ public function testControllerInspection() '"Regular" callable', array($this, 'testControllerInspection'), array( - 'class' => 'Symfony\Component\HttpKernel\Tests\DataCollector\RequestDataCollectorTest', + 'class' => __NAMESPACE__.'\RequestDataCollectorTest', 'method' => 'testControllerInspection', 'file' => __FILE__, 'line' => $r1->getStartLine(), @@ -86,8 +86,13 @@ function () { return 'foo'; }, array( 'Static callback as string', - 'Symfony\Component\HttpKernel\Tests\DataCollector\RequestDataCollectorTest::staticControllerMethod', - 'Symfony\Component\HttpKernel\Tests\DataCollector\RequestDataCollectorTest::staticControllerMethod', + __NAMESPACE__.'\RequestDataCollectorTest::staticControllerMethod', + array( + 'class' => 'Symfony\Component\HttpKernel\Tests\DataCollector\RequestDataCollectorTest', + 'method' => 'staticControllerMethod', + 'file' => __FILE__, + 'line' => $r2->getStartLine(), + ), ), array(