Merge branch '2.7' into 2.8

wouterj · wouterj · commit 7dfa5736105c · 2016-06-24T13:09:22.000+02:00
Conflicts:
	cookbook/security/voters.rst
diff --git a/book/testing.rst b/book/testing.rst
@@ -18,8 +18,7 @@ it has its own excellent `documentation`_.
 .. note::
 
     It's recommended to use the latest stable PHPUnit version, `installed as
-    PHAR`_ (you will have to use version 4.2 or higher to test the Symfony core 
-    code itself).
+    PHAR`_.
 
 Each test - whether it's a unit test or a functional test - is a PHP class
 that should live in the ``Tests/`` subdirectory of your bundles. If you follow
diff --git a/components/form/introduction.rst b/components/form/introduction.rst
@@ -5,8 +5,7 @@
 The Form Component
 ==================
 
-    The Form component allows you to easily create, process and reuse HTML
-    forms.
+    The Form component allows you to easily create, process and reuse forms.
 
 The Form component is a tool to help you solve the problem of allowing end-users
 to interact with the data and modify the data in your application. And though
diff --git a/cookbook/cache/varnish.rst b/cookbook/cache/varnish.rst
@@ -256,6 +256,6 @@ proxy before it has expired, it adds complexity to your caching setup.
 .. _`Surrogate-Capability Header`: http://www.w3.org/TR/edge-arch
 .. _`cache invalidation`: http://tools.ietf.org/html/rfc2616#section-13.10
 .. _`FOSHttpCacheBundle`: http://foshttpcachebundle.readthedocs.org/
-.. _`default.vcl`: https://www.varnish-cache.org/trac/browser/bin/varnishd/default.vcl?rev=3.0
-.. _`builtin.vcl`: https://www.varnish-cache.org/trac/browser/bin/varnishd/builtin.vcl?rev=4.0
+.. _`default.vcl`: https://github.com/varnish/Varnish-Cache/blob/3.0/bin/varnishd/default.vcl
+.. _`builtin.vcl`: https://github.com/varnish/Varnish-Cache/blob/4.1/bin/varnishd/builtin.vcl
 .. _`User Context`: http://foshttpcachebundle.readthedocs.org/en/latest/features/user-context.html
diff --git a/cookbook/security/voters.rst b/cookbook/security/voters.rst
@@ -154,7 +154,7 @@ would look like this::
             /** @var Post $post */
             $post = $subject;
 
-            switch($attribute) {
+            switch ($attribute) {
                 case self::VIEW:
                     return $this->canView($post, $user);
                 case self::EDIT:
diff --git a/reference/forms/types/choice.rst b/reference/forms/types/choice.rst
@@ -114,7 +114,7 @@ method::
         },
         'group_by' => function($category, $key, $index) {
             // randomly assign things into 2 groups
-            return rand(0, 1) == 1 ? 'Group A' : 'Group B'
+            return rand(0, 1) == 1 ? 'Group A' : 'Group B';
         },
         'preferred_choices' => function($category, $key, $index) {
             return $category->getName() == 'Cat2' || $category->getName() == 'Cat3';
