Merge branch '5.2' into 5.x

* 5.2:
  [symfony#15009] Fix indentation of all diff code blocks

Author: wouterj

configuration/dot-env-changes.rst

@@ -56,16 +56,16 @@ changes can be made to any Symfony 3.4 or higher app:
 
    .. code-block:: diff
 
-       # .gitignore
-       # ...
+         # .gitignore
+         # ...
 
-       ###> symfony/framework-bundle ###
+         ###> symfony/framework-bundle ###
        - /.env
        + /.env.local
        + /.env.local.php
        + /.env.*.local
 
-       # ...
+         # ...
 
 #. Rename ``.env`` to ``.env.local`` and ``.env.dist`` to ``.env``:
 

controller.rst

@@ -98,16 +98,16 @@ Add the ``use`` statement atop your controller class and then modify
 
 .. code-block:: diff
 
-    // src/Controller/LuckyController.php
-    namespace App\Controller;
+      // src/Controller/LuckyController.php
+      namespace App\Controller;
 
     + use Symfony\Bundle\FrameworkBundle\Controller\AbstractController;
 
     - class LuckyController
     + class LuckyController extends AbstractController
-    {
-        // ...
-    }
+      {
+          // ...
+      }
 
 That's it! You now have access to methods like :ref:`$this->render() <controller-rendering-templates>`
 and many others that you'll learn about next.

doctrine.rst

@@ -280,20 +280,20 @@ methods:
 
 .. code-block:: diff
 
-    // src/Entity/Product.php
-    // ...
+      // src/Entity/Product.php
+      // ...
 
-    class Product
-    {
-        // ...
+      class Product
+      {
+          // ...
 
     +     /**
     +      * @ORM\Column(type="text")
     +      */
     +     private $description;
 
-        // getDescription() & setDescription() were also added
-    }
+          // getDescription() & setDescription() were also added
+      }
 
 The new property is mapped, but it doesn't exist yet in the ``product`` table. No
 problem! Generate a new migration:

frontend/encore/cdn.rst

@@ -6,15 +6,15 @@ built files are uploaded to the CDN, configure it in Encore:
 
 .. code-block:: diff
 
-    // webpack.config.js
-    // ...
-
-    Encore
-        .setOutputPath('public/build/')
-        // in dev mode, don't use the CDN
-        .setPublicPath('/build');
-        // ...
-    ;
+      // webpack.config.js
+      // ...
+
+      Encore
+          .setOutputPath('public/build/')
+          // in dev mode, don't use the CDN
+          .setPublicPath('/build');
+          // ...
+      ;
 
     + if (Encore.isProduction()) {
     +     Encore.setPublicPath('https://my-cool-app.com.global.prod.fastly.net');

frontend/encore/copy-files.rst

@@ -32,11 +32,11 @@ files into your final output directory.
 
 .. code-block:: diff
 
-    // webpack.config.js
+      // webpack.config.js
 
-    Encore
-        // ...
-        .setOutputPath('public/build/')
+      Encore
+          // ...
+          .setOutputPath('public/build/')
 
     +     .copyFiles({
     +         from: './assets/images',

frontend/encore/custom-loaders-plugins.rst

@@ -50,14 +50,14 @@ to use the `IgnorePlugin`_ (see `moment/moment#2373`_):
 
 .. code-block:: diff
 
-    // webpack.config.js
+      // webpack.config.js
     + var webpack = require('webpack');
 
-    Encore
-        // ...
+      Encore
+          // ...
 
     +     .addPlugin(new webpack.IgnorePlugin(/^\.\/locale$/, /moment$/))
-    ;
+      ;
 
 .. _`handlebars-loader`: https://github.com/pcardune/handlebars-loader
 .. _`plugins`: https://webpack.js.org/plugins/

frontend/encore/dev-server.rst

@@ -66,12 +66,12 @@ server SSL certificate:
 
 .. code-block:: diff
 
-    // webpack.config.js
-    // ...
+      // webpack.config.js
+      // ...
     + const path = require('path');
 
-    Encore
-        // ...
+      Encore
+          // ...
 
     +     .configureDevServerOptions(options => {
     +         options.https = {

frontend/encore/faq.rst

@@ -63,11 +63,11 @@ like ``/myAppSubdir``), you will need to configure that when calling ``Encore.se
 
 .. code-block:: diff
 
-    // webpack.config.js
-    Encore
-        // ...
+      // webpack.config.js
+      Encore
+          // ...
 
-        .setOutputPath('public/build/')
+          .setOutputPath('public/build/')
 
     -     .setPublicPath('/build')
     +     // this is your *true* public path
@@ -76,7 +76,7 @@ like ``/myAppSubdir``), you will need to configure that when calling ``Encore.se
     +     // this is now needed so that your manifest.json keys are still `build/foo.js`
     +     // (which is a file that's used by Symfony's `asset()` function)
     +     .setManifestKeyPrefix('build')
-    ;
+      ;
 
 If you're using the ``encore_entry_script_tags()`` and ``encore_entry_link_tags()``
 Twig shortcuts (or are :ref:`processing your assets through entrypoints.json <load-manifest-files>`

frontend/encore/legacy-applications.rst

@@ -32,11 +32,11 @@ jQuery plugins often expect that jQuery is already available via the ``$`` or
 
 .. code-block:: diff
 
-    // webpack.config.js
-    Encore
-        // ...
+      // webpack.config.js
+      Encore
+          // ...
     +     .autoProvidejQuery()
-    ;
+      ;
 
 After restarting Encore, Webpack will look for all uninitialized ``$`` and ``jQuery``
 variables and automatically require ``jquery`` and set those variables for you.
@@ -75,10 +75,10 @@ page, add:
 
 .. code-block:: diff
 
-    // webpack.config.js
+      // webpack.config.js
 
-    // require jQuery normally
-    const $ = require('jquery');
+      // require jQuery normally
+      const $ = require('jquery');
 
     + // create global $ and jQuery variables
     + global.$ = global.jQuery = $;

frontend/encore/postcss.rst

@@ -28,12 +28,12 @@ Then, enable the loader in Encore!
 
 .. code-block:: diff
 
-    // webpack.config.js
+      // webpack.config.js
 
-    Encore
-        // ...
+      Encore
+          // ...
     +     .enablePostCssLoader()
-    ;
+      ;
 
 Because you just modified ``webpack.config.js``, stop and restart Encore.
 
@@ -42,18 +42,18 @@ You can also pass options to the `postcss-loader`_ by passing a callback:
 
 .. code-block:: diff
 
-    // webpack.config.js
+      // webpack.config.js
     + const path = require('path');
 
-    Encore
-        // ...
+      Encore
+          // ...
     +     .enablePostCssLoader((options) => {
     +         options.postcssOptions = {
     +             // the directory where the postcss.config.js file is stored
     +             config: path.resolve(__dirname, 'sub-dir', 'custom.config.js'),
     +         };
     +     })
-    ;
+      ;
 
 .. _browserslist_package_config:
 
@@ -66,25 +66,25 @@ support. The best-practice is to configure this directly in your ``package.json`
 
 .. code-block:: diff
 
-    {
+      {
     +  "browserslist": [
     +    "defaults"
     +  ]
-    }
+      }
 
 The ``defaults`` option is recommended for most users and would be equivalent
 to the following browserslist:
 
 .. code-block:: diff
 
-    {
+      {
     +  "browserslist": [
     +    "> 0.5%",
     +    "last 2 versions",
     +    "Firefox ESR",
     +    "not dead"
     +  ]
-    }
+      }
 
 See `browserslist`_ for more details on the syntax.