Merge branch '2.7' into 2.8

* 2.7:
  Fixed a missing reference
  added Sam in the core team
  Propose identical comparison
  fix some security config examples
  [Form] Compound option explained

Author: javiereguiluz

best_practices/security.rst

@@ -177,7 +177,7 @@ to the ``Post`` entity that checks if a given user is its author::
          */
         public function isAuthor(User $user = null)
         {
-            return $user && $user->getEmail() == $this->getAuthorEmail();
+            return $user && $user->getEmail() === $this->getAuthorEmail();
         }
     }
 

contributing/code/core_team.rst

@@ -84,7 +84,9 @@ Active Core Members
     Form_, Serializer_, DependencyInjection_, and HttpKernel_ components;
 
   * **Tobias Nyholm** (`Nyholm`) manages the official and contrib recipes
-    repositories.
+    repositories;
+
+  * **Samuel Rozé** (`sroze`_) can merge into Messenger_ component.
 
 * **Deciders** (``@symfony/deciders`` on GitHub):
 
@@ -192,6 +194,7 @@ discretion of the **Project Leader**.
 .. _Intl: https://github.com/symfony/intl
 .. _LDAP: https://github.com/symfony/ldap
 .. _Locale: https://github.com/symfony/locale
+.. _Messenger: https://github.com/symfony/messenger
 .. _MonologBridge: https://github.com/symfony/monolog-bridge
 .. _OptionsResolver: https://github.com/symfony/options-resolver
 .. _Process: https://github.com/symfony/process
@@ -227,3 +230,4 @@ discretion of the **Project Leader**.
 .. _`chalasr`: https://github.com/chalasr/
 .. _`ogizanagi`: https://github.com/ogizanagi/
 .. _`Nyholm`: https://github.com/Nyholm
+.. _`sroze`: https://github.com/sroze

contributing/community/review-comments.rst

@@ -166,8 +166,8 @@ Final Words
 -----------
 
 Don't feel bad if you "failed" to follow these tips. As long as your
-intentions were good and you didn't really offended or insult anyone;
-you can explain you misunderstood, you didn't meant to marginalize or
+intentions were good and you didn't really offend or insult anyone;
+you can explain you misunderstood, you didn't mean to marginalize or
 simply failed.
 
 But don't say it "just because", if your apology is not really meant

reference/forms/types/options/compound.rst.inc

@@ -3,6 +3,22 @@ compound
 
 **type**: ``boolean`` **default**: ``true``
 
-This option specifies if a form is compound. This is independent of whether
-the form actually has children. A form can be compound but not have any
-children at all (e.g. an empty collection form).
+If ``true`` this option creates the form as "compound", meaning that it
+can contain children and be a parent of other forms.
+
+Most of the time you won't need to override this option.
+You might want to control for it when creating a custom form type
+with advanced rendering logic.
+
+In a view a compound form is rendered as a ``<div>`` container or
+a ``<form>`` element (the whole form is obviously a compound form).
+
+Non-compound forms are always leaves in a form tree, they cannot have children.
+
+A non-compound form is rendered as one of the html form elements: ``<input>``
+(``TextType``, ``FileType``, ``HiddenType``), ``<textarea>`` (``TextareaType``)
+or ``<select>`` (``ChoiceType``).
+
+An interesting case is the ``ChoiceType``. With ``expanded=false`` it is a non-compound form
+and is rendered as a ``<select>`` tag. With ``expanded=true`` the ``ChoiceType`` becomes a
+compound form and is rendered as a set of radios or checkboxes.

security/access_control.rst

@@ -192,11 +192,12 @@ pattern so that it is only accessible by requests from the local server itself:
 
             <config>
                 <!-- ... -->
+
                 <!-- the 'ips' option supports IP addresses and subnet masks -->
-                <rule path="^/internal"
-                    role="IS_AUTHENTICATED_ANONYMOUSLY"
-                    ips="127.0.0.1, ::1, 192.168.0.1/24"
-                />
+                <rule path="^/internal" role="IS_AUTHENTICATED_ANONYMOUSLY">
+                    <ip>127.0.0.1</ip>
+                    <ip>::1</ip>
+                </rule>
 
                 <rule path="^/internal" role="ROLE_NO_ACCESS" />
             </config>
@@ -212,7 +213,7 @@ pattern so that it is only accessible by requests from the local server itself:
                     'path' => '^/internal',
                     'role' => 'IS_AUTHENTICATED_ANONYMOUSLY',
                     // the 'ips' option supports IP addresses and subnet masks
-                    'ips' => '127.0.0.1, ::1, 192.168.0.1/24',
+                    'ips' => array('127.0.0.1', '::1'),
                 ),
                 array(
                     'path' => '^/internal',
@@ -265,10 +266,19 @@ key:
 
     .. code-block:: xml
 
-            <access-control>
+        <!-- app/config/security.xml -->
+        <?xml version="1.0" encoding="UTF-8"?>
+        <srv:container xmlns="http://symfony.com/schema/dic/security"
+            xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+            xmlns:srv="http://symfony.com/schema/dic/services"
+            xsi:schemaLocation="http://symfony.com/schema/dic/services
+                http://symfony.com/schema/dic/services/services-1.0.xsd">
+
+            <config>
                 <rule path="^/_internal/secure"
                     allow-if="'127.0.0.1' == request.getClientIp() or has_role('ROLE_ADMIN')" />
-            </access-control>
+            </config>
+        </srv:container>
 
     .. code-block:: php