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 9ad03f7

Browse filesBrowse files
weaverryanweaverryan
committed
Merge pull request symfony#2265 from WouterJ/fix_highlighting
[Book] Fixed highlighting issues
2 parents 7199787 + 0948780 commit 9ad03f7
Copy full SHA for 9ad03f7

File tree

Expand file treeCollapse file tree

9 files changed

+45
-35
lines changed
Filter options
Expand file treeCollapse file tree

9 files changed

+45
-35
lines changed

‎book/controller.rst

Copy file name to clipboardExpand all lines: book/controller.rst
+2-2Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -102,7 +102,7 @@ a controller object. Controllers are also called *actions*.
102102
{
103103
public function indexAction($name)
104104
{
105-
return new Response('<html><body>Hello '.$name.'!</body></html>');
105+
return new Response('<html><body>Hello '.$name.'!</body></html>');
106106
}
107107
}
108108
@@ -687,7 +687,7 @@ the ``notice`` message:
687687
</div>
688688
{% endif %}
689689

690-
.. code-block:: php
690+
.. code-block:: html+php
691691

692692
<?php if ($view['session']->hasFlash('notice')): ?>
693693
<div class="flash-notice">

‎book/doctrine.rst

Copy file name to clipboardExpand all lines: book/doctrine.rst
+5-5Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -50,11 +50,11 @@ information. By convention, this information is usually configured in an
5050
5151
; app/config/parameters.ini
5252
[parameters]
53-
database_driver = pdo_mysql
54-
database_host = localhost
55-
database_name = test_project
56-
database_user = root
57-
database_password = password
53+
database_driver = pdo_mysql
54+
database_host = localhost
55+
database_name = test_project
56+
database_user = root
57+
database_password = password
5858
5959
.. note::
6060

‎book/http_cache.rst

Copy file name to clipboardExpand all lines: book/http_cache.rst
+2-2Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -851,7 +851,7 @@ First, to use ESI, be sure to enable it in your application configuration:
851851
852852
// app/config/config.php
853853
$container->loadFromExtension('framework', array(
854-
...,
854+
// ...
855855
'esi' => array('enabled' => true),
856856
));
857857
@@ -884,7 +884,7 @@ matter), Symfony2 uses the standard ``render`` helper to configure ESI tags:
884884
885885
{% render url('latest_news', { 'max': 5 }) with {}, {'standalone': true} %}
886886
887-
.. code-block:: php
887+
.. code-block:: html+php
888888

