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 4e6a87d

Browse filesBrowse files
wouterjwouterj
committed
Fixed issues and typos in new formats
Fixed issues by @stof Fixed typo
1 parent b1777b7 commit 4e6a87d
Copy full SHA for 4e6a87d

File tree

Expand file treeCollapse file tree

8 files changed

+18
-26
lines changed
Filter options
Expand file treeCollapse file tree

8 files changed

+18
-26
lines changed

‎cookbook/configuration/override_dir_structure.rst

Copy file name to clipboardExpand all lines: cookbook/configuration/override_dir_structure.rst
+1-1Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -117,7 +117,7 @@ may need to modify the paths inside these files::
117117
<!-- app/config/config.xml -->
118118
119119
<!-- ... -->
120-
<assetic:config read_from="%kernel.root_dir%/../../public_html" />
120+
<assetic:config read-from="%kernel.root_dir%/../../public_html" />
121121
122122
.. code-block:: php
123123

‎cookbook/form/create_custom_field_type.rst

Copy file name to clipboardExpand all lines: cookbook/form/create_custom_field_type.rst
+1-1Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -131,7 +131,7 @@ you want to always render it in a ``ul`` element. In your form theme template
131131

132132
<!-- src/Acme/DemoBundle/Resources/views/Form/gender_widget.html.twig -->
133133
<?php if ($expanded) : ?>
134-
<ul <?php $view['slots']->output('widget_container_attributes') ?>>
134+
<ul <?php $view['form']->block($form, 'widget_container_attributes') ?>>
135135
<?php foreach ($form as $child) : ?>
136136
<li>
137137
<?php echo $view['form']->widget($child) ?>

‎cookbook/form/data_transformers.rst

Copy file name to clipboardExpand all lines: cookbook/form/data_transformers.rst
+1-1Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -293,7 +293,7 @@ it's recognized as a custom field type:
293293
294294
$container
295295
->setDefinition('acme_demo.type.issue_selector', array(
296-
'@doctrine.orm.entity_manager'
296+
new Reference('doctrine.orm.entity_manager'),
297297
))
298298
->addTag('form.type', array(
299299
'alias' => 'issue_selector',

‎cookbook/form/form_collections.rst

Copy file name to clipboardExpand all lines: cookbook/form/form_collections.rst
+1-1Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -471,7 +471,7 @@ into new ``Tag`` objects and added to the ``tags`` property of the ``Task`` obje
471471
<!-- ... -->
472472
<one-to-many field="tags" target-entity="Tag">
473473
<cascade>
474-
<cascade-persists />
474+
<cascade-persist />
475475
</cascade>
476476
</one-to-many>
477477
</entity>

‎cookbook/security/custom_authentication_provider.rst

Copy file name to clipboardExpand all lines: cookbook/security/custom_authentication_provider.rst
+3-4Lines changed: 3 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -499,10 +499,9 @@ You are finished! You can now define parts of your app as under WSSE protection.
499499
.. code-block:: xml
500500
501501
<config>
502-
<firewall name="wsse_secured"
503-
pattern="/api/.*"
504-
wsse="true"
505-
/>
502+
<firewall name="wsse_secured" pattern="/api/.*">
503+
<wsse />
504+
</firewall>
506505
</config>
507506
508507
.. code-block:: php

‎cookbook/security/entity_provider.rst

Copy file name to clipboardExpand all lines: cookbook/security/entity_provider.rst
+3-4Lines changed: 3 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -268,10 +268,9 @@ then be checked against your User entity records in the database:
268268
<entity class="AcmeUserBundle:User" property="username" />
269269
</provider>
270270
271-
<firewall name="admin_area"
272-
pattern="^/admin"
273-
http_basic
274-
/>
271+
<firewall name="admin_area" pattern="^/admin">
272+
<http-basic />
273+
</firewall>
275274
276275
<rule path="^/admin" role="ROLE_ADMIN" />
277276
</config>

‎cookbook/templating/global_variables.rst

Copy file name to clipboardExpand all lines: cookbook/templating/global_variables.rst
+3-9Lines changed: 3 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -29,23 +29,17 @@ This is possible inside your ``app/config/config.yml`` file:
2929
3030
// app/config/config.php
3131
$container->loadFromExtension('twig', array(
32-
...,
32+
// ...
3333
'globals' => array(
3434
'ga_tracking' => 'UA-xxxxx-x',
3535
),
3636
));
3737
3838
Now, the variable ``ga_tracking`` is available in all Twig templates:
3939

40-
.. configuration-block::
41-
42-
.. code-block:: html+jinja
43-
44-
<p>The google tracking code is: {{ ga_tracking }}</p>
45-
46-
.. code-block:: html+php
40+
.. code-block:: html+jinja
4741

48-
<p>The google tracking code is: <?php echo $ga_tracking; ?></p>
42+
<p>The google tracking code is: {{ ga_tracking }}</p>
4943

5044
It's that easy! You can also take advantage of the built-in :ref:`book-service-container-parameters`
5145
system, which lets you isolate or reuse the value:

‎cookbook/testing/http_authentication.rst

Copy file name to clipboardExpand all lines: cookbook/testing/http_authentication.rst
+5-5Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -39,9 +39,9 @@ key in your firewall, along with the ``form_login`` key:
3939
4040
<!-- app/config/config_test.xml -->
4141
<security:config>
42-
<firewall name="your_firewall_name">
43-
<http-basic />
44-
</firewall>
42+
<security:firewall name="your_firewall_name">
43+
<security:http-basic />
44+
</security:firewall>
4545
</security:config>
4646
4747
.. code-block:: php
@@ -50,7 +50,7 @@ key in your firewall, along with the ``form_login`` key:
5050
$container->loadFromExtension('security', array(
5151
'firewalls' => array(
5252
'your_firewall_name' => array(
53-
'http-basic' => array(),
53+
'http_basic' => array(),
5454
),
5555
),
56-
));
56+
));

0 commit comments

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