Merge branch '4.0' into 4.1

* 4.0:
  Updated associations.rst
  Formatting: Apply PSR-2 formatting to code example
  Update conventions.rst
  Wrap long lines
  State Maker dependency for generating controllers
  Small grammar update in HttpFoundation

Author: javiereguiluz

components/http_foundation.rst

@@ -533,7 +533,7 @@ represented by a PHP callable instead of a string::
 
     Additionally, PHP isn't the only layer that can buffer output. Your web
     server might also buffer based on its configuration. Some servers, such as
-    Nginx, let you disable buffering at config level or adding a special HTTP
+    Nginx, let you disable buffering at the config level or by adding a special HTTP
     header in the response::
 
         // disables FastCGI buffering in Nginx only for this response

contributing/code/conventions.rst

@@ -26,7 +26,7 @@ When an object has a "main" many relation with related "things"
 * ``count()``
 * ``keys()``
 
-The usage of these methods are only allowed when it is clear that there
+The usage of these methods is only allowed when it is clear that there
 is a main relation:
 
 * a ``CookieJar`` has many ``Cookie`` objects;

controller.rst

@@ -293,7 +293,8 @@ For more information about services, see the :doc:`/service_container` article.
 Generating Controllers
 ----------------------
 
-To save time, you can also tell Symfony to generate a new controller class:
+To save time, you can install `Symfony Maker`_ and tell Symfony to generate a
+new controller class:
 
 .. code-block:: terminal
 
@@ -676,4 +677,5 @@ Learn more about Controllers
     controller/*
 
 .. _`helper methods`: https://github.com/symfony/symfony/blob/master/src/Symfony/Bundle/FrameworkBundle/Controller/ControllerTrait.php
+.. _`Symfony Maker`: https://symfony.com/doc/current/bundles/SymfonyMakerBundle/index.html
 .. _`unvalidated redirects security vulnerability`: https://www.owasp.org/index.php/Open_redirect

doctrine/associations.rst

@@ -155,7 +155,7 @@ the ``Product`` entity (and getter & setter methods):
                 return $this->category;
             }
 
-            public function setCategory(?Category $category): self
+            public function setCategory(Category $category): self
             {
                 $this->category = $category;
 

doctrine/registration_form.rst

@@ -99,7 +99,8 @@ With some validation added, your class may look something like this::
          */
         private $roles;
 
-        public function __construct() {
+        public function __construct()
+        {
             $this->roles = array('ROLE_USER');
         }