Merge branch '3.4' into 4.1

javiereguiluz · javiereguiluz · commit b14e12611d45 · 2019-01-30T08:48:33.000+01:00
* 3.4:
  Fix typo
  Use the --dev option consistently for Composer and Yarn
diff --git a/components/var_dumper.rst b/components/var_dumper.rst
@@ -14,7 +14,7 @@ Installation
 
 .. code-block:: terminal
 
-    $ composer require symfony/var-dumper --dev
+    $ composer require --dev symfony/var-dumper
 
 Alternatively, you can clone the `<https://github.com/symfony/var-dumper>`_ repository.
 
diff --git a/frontend/encore/postcss.rst b/frontend/encore/postcss.rst
@@ -8,7 +8,7 @@ First, download ``postcss-loader`` and any plugins you want, like ``autoprefixer
 
 .. code-block:: terminal
 
-    $ yarn add --dev postcss-loader autoprefixer
+    $ yarn add postcss-loader autoprefixer --dev
 
 Next, create a ``postcss.config.js`` file at the root of your project:
 
diff --git a/frontend/encore/url-loader.rst b/frontend/encore/url-loader.rst
@@ -10,7 +10,7 @@ it's disabled by default. First, add the URL loader to your project:
 
 .. code-block:: terminal
 
-    $ yarn add --dev url-loader
+    $ yarn add url-loader --dev
 
 Then enable it in your ``webpack.config.js``:
 
diff --git a/service_container/service_decoration.rst b/service_container/service_decoration.rst
@@ -271,17 +271,17 @@ the ``decoration_priority`` option. Its value is an integer that defaults to
         // config/services.php
         use Symfony\Component\DependencyInjection\Reference;
 
-        $container->register(Foo:class)
+        $container->register(Foo::class)
 
-        $container->register(Bar:class)
-            ->addArgument(new Reference(Bar:class.'.inner'))
+        $container->register(Bar::class)
+            ->addArgument(new Reference(Bar::class.'.inner'))
             ->setPublic(false)
-            ->setDecoratedService(Foo:class, null, 5);
+            ->setDecoratedService(Foo::class, null, 5);
 
-        $container->register(Baz:class)
-            ->addArgument(new Reference(Baz:class.'.inner'))
+        $container->register(Baz::class)
+            ->addArgument(new Reference(Baz::class.'.inner'))
             ->setPublic(false)
-            ->setDecoratedService(Foo:class, null, 1);
+            ->setDecoratedService(Foo::class, null, 1);
 
 The generated code will be the following::
 
