Fix syntax of all diff code blocks

Co-authored-by: Jérémy Derussé <[email protected]>

Author: wouterj

configuration/dot-env-changes.rst

@@ -61,15 +61,15 @@ changes can be made to any Symfony 3.4 or higher app:
    .. code-block:: diff
 
        # .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

@@ -99,15 +99,15 @@ Add the ``use`` statement atop your controller class and then modify
 .. code-block:: diff
 
     // src/Controller/LuckyController.php
-    namespace App\Controller;
+      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

@@ -281,19 +281,19 @@ methods:
 .. code-block:: diff
 
     // 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

@@ -7,14 +7,14 @@ 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');
-        // ...
-    ;
+      // ...
+
+      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

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

frontend/encore/custom-loaders-plugins.rst

@@ -53,11 +53,11 @@ to use the `IgnorePlugin`_ (see `moment/moment#2373`_):
     // 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

@@ -64,30 +64,32 @@ If you want to use SSL with self-signed certificates, add the ``--https``,
 the ``package.json`` file:
 
 .. code-block:: diff
+   :dedent: 0
 
-    {
-        ...
-        "scripts": {
+      {
+          ...
+          "scripts": {
     -        "dev-server": "encore dev-server",
     +        "dev-server": "encore dev-server --https --pfx=$HOME/.symfony/certs/default.p12 --allowed-hosts=mydomain.wip",
-            ...
-        }
-    }
+              ...
+          }
+      }
 
 If you experience issues related to CORS (Cross Origin Resource Sharing), add
 the ``--disable-host-check`` and ``--port`` options to the ``dev-server``
 command in the ``package.json`` file:
 
 .. code-block:: diff
+   :dedent: 0
 
-    {
-        ...
-        "scripts": {
+      {
+          ...
+          "scripts": {
     -        "dev-server": "encore dev-server",
     +        "dev-server": "encore dev-server --port 8080 --disable-host-check",
-            ...
-        }
-    }
+              ...
+          }
+      }
 
 .. caution::
 

frontend/encore/faq.rst

@@ -64,10 +64,10 @@ like ``/myAppSubdir``), you will need to configure that when calling ``Encore.se
 .. code-block:: diff
 
     // webpack.config.js
-    Encore
-        // ...
+      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

@@ -33,10 +33,10 @@ jQuery plugins often expect that jQuery is already available via the ``$`` or
 .. code-block:: diff
 
     // webpack.config.js
-    Encore
-        // ...
+      Encore
+          // ...
     +     .autoProvidejQuery()
-    ;
+      ;
 
 After restarting Encore, Webpack will look for all uninitialized ``$`` and ``jQuery``
 variables and automatically require ``jquery`` and set those variables for you.
@@ -77,8 +77,8 @@ page, add:
 
     // 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

@@ -30,10 +30,10 @@ Then, enable the loader in Encore!
 
     // webpack.config.js
 
-    Encore
-        // ...
+      Encore
+          // ...
     +     .enablePostCssLoader()
-    ;
+      ;
 
 Because you just modified ``webpack.config.js``, stop and restart Encore.
 
@@ -44,15 +44,15 @@ You can also pass options to the `postcss-loader`_ by passing a callback:
 
     // webpack.config.js
 
-    Encore
-        // ...
+      Encore
+          // ...
     +     .enablePostCssLoader((options) => {
     +         options.config = {
     +             // the directory where the postcss.config.js file is stored
     +             path: 'path/to/config'
     +         };
     +     })
-    ;
+      ;
 
 .. _browserslist_package_config:
 
@@ -64,26 +64,28 @@ support. The best-practice is to configure this directly in your ``package.json`
 (so that all the tools can read this):
 
 .. code-block:: diff
+   :dedent: 0
 
-    {
+      {
     +  "browserslist": [
     +    "defaults"
     +  ]
-    }
+      }
 
 The ``defaults`` option is recommended for most users and would be equivalent
 to the following browserslist:
 
 .. code-block:: diff
+   :dedent: 0
 
-    {
+      {
     +  "browserslist": [
     +    "> 0.5%",
     +    "last 2 versions",
     +    "Firefox ESR",
     +    "not dead"
     +  ]
-    }
+      }
 
 See `browserslist`_ for more details on the syntax.
 

frontend/encore/reactjs.rst

@@ -18,12 +18,12 @@ Enable react in your ``webpack.config.js``:
 .. code-block:: diff
 
     // webpack.config.js
-    // ...
+      // ...
 
-    Encore
-        // ...
+      Encore
+          // ...
     +     .enableReactPreset()
-    ;
+      ;
 
 
 Then restart Encore. When you do, it will give you a command you can run to

frontend/encore/shared-entry.rst

@@ -15,14 +15,15 @@ Suppose you already have an entry called ``app`` that's included on every page.
 Update your code to use ``createSharedEntry()``:
 
 .. code-block:: diff
+   :dedent: 0
 
-    Encore
-        // ...
+      Encore
+          // ...
     -     .addEntry('app', './assets/js/app.js')
     +     .createSharedEntry('app', './assets/js/app.js')
-        .addEntry('homepage', './assets/js/homepage.js')
-        .addEntry('blog', './assets/js/blog.js')
-        .addEntry('store', './assets/js/store.js')
+          .addEntry('homepage', './assets/js/homepage.js')
+          .addEntry('blog', './assets/js/blog.js')
+          .addEntry('store', './assets/js/store.js')
 
 Before making this change, if both ``app.js`` and ``store.js`` require ``jquery``,
 then ``jquery`` would be packaged into *both* files, which is wasteful. By making

frontend/encore/simple-example.rst

@@ -168,7 +168,7 @@ Great! Use ``require()`` to import ``jquery`` and ``greet.js``:
 .. code-block:: diff
 
     // assets/js/app.js
-    // ...
+      // ...
 
     + // loads the jquery package from node_modules
     + var $ = require('jquery');
@@ -199,8 +199,8 @@ To export values using the alternate syntax, use ``export``:
     // assets/js/greet.js
     - module.exports = function(name) {
     + export default function(name) {
-        return `Yo yo ${name} - welcome to Encore!`;
-    };
+          return `Yo yo ${name} - welcome to Encore!`;
+      };
 
 To import values, use ``import``:
 
@@ -241,12 +241,12 @@ Next, use ``addEntry()`` to tell Webpack to read these two new files when it bui
 .. code-block:: diff
 
     // webpack.config.js
-    Encore
-        // ...
-        .addEntry('app', './assets/js/app.js')
+      Encore
+          // ...
+          .addEntry('app', './assets/js/app.js')
     +     .addEntry('checkout', './assets/js/checkout.js')
     +     .addEntry('account', './assets/js/account.js')
-        // ...
+          // ...
 
 And because you just changed the ``webpack.config.js`` file, make sure to stop
 and restart Encore:
@@ -263,9 +263,10 @@ Finally, include the ``script`` and ``link`` tags on the individual pages where
 you need them:
 
 .. code-block:: diff
+   :dedent: 0
 
-    {# templates/.../checkout.html.twig #}
-    {% extends 'base.html.twig' %}
+      {# templates/.../checkout.html.twig #}
+      {% extends 'base.html.twig' %}
 
     + {% block stylesheets %}
     +     {{ parent() }}
@@ -303,11 +304,11 @@ Then, tell Encore to enable the Sass pre-processor:
 .. code-block:: diff
 
     // webpack.config.js
-    Encore
-        // ...
+      Encore
+          // ...
 
     +    .enableSassLoader()
-    ;
+      ;
 
 Because you just changed your ``webpack.config.js`` file, you'll need to restart
 Encore. When you do, you'll see an error!