Merge remote-tracking branch 'upstream/3.3' into 3.3

Author: javiereguiluz

_build/redirection_map

@@ -338,3 +338,4 @@
 /security/target_path /security
 /service_container/third_party /service_container
 /templating/templating_service /templates
+/components/http_foundation/trusting_proxies /request/load_balancer_reverse_proxy

best_practices/security.rst

@@ -330,7 +330,7 @@ the same ``getAuthorEmail()`` logic you used above:
 
 If you're using the :ref:`default services.yml configuration <service-container-services-load-example>`,
 your application will :ref:`autoconfigure <services-autoconfigure>` your security
-voter and inject a ``AccessDecisionManagerInterface`` instance in it thanks to
+voter and inject an ``AccessDecisionManagerInterface`` instance into it thanks to
 :doc:`autowiring </service_container/autowiring>`.
 
 Now, you can use the voter with the ``@Security`` annotation:

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/http_foundation/trusting_proxies.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/ldap.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.
 

components/security/authentication.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/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);

controller/soap_web_service.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)
     {

doctrine.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.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/dev_environment.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!')