Merge branch '4.4' into 5.1

* 4.4:
  Minor reword
  Fix bad example of lock
  Update dom_crawler.rst
  Update dom_crawler.rst
  Update service_subscribers_locators.rst
  Update http_client.rst
  Update framework.rst

Author: javiereguiluz

components/dom_crawler.rst

@@ -88,8 +88,8 @@ Using XPath expressions, you can select specific nodes within the document::
 
     ``DOMXPath::query`` is used internally to actually perform an XPath query.
 
-If you prefer CSS selectors over XPath, install the CssSelector component.
-It allows you to use jQuery-like selectors to traverse::
+If you prefer CSS selectors over XPath, install :doc:`/components/css_selector`.
+It allows you to use jQuery-like selectors::
 
     $crawler = $crawler->filter('body > p');
 
@@ -105,12 +105,13 @@ An anonymous function can be used to filter with more complex criteria::
             return ($i % 2) == 0;
         });
 
-To remove a node the anonymous function must return false.
+To remove a node, the anonymous function must return ``false``.
 
 .. note::
 
     All filter methods return a new :class:`Symfony\\Component\\DomCrawler\\Crawler`
-    instance with filtered content.
+    instance with the filtered content. To check if the filter actually
+    found something, use ``$crawler->count() > 0`` on this new crawler.
 
 Both the :method:`Symfony\\Component\\DomCrawler\\Crawler::filterXPath` and
 :method:`Symfony\\Component\\DomCrawler\\Crawler::filter` methods work with

components/lock.rst

@@ -113,7 +113,9 @@ method, the resource will stay locked until the timeout::
     // create an expiring lock that lasts 30 seconds
     $lock = $factory->createLock('charts-generation', 30);
 
-    $lock->acquire();
+    if (!$lock->acquire()) {
+        return;
+    }
     try {
         // perform a job during less than 30 seconds
     } finally {
@@ -132,7 +134,9 @@ to reset the TTL to its original value::
     // ...
     $lock = $factory->createLock('charts-generation', 30);
 
-    $lock->acquire();
+    if (!$lock->acquire()) {
+        return;
+    }
     try {
         while (!$finished) {
             // perform a small part of the job.
@@ -509,7 +513,9 @@ Using the above methods, a more robust code would be::
     // ...
     $lock = $factory->createLock('invoice-publication', 30);
 
-    $lock->acquire();
+    if (!$lock->acquire()) {
+        return;
+    }
     while (!$finished) {
         if ($lock->getRemainingLifetime() <= 5) {
             if ($lock->isExpired()) {

http_client.rst

@@ -623,6 +623,17 @@ according to the ``multipart/form-data`` content-type. The
         'body' => $formData->bodyToIterable(),
     ]);
 
+By default, HttpClient streams the body contents when uploading them. This might
+not work with all servers, resulting in HTTP status code 411 ("Length Required")
+because there is no ``Content-Length`` header. The solution is to turn the body
+into a string with the following method (which will increase memory consumption
+when the streams are large)::
+
+    $client->request('POST', 'https://...', [
+        // ...
+        'body' => $formData->bodyToString(),
+    ]);
+
 Cookies
 ~~~~~~~
 

reference/configuration/framework.rst

@@ -868,6 +868,14 @@ local_pk
 The path of a file that contains the `PEM formatted`_ private key of the
 certificate defined in the ``local_cert`` option.
 
+max_duration
+............
+
+**type**: ``float`` **default**: 0
+
+The maximum execution time, in seconds, that the request and the response are
+allowed to take. A value lower than or equal to 0 means it is unlimited.
+
 max_host_connections
 ....................
 
@@ -964,14 +972,6 @@ Time, in seconds, to wait for a response. If the response stales for longer, a
 Its default value is the same as the value of PHP's `default_socket_timeout`_
 config option.
 
-max_duration
-............
-
-**type**: ``float`` **default**: 0
-
-The maximum execution time, in seconds, that the request and the response are
-allowed to take. A value lower than or equal to 0 means it is unlimited.
-
 verify_host
 ...........
 

service_container/service_subscribers_locators.rst

@@ -383,7 +383,8 @@ will share identical locators among all the services referencing them::
 
     use Symfony\Component\DependencyInjection\Compiler\ServiceLocatorTagPass;
     use Symfony\Component\DependencyInjection\ContainerBuilder;
-
+    use Symfony\Component\DependencyInjection\Reference;
+    
     public function process(ContainerBuilder $container)
     {
         // ...