Merge branch '5.2' into 5.x

wouterj · wouterj · commit ea90710c5c57 · 2021-03-02T13:45:16.000+01:00
* 5.2: [#15009] Fix inconsistent diff examples
diff --git a/frontend/encore/legacy-applications.rst b/frontend/encore/legacy-applications.rst
@@ -32,6 +32,7 @@ jQuery plugins often expect that jQuery is already available via the ``$`` or
 
 .. code-block:: diff
 
+    // webpack.config.js
     Encore
         // ...
     +     .autoProvidejQuery()
@@ -74,6 +75,8 @@ page, add:
 
 .. code-block:: diff
 
+    // webpack.config.js
+
     // require jQuery normally
     const $ = require('jquery');
 
diff --git a/frontend/encore/split-chunks.rst b/frontend/encore/split-chunks.rst
@@ -10,6 +10,7 @@ To enable this, call ``splitEntryChunks()``:
 
 .. code-block:: diff
 
+    // webpack.config.js
     Encore
         // ...
 
@@ -53,6 +54,7 @@ this plugin with the ``configureSplitChunks()`` function:
 
 .. code-block:: diff
 
+    // webpack.config.js
     Encore
         // ...
 
diff --git a/frontend/encore/typescript.rst b/frontend/encore/typescript.rst
@@ -6,8 +6,8 @@ Want to use `TypeScript`_? No problem! First, enable it:
 .. code-block:: diff
 
     // webpack.config.js
-    // ...
 
+    // ...
     Encore
         // ...
     +     .addEntry('main', './assets/main.ts')
@@ -30,6 +30,7 @@ method.
 
 .. code-block:: diff
 
+    // webpack.config.js
     Encore
         // ...
         .addEntry('main', './assets/main.ts')
diff --git a/frontend/encore/versioning.rst b/frontend/encore/versioning.rst
@@ -13,8 +13,8 @@ ignoring any existing cache:
 .. code-block:: diff
 
     // webpack.config.js
-    // ...
 
+    // ...
     Encore
         .setOutputPath('public/build/')
         // ...
diff --git a/quick_tour/flex_recipes.rst b/quick_tour/flex_recipes.rst
@@ -83,9 +83,9 @@ Thanks to Flex, after one command, you can start using Twig immediately:
     - use Symfony\Component\HttpFoundation\Response;
     + use Symfony\Bundle\FrameworkBundle\Controller\AbstractController;
 
-    -class DefaultController
-    +class DefaultController extends AbstractController
-     {
+    - class DefaultController
+    + class DefaultController extends AbstractController
+    {
          /**
           * @Route("/hello/{name}")
           */
diff --git a/setup/flex.rst b/setup/flex.rst
@@ -61,9 +61,9 @@ manual steps:
        {
            "require": {
                "symfony/flex": "^1.0",
-       +     },
-       +     "conflict": {
-       +         "symfony/symfony": "*"
+       +   },
+       +   "conflict": {
+       +       "symfony/symfony": "*"
            }
        }
 

Original file line number	Diff line number	Diff line change
`@@ -61,9 +61,9 @@ manual steps:`
`61`	`61`	`{`
`62`	`62`	`"require": {`
`63`	`63`	`"symfony/flex": "^1.0",`
`64`		`- + },`
`65`		`- + "conflict": {`
`66`		`- + "symfony/symfony": "*"`
	`64`	`+ + },`
	`65`	`+ + "conflict": {`
	`66`	`+ + "symfony/symfony": "*"`
`67`	`67`	`}`
`68`	`68`	`}`
`69`	`69`