Merge branch '2.8' into 3.4

javiereguiluz · javiereguiluz · commit a927e2102dbb · 2018-06-22T17:54:43.000+02:00
* 2.8:
  Formatting: Apply PSR-2 formatting to code example
  Update conventions.rst
  Small grammar update in HttpFoundation
diff --git a/components/http_foundation.rst b/components/http_foundation.rst
@@ -477,7 +477,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
diff --git a/contributing/code/conventions.rst b/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;
diff --git a/doctrine/registration_form.rst b/doctrine/registration_form.rst
@@ -93,7 +93,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');
         }
 

Original file line number	Diff line number	Diff line change
`@@ -93,7 +93,8 @@ With some validation added, your class may look something like this::`
`93`	`93`	`*/`
`94`	`94`	`private $roles;`
`95`	`95`
`96`		`- public function __construct() {`
	`96`	`+ public function __construct()`
	`97`	`+ {`
`97`	`98`	`$this->roles = array('ROLE_USER');`
`98`	`99`	`}`
`99`	`100`