Skip to content

Navigation Menu

Sign in
Appearance settings

Search code, repositories, users, issues, pull requests...

Provide feedback

We read every piece of feedback, and take your input very seriously.

Saved searches

Use saved searches to filter your results more quickly

Appearance settings

Commit 13adec3

Browse filesBrowse files
committed
Merge branch '2.8' into 3.2
* 2.8: Use Twig's namespaced paths Minor reword Clearify setup of basic auth for test environment
2 parents 74cda20 + 9539ca9 commit 13adec3
Copy full SHA for 13adec3

File tree

2 files changed

+7
-4
lines changed
Filter options

2 files changed

+7
-4
lines changed

‎profiler/data_collector.rst

Copy file name to clipboardExpand all lines: profiler/data_collector.rst
+1-1Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -153,7 +153,7 @@ block and set the value of two variables called ``icon`` and ``text``:
153153

154154
.. code-block:: html+twig
155155

156-
{% extends 'WebProfilerBundle:Profiler:layout.html.twig' %}
156+
{% extends '@WebProfiler/Profiler/layout.html.twig' %}
157157

158158
{% block toolbar %}
159159
{% set icon %}

‎testing/http_authentication.rst

Copy file name to clipboardExpand all lines: testing/http_authentication.rst
+6-3Lines changed: 6 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -30,14 +30,16 @@ firewall, but only in the configuration file used by tests:
3030
# app/config/config_test.yml
3131
security:
3232
firewalls:
33-
your_firewall_name:
33+
# replace 'main' by the name of your own firewall
34+
main:
3435
http_basic: ~
3536
3637
.. code-block:: xml
3738
3839
<!-- app/config/config_test.xml -->
3940
<security:config>
40-
<security:firewall name="your_firewall_name">
41+
<!-- replace 'main' by the name of your own firewall -->
42+
<security:firewall name="main">
4143
<security:http-basic />
4244
</security:firewall>
4345
</security:config>
@@ -47,7 +49,8 @@ firewall, but only in the configuration file used by tests:
4749
// app/config/config_test.php
4850
$container->loadFromExtension('security', array(
4951
'firewalls' => array(
50-
'your_firewall_name' => array(
52+
// replace 'main' by the name of your own firewall
53+
'main' => array(
5154
'http_basic' => array(),
5255
),
5356
),

0 commit comments

Comments
0 (0)
Morty Proxy This is a proxified and sanitized view of the page, visit original site.