+ *
+ * @deprecated since version 2.7, will be removed in 3.0. Use the "filename" auto-escaping strategy instead.
*/
class TwigDefaultEscapingStrategy
{
diff --git a/src/Symfony/Bundle/TwigBundle/TwigEngine.php b/src/Symfony/Bundle/TwigBundle/TwigEngine.php
index 927256a20cb3..5cd666a3178e 100644
--- a/src/Symfony/Bundle/TwigBundle/TwigEngine.php
+++ b/src/Symfony/Bundle/TwigBundle/TwigEngine.php
@@ -42,33 +42,29 @@ public function __construct(\Twig_Environment $environment, TemplateNameParserIn
}
/**
- * @deprecated Deprecated since version 2.3, to be removed in 3.0. Inject the escaping
- * strategy on Twig_Environment instead
+ * @deprecated since version 2.7, to be removed in 3.0.
+ * Inject the escaping strategy on \Twig_Environment instead.
*/
public function setDefaultEscapingStrategy($strategy)
{
+ @trigger_error('The '.__METHOD__.' method is deprecated since version 2.7 and will be removed in 3.0. Inject the escaping strategy in the Twig_Environment object instead.', E_USER_DEPRECATED);
+
$this->environment->getExtension('escaper')->setDefaultStrategy($strategy);
}
/**
- * @deprecated Deprecated since version 2.3, to be removed in 3.0. Use TwigDefaultEscapingStrategy instead.
+ * @deprecated since version 2.7, to be removed in 3.0.
+ * Use the 'filename' strategy instead.
*/
public function guessDefaultEscapingStrategy($filename)
{
- return TwigDefaultEscapingStrategy::guess($filename);
+ @trigger_error('The '.__METHOD__.' method is deprecated since version 2.7 and will be removed in 3.0. Use the Twig_FileExtensionEscapingStrategy::guess method instead.', E_USER_DEPRECATED);
+
+ return \Twig_FileExtensionEscapingStrategy::guess($filename);
}
/**
- * Renders a template.
- *
- * @param mixed $name A template name
- * @param array $parameters An array of parameters to pass to the template
- *
- * @return string The evaluated template as a string
- *
- * @throws \InvalidArgumentException if the template does not exist
- * @throws \RuntimeException if the template cannot be rendered
- * @throws \Twig_Error
+ * {@inheritdoc}
*/
public function render($name, array $parameters = array())
{
@@ -88,13 +84,9 @@ public function render($name, array $parameters = array())
}
/**
- * Renders a view and returns a Response.
- *
- * @param string $view The view name
- * @param array $parameters An array of parameters to pass to the view
- * @param Response $response A Response instance
+ * {@inheritdoc}
*
- * @return Response A Response instance
+ * @throws \Twig_Error if something went wrong like a thrown exception while rendering the template
*/
public function renderResponse($view, array $parameters = array(), Response $response = null)
{
diff --git a/src/Symfony/Bundle/TwigBundle/composer.json b/src/Symfony/Bundle/TwigBundle/composer.json
index 168701fa6547..c05ebe38e8db 100644
--- a/src/Symfony/Bundle/TwigBundle/composer.json
+++ b/src/Symfony/Bundle/TwigBundle/composer.json
@@ -16,28 +16,33 @@
}
],
"require": {
- "php": ">=5.3.3",
- "symfony/twig-bridge": "~2.3,>=2.3.10",
- "symfony/http-kernel": "~2.3.24|~2.5.9|~2.6,>=2.6.2"
+ "php": ">=5.3.9",
+ "symfony/asset": "~2.7",
+ "symfony/twig-bridge": "~2.7",
+ "symfony/http-foundation": "~2.5",
+ "symfony/http-kernel": "~2.7"
},
"require-dev": {
"symfony/stopwatch": "~2.2",
- "symfony/dependency-injection": "~2.2",
+ "symfony/dependency-injection": "~2.6,>=2.6.6",
+ "symfony/expression-language": "~2.4",
"symfony/config": "~2.2",
+ "symfony/finder": "~2.0,>=2.0.5",
+ "symfony/routing": "~2.1",
+ "symfony/templating": "~2.1",
"symfony/yaml": "~2.3",
- "symfony/framework-bundle": "~2.1"
+ "symfony/framework-bundle": "~2.7"
},
"autoload": {
- "psr-0": { "Symfony\\Bundle\\TwigBundle\\": "" },
+ "psr-4": { "Symfony\\Bundle\\TwigBundle\\": "" },
"exclude-from-classmap": [
"/Tests/"
]
},
- "target-dir": "Symfony/Bundle/TwigBundle",
"minimum-stability": "dev",
"extra": {
"branch-alias": {
- "dev-master": "2.3-dev"
+ "dev-master": "2.7-dev"
}
}
}
diff --git a/src/Symfony/Bundle/WebProfilerBundle/CHANGELOG.md b/src/Symfony/Bundle/WebProfilerBundle/CHANGELOG.md
index a27cdd883582..3ccdf96b867c 100644
--- a/src/Symfony/Bundle/WebProfilerBundle/CHANGELOG.md
+++ b/src/Symfony/Bundle/WebProfilerBundle/CHANGELOG.md
@@ -1,6 +1,12 @@
CHANGELOG
=========
+2.7.0
+-----
+
+ * [BC BREAK] if you are using a DB to store profiles, the table must be dropped
+ * added the HTTP status code to profiles
+
2.3.0
-----
diff --git a/src/Symfony/Bundle/WebProfilerBundle/Controller/ProfilerController.php b/src/Symfony/Bundle/WebProfilerBundle/Controller/ProfilerController.php
index 173616fd9f50..2748910a19ae 100644
--- a/src/Symfony/Bundle/WebProfilerBundle/Controller/ProfilerController.php
+++ b/src/Symfony/Bundle/WebProfilerBundle/Controller/ProfilerController.php
@@ -241,15 +241,20 @@ public function searchBarAction(Request $request)
$token = $session->get('_profiler_search_token');
}
- return new Response($this->twig->render('@WebProfiler/Profiler/search.html.twig', array(
- 'token' => $token,
- 'ip' => $ip,
- 'method' => $method,
- 'url' => $url,
- 'start' => $start,
- 'end' => $end,
- 'limit' => $limit,
- )), 200, array('Content-Type' => 'text/html'));
+ return new Response(
+ $this->twig->render('@WebProfiler/Profiler/search.html.twig', array(
+ 'token' => $token,
+ 'ip' => $ip,
+ 'method' => $method,
+ 'url' => $url,
+ 'start' => $start,
+ 'end' => $end,
+ 'limit' => $limit,
+ 'request' => $request,
+ )),
+ 200,
+ array('Content-Type' => 'text/html')
+ );
}
/**
diff --git a/src/Symfony/Bundle/WebProfilerBundle/Controller/RouterController.php b/src/Symfony/Bundle/WebProfilerBundle/Controller/RouterController.php
index f4a84bf56873..d77eb279f4a6 100644
--- a/src/Symfony/Bundle/WebProfilerBundle/Controller/RouterController.php
+++ b/src/Symfony/Bundle/WebProfilerBundle/Controller/RouterController.php
@@ -11,6 +11,7 @@
namespace Symfony\Bundle\WebProfilerBundle\Controller;
+use Symfony\Component\HttpFoundation\Request;
use Symfony\Component\HttpFoundation\Response;
use Symfony\Component\Routing\Matcher\UrlMatcherInterface;
use Symfony\Component\Routing\Matcher\TraceableUrlMatcher;
@@ -18,6 +19,7 @@
use Symfony\Component\Routing\RouterInterface;
use Symfony\Component\HttpKernel\Exception\NotFoundHttpException;
use Symfony\Component\HttpKernel\Profiler\Profiler;
+use Symfony\Component\HttpKernel\DataCollector\RequestDataCollector;
/**
* RouterController.
@@ -62,16 +64,39 @@ public function panelAction($token)
$profile = $this->profiler->loadProfile($token);
- $context = $this->matcher->getContext();
- $context->setMethod($profile->getMethod());
- $matcher = new TraceableUrlMatcher($this->routes, $context);
-
+ /** @var RequestDataCollector $request */
$request = $profile->getCollector('request');
return new Response($this->twig->render('@WebProfiler/Router/panel.html.twig', array(
'request' => $request,
'router' => $profile->getCollector('router'),
- 'traces' => $matcher->getTraces($request->getPathInfo()),
+ 'traces' => $this->getTraces($request, $profile->getMethod()),
)), 200, array('Content-Type' => 'text/html'));
}
+
+ /**
+ * Returns the routing traces associated to the given request.
+ *
+ * @param RequestDataCollector $request
+ * @param string $method
+ *
+ * @return array
+ */
+ private function getTraces(RequestDataCollector $request, $method)
+ {
+ $traceRequest = Request::create(
+ $request->getPathInfo(),
+ $request->getRequestServer()->get('REQUEST_METHOD'),
+ $request->getRequestAttributes()->all(),
+ $request->getRequestCookies()->all(),
+ array(),
+ $request->getRequestServer()->all()
+ );
+
+ $context = $this->matcher->getContext();
+ $context->setMethod($method);
+ $matcher = new TraceableUrlMatcher($this->routes, $context);
+
+ return $matcher->getTracesForRequest($traceRequest);
+ }
}
diff --git a/src/Symfony/Bundle/WebProfilerBundle/DependencyInjection/Configuration.php b/src/Symfony/Bundle/WebProfilerBundle/DependencyInjection/Configuration.php
index 4f84378f8d0c..957a683ca356 100644
--- a/src/Symfony/Bundle/WebProfilerBundle/DependencyInjection/Configuration.php
+++ b/src/Symfony/Bundle/WebProfilerBundle/DependencyInjection/Configuration.php
@@ -45,6 +45,7 @@ public function getConfigTreeBuilder()
->end()
->end()
->booleanNode('intercept_redirects')->defaultFalse()->end()
+ ->scalarNode('excluded_ajax_paths')->defaultValue('^/(app(_[\\w]+)?\\.php/)?_wdt')->end()
->end()
;
diff --git a/src/Symfony/Bundle/WebProfilerBundle/DependencyInjection/WebProfilerExtension.php b/src/Symfony/Bundle/WebProfilerBundle/DependencyInjection/WebProfilerExtension.php
index c0bd0cdb397c..8af7c63e64aa 100644
--- a/src/Symfony/Bundle/WebProfilerBundle/DependencyInjection/WebProfilerExtension.php
+++ b/src/Symfony/Bundle/WebProfilerBundle/DependencyInjection/WebProfilerExtension.php
@@ -44,18 +44,14 @@ public function load(array $configs, ContainerBuilder $container)
$loader = new XmlFileLoader($container, new FileLocator(__DIR__.'/../Resources/config'));
$loader->load('profiler.xml');
- $loader->load('toolbar.xml');
-
- $container->setParameter('web_profiler.debug_toolbar.intercept_redirects', $config['intercept_redirects']);
+ $container->setParameter('web_profiler.debug_toolbar.position', $config['position']);
- if (!$config['toolbar']) {
- $mode = WebDebugToolbarListener::DISABLED;
- } else {
- $mode = WebDebugToolbarListener::ENABLED;
+ if ($config['toolbar'] || $config['intercept_redirects']) {
+ $loader->load('toolbar.xml');
+ $container->getDefinition('web_profiler.debug_toolbar')->replaceArgument(5, $config['excluded_ajax_paths']);
+ $container->setParameter('web_profiler.debug_toolbar.intercept_redirects', $config['intercept_redirects']);
+ $container->setParameter('web_profiler.debug_toolbar.mode', $config['toolbar'] ? WebDebugToolbarListener::ENABLED : WebDebugToolbarListener::DISABLED);
}
-
- $container->setParameter('web_profiler.debug_toolbar.mode', $mode);
- $container->setParameter('web_profiler.debug_toolbar.position', $config['position']);
}
/**
diff --git a/src/Symfony/Bundle/WebProfilerBundle/EventListener/WebDebugToolbarListener.php b/src/Symfony/Bundle/WebProfilerBundle/EventListener/WebDebugToolbarListener.php
index 1a2663d3fa02..ab67078dd6ec 100644
--- a/src/Symfony/Bundle/WebProfilerBundle/EventListener/WebDebugToolbarListener.php
+++ b/src/Symfony/Bundle/WebProfilerBundle/EventListener/WebDebugToolbarListener.php
@@ -11,12 +11,13 @@
namespace Symfony\Bundle\WebProfilerBundle\EventListener;
+use Symfony\Component\HttpFoundation\Request;
use Symfony\Component\HttpFoundation\Response;
use Symfony\Component\HttpFoundation\Session\Flash\AutoExpireFlashBag;
-use Symfony\Component\HttpKernel\HttpKernelInterface;
use Symfony\Component\HttpKernel\Event\FilterResponseEvent;
use Symfony\Component\HttpKernel\KernelEvents;
use Symfony\Component\EventDispatcher\EventSubscriberInterface;
+use Symfony\Component\Routing\Generator\UrlGeneratorInterface;
/**
* WebDebugToolbarListener injects the Web Debug Toolbar.
@@ -34,16 +35,20 @@ class WebDebugToolbarListener implements EventSubscriberInterface
const ENABLED = 2;
protected $twig;
+ protected $urlGenerator;
protected $interceptRedirects;
protected $mode;
protected $position;
+ protected $excludedAjaxPaths;
- public function __construct(\Twig_Environment $twig, $interceptRedirects = false, $mode = self::ENABLED, $position = 'bottom')
+ public function __construct(\Twig_Environment $twig, $interceptRedirects = false, $mode = self::ENABLED, $position = 'bottom', UrlGeneratorInterface $urlGenerator = null, $excludedAjaxPaths = '^/bundles|^/_wdt')
{
$this->twig = $twig;
+ $this->urlGenerator = $urlGenerator;
$this->interceptRedirects = (bool) $interceptRedirects;
$this->mode = (int) $mode;
$this->position = $position;
+ $this->excludedAjaxPaths = $excludedAjaxPaths;
}
public function isEnabled()
@@ -53,13 +58,24 @@ public function isEnabled()
public function onKernelResponse(FilterResponseEvent $event)
{
- if (HttpKernelInterface::MASTER_REQUEST !== $event->getRequestType()) {
- return;
- }
-
$response = $event->getResponse();
$request = $event->getRequest();
+ if ($response->headers->has('X-Debug-Token') && null !== $this->urlGenerator) {
+ try {
+ $response->headers->set(
+ 'X-Debug-Token-Link',
+ $this->urlGenerator->generate('_profiler', array('token' => $response->headers->get('X-Debug-Token')), UrlGeneratorInterface::ABSOLUTE_URL)
+ );
+ } catch (\Exception $e) {
+ $response->headers->set('X-Debug-Error', get_class($e).': '.$e->getMessage());
+ }
+ }
+
+ if (!$event->isMasterRequest()) {
+ return;
+ }
+
// do not capture redirects or modify XML HTTP Requests
if ($request->isXmlHttpRequest()) {
return;
@@ -82,11 +98,12 @@ public function onKernelResponse(FilterResponseEvent $event)
|| $response->isRedirection()
|| ($response->headers->has('Content-Type') && false === strpos($response->headers->get('Content-Type'), 'html'))
|| 'html' !== $request->getRequestFormat()
+ || false !== stripos($response->headers->get('Content-Disposition'), 'attachment;')
) {
return;
}
- $this->injectToolbar($response);
+ $this->injectToolbar($response, $request);
}
/**
@@ -94,7 +111,7 @@ public function onKernelResponse(FilterResponseEvent $event)
*
* @param Response $response A Response instance
*/
- protected function injectToolbar(Response $response)
+ protected function injectToolbar(Response $response, Request $request)
{
$content = $response->getContent();
$pos = strripos($content, '');
@@ -104,7 +121,9 @@ protected function injectToolbar(Response $response)
'@WebProfiler/Profiler/toolbar_js.html.twig',
array(
'position' => $this->position,
+ 'excluded_ajax_paths' => $this->excludedAjaxPaths,
'token' => $response->headers->get('X-Debug-Token'),
+ 'request' => $request,
)
))."\n";
$content = substr($content, 0, $pos).$toolbar.substr($content, $pos);
diff --git a/src/Symfony/Bundle/WebProfilerBundle/Resources/config/profiler.xml b/src/Symfony/Bundle/WebProfilerBundle/Resources/config/profiler.xml
index 874ba8b21624..ed7e923f0d05 100644
--- a/src/Symfony/Bundle/WebProfilerBundle/Resources/config/profiler.xml
+++ b/src/Symfony/Bundle/WebProfilerBundle/Resources/config/profiler.xml
@@ -8,6 +8,7 @@
Symfony\Bundle\WebProfilerBundle\Controller\ProfilerController
Symfony\Bundle\WebProfilerBundle\Controller\RouterController
Symfony\Bundle\WebProfilerBundle\Controller\ExceptionController
+ Symfony\Bundle\WebProfilerBundle\Twig\WebProfilerExtension
@@ -30,5 +31,9 @@
%kernel.debug%
+
+
+
diff --git a/src/Symfony/Bundle/WebProfilerBundle/Resources/config/toolbar.xml b/src/Symfony/Bundle/WebProfilerBundle/Resources/config/toolbar.xml
index 1372b0a61f10..d72c28532c33 100644
--- a/src/Symfony/Bundle/WebProfilerBundle/Resources/config/toolbar.xml
+++ b/src/Symfony/Bundle/WebProfilerBundle/Resources/config/toolbar.xml
@@ -15,6 +15,8 @@
%web_profiler.debug_toolbar.intercept_redirects%
%web_profiler.debug_toolbar.mode%
%web_profiler.debug_toolbar.position%
+
+ 0
+
+ {% endset %}
+ {% set text %}
+
+ AJAX requests
+
+
+ {% endset %}
+ {% include '@WebProfiler/Profiler/toolbar_item.html.twig' with { 'link': false } %}
+{% endblock %}
diff --git a/src/Symfony/Bundle/WebProfilerBundle/Resources/views/Collector/config.html.twig b/src/Symfony/Bundle/WebProfilerBundle/Resources/views/Collector/config.html.twig
index a5f091ecc5e4..d25122b90bf2 100644
--- a/src/Symfony/Bundle/WebProfilerBundle/Resources/views/Collector/config.html.twig
+++ b/src/Symfony/Bundle/WebProfilerBundle/Resources/views/Collector/config.html.twig
@@ -4,12 +4,23 @@
{# Symfony Logo #}
{% set icon %}
-
{% if collector.applicationname %}
{{ collector.applicationname }} {{ collector.applicationversion }}
- {% else %}
- {{ collector.symfonyversion }}
+ {% elseif collector.symfonyState is defined %}
+ {% if 'unknown' == collector.symfonyState -%}
+
+ {%- elseif 'eol' == collector.symfonyState -%}
+
+ {%- elseif 'eom' == collector.symfonyState -%}
+
+ {%- elseif 'dev' == collector.symfonyState -%}
+
+ {%- else -%}
+
+ {%- endif -%}
+ {{ collector.symfonyversion }}
{% endif %}
@@ -32,7 +43,7 @@
{# PHP Information #}
{% set icon %}
-
{% endset %}
{% set text %}
@@ -57,7 +68,7 @@
{# Environment #}
{% set debug_status_class %}sf-toolbar-status sf-toolbar-status-{{ collector.debug ? 'green' : 'red' }}{% endset %}
{% set icon %}
-
{{ token }}
{% if 'n/a' != collector.appname or 'n/a' != collector.env %}
@@ -104,7 +115,7 @@
{% block menu %}
- Config
{% endblock %}
diff --git a/src/Symfony/Bundle/WebProfilerBundle/Resources/views/Collector/events.html.twig b/src/Symfony/Bundle/WebProfilerBundle/Resources/views/Collector/events.html.twig
index 0607aa8a3b64..879e537f13ce 100644
--- a/src/Symfony/Bundle/WebProfilerBundle/Resources/views/Collector/events.html.twig
+++ b/src/Symfony/Bundle/WebProfilerBundle/Resources/views/Collector/events.html.twig
@@ -4,7 +4,7 @@
{% block menu %}
- Events
{% endblock %}
diff --git a/src/Symfony/Bundle/WebProfilerBundle/Resources/views/Collector/exception.html.twig b/src/Symfony/Bundle/WebProfilerBundle/Resources/views/Collector/exception.html.twig
index 121a9ee5d696..5175f6610769 100644
--- a/src/Symfony/Bundle/WebProfilerBundle/Resources/views/Collector/exception.html.twig
+++ b/src/Symfony/Bundle/WebProfilerBundle/Resources/views/Collector/exception.html.twig
@@ -11,7 +11,7 @@
{% block menu %}
- Exception
{% if collector.hasexception %}
diff --git a/src/Symfony/Bundle/WebProfilerBundle/Resources/views/Collector/form.html.twig b/src/Symfony/Bundle/WebProfilerBundle/Resources/views/Collector/form.html.twig
new file mode 100644
index 000000000000..33cbf8f24236
--- /dev/null
+++ b/src/Symfony/Bundle/WebProfilerBundle/Resources/views/Collector/form.html.twig
@@ -0,0 +1,680 @@
+{% extends '@WebProfiler/Profiler/layout.html.twig' %}
+
+{% from _self import form_tree_entry, form_tree_details %}
+
+{% block toolbar %}
+ {% if collector.data|length %}
+ {% set icon %}
+ {% if collector.data.nb_errors %}{{ collector.data.nb_errors }}{% else %}{{ collector.data.forms|length }}{% endif %}
+ {% endset %}
+
+ {% include '@WebProfiler/Profiler/toolbar_item.html.twig' with { 'link': profiler_url } %}
+ {% endif %}
+{% endblock %}
+
+{% block menu %}
+
+ Forms
+ {% if collector.data.forms|length %}
+ {{ collector.data.forms|length }}
+{% endblock %}
+
+{% block panel %}
+
+
+ {% if collector.data.forms|length %}
+
+
+
Forms
+
+
+ {% for formName, formData in collector.data.forms %}
+ {{ form_tree_entry(formName, formData, true) }}
+ {% endfor %}
+
+
+
+ {% for formName, formData in collector.data.forms %}
+ {{ form_tree_details(formName, formData, collector.data.forms_by_hash) }}
+ {% endfor %}
+
No forms were submitted for this request.
+ {% endif %}
+
+
+{% endblock %}
+
+{% macro form_tree_entry(name, data, expanded) %}
+ {% import _self as tree %}
+
+
+ {% if data.children is not empty %}
+
+ {% else %}
+
+ {% endif %}
+ {{ name|default('(no name)') }} {% if data.type_class is defined and data.type is defined %}[
{{ data.type }} ]{% endif %}
+ {% if data.errors is defined and data.errors|length > 0 %}
+
{{ data.errors|length }}
+ {% endif %}
+
+ {% for childName, childData in data.children %}
+ {{ tree.form_tree_entry(childName, childData, false) }}
+ {% endfor %}
+
+ {% endif %}
+
+{% endmacro %}
+
+{% macro form_tree_details(name, data, forms_by_hash) %}
+ {% import _self as tree %}
+
+
+ {{ name|default('(no name)') }}
+ {% if data.type_class is defined and data.type is defined %}
+ [{{ data.type }} ]
+ {% endif %}
+
+
+ {% if data.errors is defined and data.errors|length > 0 %}
+
+
+
+
+
+ Message
+ Origin
+ Cause
+
+ {% for error in data.errors %}
+
+ {{ error.message }}
+
+ {% if error.origin is empty %}
+ This form.
+ {% elseif forms_by_hash[error.origin] is not defined %}
+ Unknown.
+ {% else %}
+ {{ forms_by_hash[error.origin].name }}
+ {% endif %}
+
+
+ {% for trace in error.trace %}
+ {% if not loop.first %}
+ {{ trace.class }}
+ {{- trace.root -}}
+ {%- if trace.path is not empty -%}
+ {%- if trace.path|first != '[' %}.{% endif -%}
+ {{- trace.path -}}
+ {%- endif %} = {{ trace.value -}}
+
+ {% elseif trace.message is defined %}
+ {{ trace.class }} {{ trace.message }}
+ {% else %}
+ {{ trace }}
+ {% endif %}
+ {% else %}
+ Unknown.
+ {% endfor %}
+
+
+ {% endfor %}
+
+
+ {% endif %}
+
+ {% if data.default_data is defined %}
+
+
+
+
+
+ Model Format
+
+ {% if data.default_data.model is defined %}
+ {{ data.default_data.model }}
+ {% else %}
+ same as normalized format
+ {% endif %}
+
+
+
+ Normalized Format
+ {{ data.default_data.norm }}
+
+ View Format
+
+ {% if data.default_data.view is defined %}
+ {{ data.default_data.view }}
+ {% else %}
+ same as normalized format
+ {% endif %}
+
+
+
+
+ {% endif %}
+
+ {% if data.submitted_data is defined %}
+
+
+
+ {% if data.submitted_data.norm is defined %}
+
+
+ View Format
+
+ {% if data.submitted_data.view is defined %}
+ {{ data.submitted_data.view }}
+ {% else %}
+ same as normalized format
+ {% endif %}
+
+
+
+ Normalized Format
+ {{ data.submitted_data.norm }}
+
+ Model Format
+
+ {% if data.submitted_data.model is defined %}
+ {{ data.submitted_data.model }}
+ {% else %}
+ same as normalized format
+ {% endif %}
+
+
+
+ {% else %}
+
This form was not submitted.
+ {% endif %}
+
+ {% endif %}
+
+ {% if data.passed_options is defined %}
+
+
+
+ {% if data.passed_options|length %}
+
+
+ Option
+ Passed Value
+ Resolved Value
+
+ {% for option, value in data.passed_options %}
+
+ {{ option }}
+ {{ value }}
+ {% if data.resolved_options[option] is same as(value) %}
+ same as passed value
+ {% else %}
+ {{ data.resolved_options[option] }}
+ {% endif %}
+
+
+ {% endfor %}
+
+ {% else %}
+
No options where passed when constructing this form.
+ {% endif %}
+
+ {% endif %}
+
+ {% if data.resolved_options is defined %}
+
+
+
+
+
+ Option
+ Value
+
+ {% for option, value in data.resolved_options %}
+
+ {{ option }}
+ {{ value }}
+ {% endfor %}
+
+
+ {% endif %}
+
+ {% if data.view_vars is defined %}
+
+
+
+
+
+ Variable
+ Value
+
+ {% for variable, value in data.view_vars %}
+
+ {{ variable }}
+ {{ value }}
+ {% endfor %}
+
+
+ {% endif %}
+
{{ error_count }}
+ {% set error_count = collector.counterrors + collector.countdeprecations + collector.countscreams %}
+ {{ error_count }}
{% endset %}
{% set text %}
{% if collector.counterrors %}
- Exception
+ Errors
{{ collector.counterrors }}
{% endif %}
@@ -27,6 +27,12 @@
{{ collector.countdeprecations }}
{% endif %}
+ {% if collector.countscreams %}
+
+ Silenced Errors
+ {{ collector.countscreams }}
+
+ {% endif %}
{% endset %}
{% include '@WebProfiler/Profiler/toolbar_item.html.twig' with { 'link': profiler_url } %}
{% endif %}
@@ -34,10 +40,10 @@
{% block menu %}
- Logs
- {% if collector.counterrors or collector.countdeprecations %}
- {% set error_count = collector.counterrors + collector.countdeprecations %}
+ {% if collector.counterrors or collector.countdeprecations or collector.countscreams %}
+ {% set error_count = collector.counterrors + collector.countdeprecations + collector.countscreams %}
{{ error_count }}
@@ -56,12 +62,21 @@