Skip to content

Commit 4c06860

Browse files
committed
Merge branch '2.3'
Conflicts: components/yaml/introduction.rst
2 parents 2b7dcf9 + 59d6e6e commit 4c06860

File tree

4 files changed

+12
-5
lines changed

4 files changed

+12
-5
lines changed

components/dom_crawler.rst

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -138,7 +138,7 @@ Extract attribute and/or node values from the list of nodes::
138138
Call an anonymous function on each node of the list::
139139

140140
$nodeValues = $crawler->filter('p')->each(function ($node, $i) {
141-
return $node->nodeValue;
141+
return $node->text();
142142
});
143143

144144
The anonymous function receives the position and the node as arguments.

components/yaml/introduction.rst

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -134,6 +134,12 @@ string or a file containing YAML. Internally, it calls the
134134
:method:`Symfony\\Component\\Yaml\\Parser::parse` method, but enhances the
135135
error if something goes wrong by adding the filename to the message.
136136

137+
.. caution::
138+
139+
Because it is currently possible to pass a filename to this method, you
140+
must validate the input first. Passing a filename is deprecated in
141+
Symfony 2.2, and will be removed in Symfony 3.0.
142+
137143
Writing YAML Files
138144
~~~~~~~~~~~~~~~~~~
139145

cookbook/configuration/front_controllers_and_kernel.rst

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -40,12 +40,13 @@ and return the resulting response to the browser.
4040

4141
Because every request is routed through it, the front controller can be
4242
used to perform global initializations prior to setting up the kernel or
43-
to *`decorate`_* the kernel with additional features. Examples include:
43+
to `decorate`_ the kernel with additional features. Examples include:
4444

4545
* Configuring the autoloader or adding additional autoloading mechanisms;
4646
* Adding HTTP level caching by wrapping the kernel with an instance of
4747
:ref:`AppCache<symfony-gateway-cache>`;
48-
* Enabling the :doc:`/components/debug`.
48+
* Enabling (or skipping) the :doc:`ClassCache </cookbook/debugging>`
49+
* Enabling the :doc:`Debug Component </components/debug>`.
4950

5051
The front controller can be chosen by requesting URLs like:
5152

cookbook/security/voters.rst

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -4,10 +4,10 @@
44
How to implement your own Voter to blacklist IP Addresses
55
=========================================================
66

7-
The Symfony2 security component provides several layers to authenticate users.
7+
The Symfony2 security component provides several layers to authorize users.
88
One of the layers is called a `voter`. A voter is a dedicated class that checks
99
if the user has the rights to be connected to the application. For instance,
10-
Symfony2 provides a layer that checks if the user is fully authenticated or if
10+
Symfony2 provides a layer that checks if the user is fully authorized or if
1111
it has some expected roles.
1212

1313
It is sometimes useful to create a custom voter to handle a specific case not

0 commit comments

Comments
 (0)