8000 Merge branch '2.7' into 2.8 · symfony/symfony-docs@7dfa573 · GitHub
[go: up one dir, main page]
Skip to content

Commit 7dfa573

Browse files
wouterjwouterj
committed
Merge branch '2.7' into 2.8
Conflicts: cookbook/security/voters.rst
2 parents f70aaeb + 09a3381 commit 7dfa573

File tree

5 files changed

+6
-8
lines changed

5 files changed

+6
-8
lines changed

‎book/testing.rst‎

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -18,8 +18,7 @@ it has its own excellent `documentation`_.
1818
.. note::
1919

2020
It's recommended to use the latest stable PHPUnit version, `installed as
21-
PHAR`_ (you will have to use version 4.2 or higher to test the Symfony core
22-
code itself).
21+
PHAR`_.
2322

2423
Each test - whether it's a unit test or a functional test - is a PHP class
2524
that should live in the ``Tests/`` subdirectory of your bundles. If you follow

‎components/form/introduction.rst‎

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -5,8 +5,7 @@
55
The Form Component
66
==================
77

8-
The Form component allows you to easily create, process and reuse HTML
9-
forms.
8+
The Form component allows you to easily create, process and reuse forms.
109

1110
The Form component is a tool to help you solve the problem of allowing end-users
1211
to interact with the data and modify the data in your application. And though

‎cookbook/cache/varnish.rst‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -256,6 +256,6 @@ proxy before it has expired, it adds complexity to your caching setup.
256256
.. _`Surrogate-Capability Header`: http://www.w3.org/TR/edge-arch
257257
.. _`cache invalidation`: http://tools.ietf.org/html/rfc2616#section-13.10
258258
.. _`FOSHttpCacheBundle`: http://foshttpcachebundle.readthedocs.org/
259-
.. _`default.vcl`: https://www.varnish-cache.org/trac/browser/bin/varnishd/default.vcl?rev=3.0
260-
.. _`builtin.vcl`: https://www.varnish-cache.org/trac/browser/bin/varnishd/builtin.vcl?rev=4.0
259+
.. _`default.vcl`: https://github.com/varnish/Varnish-Cache/blob/3.0/bin/varnishd/default.vcl
260+
.. _`builtin.vcl`: https://github.com/varnish/Varnish-Cache/blob/4.1/bin/varnishd/builtin.vcl
261261
.. _`User Context`: http://foshttpcachebundle.readthedocs.org/en/latest/features/user-context.html

‎cookbook/security/voters.rst‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -154,7 +154,7 @@ would look like this::
154154
/** @var Post $post */
155155
$post = $subject;
156156

157-
switch($attribute) {
157+
switch ($attribute) {
158158
case self::VIEW:
159159
return $this->canView($post, $user);
160160
case self::EDIT:

‎reference/forms/types/choice.rst‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -114,7 +114,7 @@ method::
114114
},
115115
'group_by' => function($category, $key, $index) {
116116
// randomly assign things into 2 groups
117-
return rand(0, 1) == 1 ? 'Group A' : 'Group B'
117+
return rand(0, 1) == 1 ? 'Group A' : 'Group B';
118118
},
119119
'preferred_choices' => function($category, $key, $index) {
120120
return $category->getName() == 'Cat2' || $category->getName() == 'Cat3';

0 commit comments

Comments
 (0)
0