889889
<?php echo $view['actions']->render(
890890
$view['router']->generate('latest_news', array('max' => 5), true),

‎book/page_creation.rst

Copy file name to clipboardExpand all lines: book/page_creation.rst
+2-2Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -344,7 +344,7 @@ controller, and ``index.html.twig`` the template:
344344
Hello {{ name }}!
345345
{% endblock %}
346346
347-
.. code-block:: php
347+
.. code-block:: html+php
348348

349349
<!-- src/Acme/HelloBundle/Resources/views/Hello/index.html.php -->
350350
<?php $view->extend('::base.html.php') ?>
@@ -385,7 +385,7 @@ and in the ``app`` directory:
385385
</body>
386386
</html>
387387

388-
.. code-block:: php
388+
.. code-block:: html+php
389389

390390
<!-- app/Resources/views/base.html.php -->
391391
<!DOCTYPE html>

‎book/propel.rst

Copy file name to clipboardExpand all lines: book/propel.rst
+6-6Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -35,12 +35,12 @@ information. By convention, this information is usually configured in an
3535
3636
; app/config/parameters.ini
3737
[parameters]
38-
database_driver = mysql
39-
database_host = localhost
40-
database_name = test_project
41-
database_user = root
42-
database_password = password
43-
database_charset = UTF8
38+
database_driver = mysql
39+
database_host = localhost
40+
database_name = test_project
41+
database_user = root
42+
database_password = password
43+
database_charset = UTF8
4444
4545
.. note::
4646

‎book/routing.rst

Copy file name to clipboardExpand all lines: book/routing.rst
+2-2Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1169,7 +1169,7 @@ a template helper function:
11691169
Read this blog post.
11701170
</a>
11711171

1172-
.. code-block:: php
1172+
.. code-block:: html+php
11731173

11741174
<a href="<?php echo $view['router']->generate('blog_show', array('slug' => 'my-blog-post')) ?>">
11751175
Read this blog post.
@@ -1185,7 +1185,7 @@ Absolute URLs can also be generated.
11851185
Read this blog post.
11861186
</a>
11871187

1188-
.. code-block:: php
1188+
.. code-block:: html+php
11891189

11901190
<a href="<?php echo $view['router']->generate('blog_show', array('slug' => 'my-blog-post'), true) ?>">
11911191
Read this blog post.

‎book/security.rst

Copy file name to clipboardExpand all lines: book/security.rst
+9-9Lines changed: 9 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -484,7 +484,7 @@ Finally, create the corresponding template:
484484

485485
.. code-block:: html+php
486486

487-
<?php // src/Acme/SecurityBundle/Resources/views/Security/login.html.php ?>
487+
<!-- src/Acme/SecurityBundle/Resources/views/Security/login.html.php -->
488488
<?php if ($error): ?>
489489
<div><?php echo $error->getMessage() ?></div>
490490
<?php endif; ?>
@@ -723,7 +723,7 @@ You can define as many URL patterns as you need - each is a regular expression.
723723
724724
// app/config/security.php
725725
$container->loadFromExtension('security', array(
726-
...,
726+
// ...
727727
'access_control' => array(
728728
array('path' => '^/admin/users', 'role' => 'ROLE_SUPER_ADMIN'),
729729
array('path' => '^/admin', 'role' => 'ROLE_ADMIN'),
@@ -1072,7 +1072,7 @@ In fact, you've seen this already in the example in this chapter.
10721072
10731073
// app/config/security.php
10741074
$container->loadFromExtension('security', array(
1075-
...,
1075+
// ...
10761076
'providers' => array(
10771077
'default_provider' => array(
10781078
'users' => array(
@@ -1302,7 +1302,7 @@ configure the encoder for that user:
13021302
13031303
// app/config/security.php
13041304
$container->loadFromExtension('security', array(
1305-
...,
1305+
// ...
13061306
'encoders' => array(
13071307
'Acme\UserBundle\Entity\User' => 'sha512',
13081308
),
@@ -1502,10 +1502,10 @@ the first provider is always used:
15021502
$container->loadFromExtension('security', array(
15031503
'firewalls' => array(
15041504
'secured_area' => array(
1505-
...,
1505+
// ...
15061506
'provider' => 'user_db',
15071507
'http_basic' => array(
1508-
...,
1508+
// ...
15091509
'provider' => 'in_memory',
15101510
),
15111511
'form_login' => array(),
@@ -1616,7 +1616,7 @@ the firewall can handle this automatically for you when you activate the
16161616
$container->loadFromExtension('security', array(
16171617
'firewalls' => array(
16181618
'secured_area' => array(
1619-
...,
1619+
// ...
16201620
'logout' => array('path' => 'logout', 'target' => '/'),
16211621
),
16221622
),
@@ -1771,7 +1771,7 @@ done by activating the ``switch_user`` firewall listener:
17711771
$container->loadFromExtension('security', array(
17721772
'firewalls' => array(
17731773
'main'=> array(
1774-
...,
1774+
// ...
17751775
'switch_user' => true
17761776
),
17771777
),
@@ -1799,7 +1799,7 @@ to show a link to exit impersonation:
17991799
.. code-block:: html+jinja
18001800

18011801
{% if is_granted('ROLE_PREVIOUS_ADMIN') %}
1802-
<a href="{{ path('homepage', {_switch_user: '_exit'}) }}">Exit impersonation</a>
1802+
<a href="{{ path('homepage', { _switch_user: '_exit' }) }}">Exit impersonation</a>
18031803
{% endif %}
18041804

18051805
.. code-block:: html+php

‎book/templating.rst

Copy file name to clipboardExpand all lines: book/templating.rst
+14-6Lines changed: 14 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1194,20 +1194,24 @@ this classic example:
11941194

11951195
.. configuration-block::
11961196

1197-
.. code-block:: jinja
1197+
.. code-block:: html+jinja
11981198

11991199
Hello {{ name }}
12001200

12011201
.. code-block:: html+php
12021202

12031203
Hello <?php echo $name ?>
12041204

1205-
Imagine that the user enters the following code as his/her name::
1205+
Imagine that the user enters the following code as his/her name:
1206+
1207+
.. code-block:: text
12061208
12071209
<script>alert('hello!')</script>
12081210
12091211
Without any output escaping, the resulting template will cause a JavaScript
1210-
alert box to pop up::
1212+
alert box to pop up:
1213+
1214+
.. code-block:: html
12111215

12121216
Hello <script>alert('hello!')</script>
12131217

@@ -1217,7 +1221,9 @@ inside the secure area of an unknowing, legitimate user.
12171221

12181222
The answer to the problem is output escaping. With output escaping on, the
12191223
same template will render harmlessly, and literally print the ``script``
1220-
tag to the screen::
1224+
tag to the screen:
1225+
1226+
.. code-block:: html
12211227

12221228
Hello &lt;script&gt;alert(&#39;helloe&#39;)&lt;/script&gt;
12231229

@@ -1249,7 +1255,9 @@ Output Escaping in PHP
12491255

12501256
Output escaping is not automatic when using PHP templates. This means that
12511257
unless you explicitly choose to escape a variable, you're not protected. To
1252-
use output escaping, use the special ``escape()`` view method::
1258+
use output escaping, use the special ``escape()`` view method:
1259+
1260+
.. code-block:: html+php
12531261

12541262
Hello <?php echo $view->escape($name) ?>
12551263

@@ -1258,7 +1266,7 @@ within an HTML context (and thus the variable is escaped to be safe for HTML).
12581266
The second argument lets you change the context. For example, to output something
12591267
in a JavaScript string, use the ``js`` context:
12601268

1261-
.. code-block:: js
1269+
.. code-block:: html+php
12621270

12631271
var myMsg = 'Hello <?php echo $view->escape($name, 'js') ?>';
12641272

‎book/testing.rst

Copy file name to clipboardExpand all lines: book/testing.rst
+3-1Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -157,7 +157,9 @@ for its ``DemoController`` (`DemoControllerTest`_) that reads as follows::
157157
kernel of your application. In most cases, this happens automatically.
158158
However, if your kernel is in a non-standard directory, you'll need
159159
to modify your ``phpunit.xml.dist`` file to set the ``KERNEL_DIR`` environment
160-
variable to the directory of your kernel::
160+
variable to the directory of your kernel:
161+
162+
.. code-block:: xml
161163
162164
<phpunit>
163165
<!-- ... -->

0 commit comments

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