Merge branch '3.2'

* 3.2:
  Expanded the explanation and updated the example
  Update doctrine.rst
  Update console.rst
  [#7452] remove trailing whitespaces
  Added filename references to examples
  Fix Typo $response->setEtag(..)
  Fixed typo
  Replace array with null
  Added a note about the usual cURL certificate problem
  Fixed code syntax issues
  Fix typo
  Replaced tabs with white spaces
  Replace "chapter" by "article" where appropriate
  Minor tweak
  Use statement for InputOption added to example
  Use HTTPS to link to symfony.com when possible
  fixed Backward Compatibility typo
  Update cache_pools.rst
  [DependencyInjection][Fix] Missing RequestStack

Author: xabbuh

_build/_theme/_templates/layout.html

@@ -1,13 +1,13 @@
 {% extends '!layout.html' %}
 
-{% set css_files = ['http://symfony.com/css/compiled/v5/all.css?v=4'] %}
+{% set css_files = ['https://symfony.com/css/compiled/v5/all.css?v=4'] %}
 {# make sure the Sphinx stylesheet isn't loaded #}
 {% set style = '' %}
 {% set isIndex = pagename is index %}
 
 {% block extrahead %}
 {# add JS to support tabs #}
-<script src="http://symfony.com/js/v5/all.js?v=4"></script>
+<script src="https://symfony.com/js/v5/all.js?v=4"></script>
 
 {# pygment's styles are still loaded, undo some unwanted styles #}
 <style>
@@ -48,7 +48,7 @@ <h4>Pull request build</h4>
                     <p>Each pull request of the Symfony Documentation is automatically deployed and hosted on <a href="https://platform.sh">Platform.sh</a>.<br>
                     View this page on <a href="https://symfony.com/doc/current/{{ pagename }}">symfony.com</a>.</p>
                 </div>
-                
+
                 {%- include "globaltoc.html" %}
 
                 {% if not isIndex %}
@@ -81,7 +81,7 @@ <h1 class="content_title">{{ title }}</h1>
                 <a href="{{ next.link|e }}">{{ next.title|striptags|e }} »</a>
             </div>
             {% endif %}
-            
+
             <div id="license">
                 <p>This work is licensed under a Creative Commons Attribution-Share Alike 3.0 Unported <a rel="license" href="http://creativecommons.org/licenses/by-sa/3.0/">License</a>.</p>
             </div>

best_practices/security.rst

@@ -235,16 +235,15 @@ more advanced use-case, you can always do the same security check in PHP:
 
         if (!$post->isAuthor($this->getUser())) {
             $this->denyAccessUnlessGranted('edit', $post);
-
-	    // or without the shortcut:
-	    //
-	    // use Symfony\Component\Security\Core\Exception\AccessDeniedException;
-	    // ...
-	    //
-	    // if (!$this->get('security.authorization_checker')->isGranted('edit', $post)) {
-	    //    throw $this->createAccessDeniedException();
-	    // }
         }
+        // equivalent code without using the "denyAccessUnlessGranted()" shortcut:
+        //
+        // use Symfony\Component\Security\Core\Exception\AccessDeniedException;
+        // ...
+        //
+        // if (!$this->get('security.authorization_checker')->isGranted('edit', $post)) {
+        //    throw $this->createAccessDeniedException();
+        // }
 
         // ...
     }
@@ -398,6 +397,6 @@ If your company uses a user login method not supported by Symfony, you can
 develop :doc:`your own user provider </security/custom_provider>` and
 :doc:`your own authentication provider </security/custom_authentication_provider>`.
 
-.. _`ParamConverter`: http://symfony.com/doc/current/bundles/SensioFrameworkExtraBundle/annotations/converters.html
-.. _`@Security annotation`: http://symfony.com/doc/current/bundles/SensioFrameworkExtraBundle/annotations/security.html
+.. _`ParamConverter`: https://symfony.com/doc/current/bundles/SensioFrameworkExtraBundle/annotations/converters.html
+.. _`@Security annotation`: https://symfony.com/doc/current/bundles/SensioFrameworkExtraBundle/annotations/security.html
 .. _`FOSUserBundle`: https://github.com/FriendsOfSymfony/FOSUserBundle

components/browser_kit.rst

@@ -188,7 +188,7 @@ into the client constructor::
     $cookieJar = new Cookie('flavor', 'chocolate', strtotime('+1 day'));
 
     // create a client and set the cookies
-    $client = new Client(array(), array(), $cookieJar);
+    $client = new Client(array(), null, $cookieJar);
     // ...
 
 History

components/cache/cache_pools.rst

@@ -344,7 +344,7 @@ item in the cache immediately (it returns ``true`` if the item was saved or
 ``false`` if some error occurred)::
 
     // ...
-    $userFriends = $cache->get('user_'.$userId.'_friends');
+    $userFriends = $cache->getItem('user_'.$userId.'_friends');
     $userFriends->set($user->getFriends());
     $isSaved = $cache->save($userFriends);
 

components/http_foundation.rst

@@ -234,8 +234,8 @@ the
 method tells you if the request contains a session which was started in one of
 the previous requests.
 
-Accessing `Accept-*` Headers Data
-~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+Accessing ``Accept-*`` Headers Data
+~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
 
 You can easily access basic data extracted from ``Accept-*`` headers
 by using the following methods:

components/options_resolver.rst

@@ -90,7 +90,7 @@ the ``Mailer`` class makes a mistake?
 .. code-block:: php
 
     $mailer = new Mailer(array(
-        'usernme' => 'johndoe',  // usernAme misspelled 
+        'usernme' => 'johndoe',  // usernAme misspelled
     ));
 
 No error will be shown. In the best case, the bug will appear during testing,
@@ -376,7 +376,7 @@ is thrown::
 For options with more complicated validation schemes, pass a closure which
 returns ``true`` for acceptable values and ``false`` for invalid values::
 
-    
+
     // ...
     $resolver->setAllowedValues('transport', function ($value) {
         // return true or false

components/yaml/yaml_format.rst

@@ -8,7 +8,7 @@ According to the official `YAML`_ website, YAML is "a human friendly data
 serialization standard for all programming languages".
 
 Even if the YAML format can describe complex nested data structure, this
-chapter only describes the minimum set of features needed to use YAML as a
+article only describes the minimum set of features needed to use YAML as a
 configuration file format.
 
 YAML is a simple language that describes data. As PHP, it has a syntax for

configuration.rst

@@ -95,7 +95,7 @@ specific bundle (i.e. ``FrameworkBundle`` and ``TwigBundle``).
 
 .. sidebar:: Configuration Formats
 
-    Throughout the chapters, all configuration examples will be shown in
+    Throughout the documentation, all configuration examples will be shown in
     three formats (YAML, XML and PHP). YAML is used by default, but you can
     choose whatever you like best. There is no performance difference:
 

configuration/external_parameters.rst

@@ -4,11 +4,11 @@
 How to Set external Parameters in the Service Container
 =======================================================
 
-In the chapter :doc:`/configuration`, you learned how to manage your application
-configuration. At times, it may benefit your application
-to store certain credentials outside of your project code. Database configuration
-is one such example. The flexibility of the Symfony service container allows
-you to easily do this.
+In the article :doc:`/configuration`, you learned how to manage your application
+configuration. At times, it may benefit your application to store certain
+credentials outside of your project code. Database configuration is one such
+example. The flexibility of the Symfony service container allows you to easily
+do this.
 
 Environment Variables
 ---------------------
@@ -22,7 +22,7 @@ will be resolved at runtime (once per request), so that dumped containers can be
 reconfigured dynamically even after being compiled.
 
 For example, if you want to use the value of the ``DATABASE_HOST`` environment
-variable in you service container configuration, you can reference it using
+variable in your service container configuration, you can reference it using
 ``%env(DATABASE_HOST)%`` in your configuration files:
 
 .. configuration-block::

configuration/front_controllers_and_kernel.rst

@@ -144,7 +144,7 @@ This method is responsible for loading the application's
 configuration from the right *environment*.
 
 Environments have been covered extensively
-:doc:`in the previous chapter </configuration/environments>`,
+:doc:`in the previous article </configuration/environments>`,
 and you probably remember that the Symfony Standard Edition comes with three
 of them - ``dev``, ``prod`` and ``test``.