Merge branch '3.4' into 4.2

javiereguiluz · javiereguiluz · commit 07894e3f9a5e · 2019-06-10T10:59:04.000+02:00
* 3.4:
  Update conventions.rst
  Require Dotenv component without --dev
diff --git a/components/dotenv.rst b/components/dotenv.rst
@@ -13,7 +13,7 @@ Installation
 
 .. code-block:: terminal
 
-    $ composer require --dev symfony/dotenv
+    $ composer require symfony/dotenv
 
 .. include:: /components/require_autoload.rst.inc
 
diff --git a/contributing/code/conventions.rst b/contributing/code/conventions.rst
@@ -124,7 +124,7 @@ between the namespace and the use declarations, like in this example from
     /**
      * @author Adrien Brault <adrien.brault@gmail.com>
      *
-     * @deprecated ArrayParserCache class is deprecated since version 3.2 and will be removed in 4.0. Use the Symfony\Component\Cache\Adapter\ArrayAdapter class instead.
+     * @deprecated since Symfony 3.2, to be removed in 4.0. Use the Symfony\Component\Cache\Adapter\ArrayAdapter class instead.
      */
     class ArrayParserCache implements ParserCacheInterface
 

Original file line number	Diff line number	Diff line change
`@@ -124,7 +124,7 @@ between the namespace and the use declarations, like in this example from`
`124`	`124`	`/**`
`125`	`125`	`* @author Adrien Brault <[email protected]>`
`126`	`126`	`*`
`127`		`- * @deprecated ArrayParserCache class is deprecated since version 3.2 and will be removed in 4.0. Use the Symfony\Component\Cache\Adapter\ArrayAdapter class instead.`
	`127`	`+ * @deprecated since Symfony 3.2, to be removed in 4.0. Use the Symfony\Component\Cache\Adapter\ArrayAdapter class instead.`
`128`	`128`	`*/`
`129`	`129`	`class ArrayParserCache implements ParserCacheInterface`
`130`	`130`