Merge branch '3.4'

* 3.4: (27 commits)
  setfacl commands in the right order
  add missing options allowed with an env variable
  [#7941] use class constant
  Update guard_authentication.rst
  Fix typo in a class name
  Fix typo
  Fixed trivial code example typo
  Fix typo
  Fix method reference (`getSubscribedServices()` instead of `getSubscribedEvents()`)
  Fixed code indentation
  use Ldap instead of the deprecated LdapClient
  Fix choice keys and values for custom field types
  [#7946] fix PHP parameter config example
  Tiny clarification to Finder component docs
  [#7917] add LDAP extension link
  Updated code example for LDAP integration
  Syntax to create an email
  Update usage.rst
  Correct default firewall name on Security docs
  Fix small typo
  ...

Author: xabbuh

components/config/definition.rst

@@ -141,13 +141,14 @@ values::
 
     $rootNode
         ->children()
-            ->enumNode('gender')
-                ->values(array('male', 'female'))
+            ->enumNode('delivery')
+                ->values(array('standard', 'expedited', 'priority'))
             ->end()
         ->end()
     ;
 
-This will restrict the ``gender`` option to be either ``male`` or ``female``.
+This will restrict the ``delivery`` options to be either ``standard``,
+``expedited``  or ``priority``.
 
 Array Nodes
 ~~~~~~~~~~~

components/dependency_injection/compilation.rst

@@ -472,7 +472,7 @@ makes dumping the compiled container easy::
     }
 
 ``ProjectServiceContainer`` is the default name given to the dumped container
-class, you can change this though this with the ``class`` option when you
+class. However you can change this with the ``class`` option when you
 dump it::
 
     // ...

components/finder.rst

@@ -50,7 +50,7 @@ the Finder instance.
 
 .. tip::
 
-    A Finder instance is a PHP :phpclass:`Iterator`. So, instead of iterating over the
+    A Finder instance is a PHP :phpclass:`Iterator`. So, in addition to iterating over the
     Finder with ``foreach``, you can also convert it to an array with the
     :phpfunction:`iterator_to_array` method, or get the number of items with
     :phpfunction:`iterator_count`.

components/ldap.rst

@@ -20,10 +20,12 @@ You can install the component in 2 different ways:
 Usage
 -----
 
-The :class:`Symfony\\Component\\Ldap\\LdapClient` class provides methods
-to authenticate and query against an LDAP server.
+The :class:`Symfony\\Component\\Ldap\\Ldap` class provides methods to authenticate
+and query against an LDAP server.
 
-The :class:`Symfony\\Component\\Ldap\\LdapClient` class can be configured
+The ``Ldap`` class uses an :class:`Symfony\\Component\\Ldap\\Adapter\\AdapterInterface`
+to communicate with an LDAP server. The :class:`adapter <Symfony\\Component\\Ldap\\Adapter\\ExtLdap\\Adapter>`
+for PHP's built-in LDAP extension, for example, can be configured
 using the following options:
 
 ``host``
@@ -47,24 +49,32 @@ using the following options:
 
 For example, to connect to a start-TLS secured LDAP server::
 
-    use Symfony\Component\Ldap\LdapClient;
-
-    $ldap = new LdapClient('my-server', 389, 3, false, true);
-
-The :method:`Symfony\\Component\\Ldap\\LdapClient::bind` method
+    use Symfony\Component\Ldap\Adapter\ExtLdap\Adapter;
+    use Symfony\Component\Ldap\Ldap;
+
+    $adapter = new Adapter(array(
+        'host' => 'my-server',
+        'port' => 389,
+        'encryption' => 'tls',
+        'options' => array(
+            'protocol_version' => 3,
+            'referrals' => false,
+        ),
+    ));
+    $ldap = new Ldap($adapter);
+
+The :method:`Symfony\\Component\\Ldap\\Ldap::bind` method
 authenticates a previously configured connection using both the
 distinguished name (DN) and the password of a user::
 
-    use Symfony\Component\Ldap\LdapClient;
     // ...
 
     $ldap->bind($dn, $password);
 
 Once bound (or if you enabled anonymous authentication on your
 LDAP server), you may query the LDAP server using the
-:method:`Symfony\\Component\\Ldap\\LdapClient::find` method::
+:method:`Symfony\\Component\\Ldap\\Ldap::find` method::
 
-    use Symfony\Component\Ldap\LdapClient;
     // ...
 
     $ldap->find('dc=symfony,dc=com', '(&(objectclass=person)(ou=Maintainers))');

components/security/authentication.rst

@@ -305,7 +305,6 @@ The ``security.interactive_login`` event is triggered after a user has actively
 logged into your website.  It is important to distinguish this action from
 non-interactive authentication methods, such as:
 
-* authentication based on a "remember me" cookie.
 * authentication based on your session.
 * authentication using a HTTP basic or HTTP digest header.
 

controller/service.rst

@@ -130,7 +130,7 @@ The best way to see how to replace base ``Controller`` convenience methods is to
 look at the `ControllerTrait`_ that holds its logic.
 
 If you want to know what type-hints to use for each service, see the
-``getSubscribedEvents()`` method in `AbstractController`_.
+``getSubscribedServices()`` method in `AbstractController`_.
 
 .. _`Controller class source code`: https://github.com/symfony/symfony/blob/master/src/Symfony/Bundle/FrameworkBundle/Controller/ControllerTrait.php
 .. _`base Controller class`: https://github.com/symfony/symfony/blob/master/src/Symfony/Bundle/FrameworkBundle/Controller/ControllerTrait.php

controller/soap_web_service.rst

@@ -39,9 +39,8 @@ In this case, the SOAP service will allow the client to call a method called
         public function hello($name)
         {
 
-            $message = \Swift_Message::newInstance()
+            $message = new \Swift_Message('Hello Service')
                                     ->setTo('me@example.com')
-                                    ->setSubject('Hello Service')
                                     ->setBody($name . ' says hi!');
 
             $this->mailer->send($message);

doctrine.rst

@@ -633,9 +633,9 @@ Fetching an object back out of the database is even easier. For example,
 suppose you've configured a route to display a specific ``Product`` based
 on its ``id`` value::
 
-    use Doctrine\ORM\EnityManagerInterface;
+    use Doctrine\ORM\EntityManagerInterface;
 
-    public function showAction($productId, EnityManagerInterface $em)
+    public function showAction($productId, EntityManagerInterface $em)
     {
         $product = $em->getRepository('AppBundle:Product')
             ->find($productId);
@@ -727,7 +727,7 @@ Updating an Object
 Once you've fetched an object from Doctrine, updating it is easy. Suppose
 you have a route that maps a product id to an update action in a controller::
 
-    use Doctrine\ORM\EnityManagerInterface;
+    use Doctrine\ORM\EntityManagerInterface;
 
     public function updateAction($productId, EntityManagerInterface $em)
     {

email.rst

@@ -103,8 +103,7 @@ an email is pretty straightforward::
 
     public function indexAction($name, \Swift_Mailer $mailer)
     {
-        $message = \Swift_Message::newInstance()
-            ->setSubject('Hello Email')
+        $message = new \Swift_Message('Hello Email')
             ->setFrom('send@example.com')
             ->setTo('recipient@example.com')
             ->setBody(

email/dev_environment.rst

@@ -100,8 +100,7 @@ Now, suppose you're sending an email to ``recipient@example.com``.
 
     public function indexAction($name, \Swift_Mailer $mailer)
     {
-        $message = \Swift_Message::newInstance()
-            ->setSubject('Hello Email')
+        $message = new \Swift_Message('Hello Email')
             ->setFrom('send@example.com')
             ->setTo('recipient@example.com')
             ->setBody(

email/testing.rst

@@ -14,8 +14,7 @@ Start with an easy controller action that sends an email::
 
     public function sendEmailAction($name, \Swift_Mailer $mailer)
     {
-        $message = \Swift_Message::newInstance()
-            ->setSubject('Hello Email')
+        $message = new \Swift_Message('Hello Email')
             ->setFrom('send@example.com')
             ->setTo('recipient@example.com')
             ->setBody('You should see me from the profiler!')

form/create_custom_field_type.rst

@@ -7,7 +7,7 @@ How to Create a Custom Form Field Type
 Symfony comes with a bunch of core field types available for building forms.
 However there are situations where you may want to create a custom form field
 type for a specific purpose. This recipe assumes you need a field definition
-that holds a person's gender, based on the existing choice field. This section
+that holds a shipping option, based on the existing choice field. This section
 explains how the field is defined, how you can customize its layout and finally,
 how you can register it for use in your application.
 
@@ -16,25 +16,26 @@ Defining the Field Type
 
 In order to create the custom field type, first you have to create the class
 representing the field. In this situation the class holding the field type
-will be called ``GenderType`` and the file will be stored in the default location
+will be called ``ShippingType`` and the file will be stored in the default location
 for form fields, which is ``<BundleName>\Form\Type``. Make sure the field extends
 :class:`Symfony\\Component\\Form\\AbstractType`::
 
-    // src/AppBundle/Form/Type/GenderType.php
+    // src/AppBundle/Form/Type/ShippingType.php
     namespace AppBundle\Form\Type;
 
     use Symfony\Component\Form\AbstractType;
     use Symfony\Component\OptionsResolver\OptionsResolver;
     use Symfony\Component\Form\Extension\Core\Type\ChoiceType;
 
-    class GenderType extends AbstractType
+    class ShippingType extends AbstractType
     {
         public function configureOptions(OptionsResolver $resolver)
         {
             $resolver->setDefaults(array(
                 'choices' => array(
-                    'm' => 'Male',
-                    'f' => 'Female',
+                    'Standard Shipping' => 'standard',
+                    'Expedited Shipping' => 'expedited',
+                    'Priority Shipping' => 'priority',
                 )
             ));
         }
@@ -67,8 +68,8 @@ important:
     This method is used to set any extra variables you'll
     need when rendering your field in a template. For example, in `ChoiceType`_,
     a ``multiple`` variable is set and used in the template to set (or not
-    set) the ``multiple`` attribute on the ``select`` field. See `Creating a Template for the Field`_
-    for more details.
+    set) the ``multiple`` attribute on the ``select`` field. See
+    `Creating a Template for the Field`_ for more details.
 
 ``configureOptions()``
     This defines options for your form type that
@@ -83,9 +84,9 @@ important:
     Also, if you need to modify the "view" of any of your child types from
     your parent type, use the ``finishView()`` method.
 
-The goal of this field was to extend the choice type to enable selection of
-a gender. This is achieved by fixing the ``choices`` to a list of possible
-genders.
+The goal of this field was to extend the choice type to enable selection of the
+shipping type. This is achieved by fixing the ``choices`` to a list of available
+shipping options.
 
 Creating a Template for the Field
 ---------------------------------
@@ -95,9 +96,9 @@ the class name of your type. For more information, see :ref:`form-customization-
 
 .. note::
 
-    The first part of the prefix (e.g. ``gender``) comes from the class name
-    (``GenderType`` -> ``gender``). This can be controlled by overriding ``getBlockPrefix()``
-    in ``GenderType``.
+    The first part of the prefix (e.g. ``shipping``) comes from the class name
+    (``ShippingType`` -> ``shipping``). This can be controlled by overriding ``getBlockPrefix()``
+    in ``ShippingType``.
 
 .. caution::
 
@@ -113,14 +114,14 @@ any work as the custom field type will automatically be rendered like a ``Choice
 But for the sake of this example, suppose that when your field is "expanded"
 (i.e. radio buttons or checkboxes, instead of a select field), you want to
 always render it in a ``ul`` element. In your form theme template (see above
-link for details), create a ``gender_widget`` block to handle this:
+link for details), create a ``shipping_widget`` block to handle this:
 
 .. configuration-block::
 
     .. code-block:: html+twig
 
         {# app/Resources/views/form/fields.html.twig #}
-        {% block gender_widget %}
+        {% block shipping_widget %}
             {% spaceless %}
                 {% if expanded %}
                     <ul {{ block('widget_container_attributes') }}>
@@ -140,7 +141,7 @@ link for details), create a ``gender_widget`` block to handle this:
 
     .. code-block:: html+php
 
-        <!-- app/Resources/views/form/gender_widget.html.php -->
+        <!-- app/Resources/views/form/shipping_widget.html.php -->
         <?php if ($expanded) : ?>
             <ul <?php $view['form']->block($form, 'widget_container_attributes') ?>>
             <?php foreach ($form as $child) : ?>
@@ -158,7 +159,7 @@ link for details), create a ``gender_widget`` block to handle this:
 .. note::
 
     Make sure the correct widget prefix is used. In this example the name should
-    be ``gender_widget`` (see :ref:`form-customization-form-themes`).
+    be ``shipping_widget`` (see :ref:`form-customization-form-themes`).
     Further, the main config file should point to the custom form template
     so that it's used when rendering all forms.
 
@@ -255,20 +256,20 @@ new instance of the type in one of your forms::
 
     use Symfony\Component\Form\AbstractType;
     use Symfony\Component\Form\FormBuilderInterface;
-    use AppBundle\Form\Type\GenderType;
+    use AppBundle\Form\Type\ShippingType;
 
-    class AuthorType extends AbstractType
+    class OrderType extends AbstractType
     {
         public function buildForm(FormBuilderInterface $builder, array $options)
         {
-            $builder->add('gender_code', GenderType::class, array(
-                'placeholder' => 'Choose a gender',
+            $builder->add('shipping_code', ShippingType::class, array(
+                'placeholder' => 'Choose a delivery option',
             ));
         }
     }
 
-But this only works because the ``GenderType`` is very simple. What if
-the gender codes were stored in configuration or in a database? The next
+But this only works because the ``ShippingType()`` is very simple. What if
+the shipping codes were stored in configuration or in a database? The next
 section explains how more complex field types solve this problem.
 
 .. _form-field-service:
@@ -280,13 +281,13 @@ Accessing Services and Config
 If you need to access :doc:`services </service_container>` from your form class,
 add a ``__construct()`` method like normal::
 
-    // src/AppBundle/Form/Type/GenderType.php
+    // src/AppBundle/Form/Type/ShippingType.php
     namespace AppBundle\Form\Type;
 
     // ...
     use Doctrine\ORM\EntityManagerInterface;
 
-    class GenderType extends AbstractType
+    class ShippingType extends AbstractType
     {
         private $em;
 

form/unit_testing.rst

@@ -174,7 +174,9 @@ allows you to return a list of extensions to register::
     // ...
     use AppBundle\Form\Type\TestedType;
     use Symfony\Component\Form\Extension\Validator\ValidatorExtension;
+    use Symfony\Component\Form\Form;
     use Symfony\Component\Validator\ConstraintViolationList;
+    use Symfony\Component\Validator\Mapping\ClassMetadata;
     use Symfony\Component\Validator\Validator\ValidatorInterface;
 
     class TestedTypeTest extends TypeTestCase
@@ -189,6 +191,9 @@ allows you to return a list of extensions to register::
             $this->validator
                 ->method('validate')
                 ->will($this->returnValue(new ConstraintViolationList()));
+            $validator
+                ->method('getMetadataFor')
+                ->will($this->returnValue(new ClassMetadata(Form::class)));
 
             return array(
                 new ValidatorExtension($this->validator),

reference/configuration/swiftmailer.rst

@@ -232,7 +232,8 @@ the information will be available in the profiler.
 
     The following options can be set via environment variables using the
     ``%env()%`` syntax: ``url``, ``transport``, ``username``, ``password``,
-    ``host``, ``port``, ``timeout``, ``source_ip``, ``local_domain``.
+    ``host``, ``port``, ``timeout``, ``source_ip``, ``local_domain``,
+    ``encryption``, ``auth_mode``.
     For details, see the :doc:`/configuration/external_parameters` article.
 
 Full Default Configuration