Feb 4, 2020 · Mar 12, 2020 · Dec 13, 2019 · Mar 12, 2020 · Mar 12, 2020 · Mar 12, 2020
diff --git a/.doctor-rst.yaml b/.doctor-rst.yaml
    valid_inline_highlighted_namespaces: ~
    indention: ~
    unused_links: ~
    yaml_instead_of_yml_suffix: ~
    extend_abstract_controller: ~
 #    no_app_bundle: ~

    #3.4
    #master
    versionadded_directive_major_version:
        major_version:3
        major_version:5

    versionadded_directive_min_version:
        min_version: '3.0'
        min_version: '5.0'

    deprecated_directive_major_version:
        major_version: 5

    deprecated_directive_min_version:
        min_version: '5.0'

 # do not report as violation
 whitelist:
        - '.. versionadded:: 1.11' # MakerBundle
        - '.. versionadded:: 1.3' # MakerBundle
        - '.. versionadded:: 1.8' # MakerBundle
        - '.. versionadded:: 1.6' # Flex in setup/upgrade_minor.rst
        - '0 => 123' # assertion for var_dumper - components/var_dumper.rst
        - '1 => "foo"' # assertion for var_dumper - components/var_dumper.rst
        - '123,' # assertion for var_dumper - components/var_dumper.rst
        - '"foo",' # assertion for var_dumper - components/var_dumper.rst
        - '$var .= "Because of this `\xE9` octet (\\xE9),\n";'
        - "`Deploying Symfony 4 Apps on Heroku`_."
        - ".. _`Deploying Symfony 4 Apps on Heroku`: https://devcenter.heroku.com/articles/deploying-symfony4"
        - "//                  224, 165, 141, 224, 164, 164, 224, 165, 135])"
        - '.. versionadded:: 0.2' # MercureBundle
        - 'provides a ``loginUser()`` method to simulate logging in in your functional'
diff --git a/_build/maintainer_guide.rst b/_build/maintainer_guide.rst
    $ cd symfony-docs/

    # make sure that your local branch is updated
    $ git checkout3.4
    $ git checkout4.4
    $ git fetch upstream
    $ git merge upstream/3.4
    $ git merge upstream/4.4

    # merge any PR passing its GitHub number as argument
    $ gh merge 11159

 .. code-block:: terminal

    # e.g. this PR was sent against 'master', but it's merged in '3.4'
    $ gh merge 11160 -s3.4
    # e.g. this PR was sent against 'master', but it's merged in '4.4'
    $ gh merge 11160 -s4.4

 Sometimes, when changing the branch, you may face rebase issues, but they are
 usually simple to fix:

 .. code-block:: terminal

    $ gh merge 11160 -s3.4
    $ gh merge 11160 -s4.4

      ...

      Unable to rebase the patch for <comment>pull/11183</comment>
      The command "'git' 'rebase' '--onto' '3.4' '4.4' 'pull/11160'" failed.
      The command "'git' 'rebase' '--onto' '4.4' '5.0' 'pull/11160'" failed.
      Exit Code: 128(Invalid exit argument)

      [...]

    # Lastly, re-run the exact same original command that resulted in a conflict
    # There's no need to change the branch or do anything else.
    $ gh merge 11160 -s3.4
    $ gh merge 11160 -s4.4

      The previous run had some conflicts. Do you want to resume the merge? (Y/n)


 If a PR has not been merged in ``master``, you must merge it up into all the
 maintained branches until ``master``. Imagine that you are merging a PR against
 ``3.4`` and the maintained branches are ``3.4``, ``4.4`` and ``master``:
 ``4.4`` and the maintained branches are ``4.4``, ``5.0`` and ``master``:

 .. code-block:: terminal

    $ git fetch upstream

    $ git checkout3.4
    $ git merge upstream/3.4
    $ git checkout4.4
    $ git merge upstream/4.4

    $ gh merge 11159
    $ git push origin
    $ git push upstream

    $ git checkout4.4
    $ git merge upstream/4.4
    $ git merge --log3.4
    $ git checkout5.0
    $ git merge upstream/5.0
    $ git merge --log4.4
    # here you can face several errors explained later
    $ git push origin
    $ git push upstream

    $ git checkout master
    $ git merge upstream/master
    $ git merge --log4.4
    $ git merge --log5.0
    $ git push origin
    $ git push upstream

 .. code-block:: terminal

    $ git fetch upstream
    $ git checkout3.4
    $ git merge upstream/3.4
    $ git checkout4.4
    $ git merge upstream/4.4

 It's possible that you merge a wrong upstream branch unawarely. It's usually
 easy to spot because you'll see lots of conflicts:

 .. code-block:: terminal

    # DON'T DO THIS! It's a wrong branch merge
    $ git checkout3.4
    $ git merge upstream/4.4
    $ git checkout4.4
    $ git merge upstream/5.0

 As long as you don't push this wrong merge, there's no problem. Delete your
 local branch and check it out again:

 .. code-block:: terminal

    $ git checkout master
    $ git branch -D3.4
    $ git checkout3.4 upstream/3.4
    $ git branch -D4.4
    $ git checkout4.4 upstream/4.4

 If you did push the wrong branch merge, ask for help in the documentation
 mergers chat and we'll help solve the problem.

 .. code-block:: terminal

    $ git checkout4.4
    $ git merge upstream/4.4
    $ git merge --log3.4
    $ git checkout5.0
    $ git merge upstream/5.0
    $ git merge --log4.4

      Auto-merging security/entity_provider.rst
      Auto-merging logging/monolog_console.rst

 .. code-block:: terminal

    $ git checkout4.4
    $ git merge upstream/4.4
    $ git merge --log3.4
    $ git checkout5.0
    $ git merge upstream/5.0
    $ git merge --log4.4

      Auto-merging translation/debug.rst
      CONFLICT (modify/delete): service_container/scopes.rst deleted in HEAD and
      modified in3.4. Version3.4 of service_container/scopes.rst left in tree.
      modified in4.4. Version4.4 of service_container/scopes.rst left in tree.
      Auto-merging service_container.rst

 If the contents of the deleted file were moved to a different file in newer
Original file line number	Diff line number	Diff line change
Expand Up		@@ -36,13 +36,22 @@ rules:
		valid_inline_highlighted_namespaces: ~
		indention: ~
		unused_links: ~
		yaml_instead_of_yml_suffix: ~
		extend_abstract_controller: ~
		# no_app_bundle: ~

		#3.4
		#master
		versionadded_directive_major_version:
		major_version:3
		major_version:5

		versionadded_directive_min_version:
		min_version: '3.0'
		min_version: '5.0'

		deprecated_directive_major_version:
		major_version: 5

		deprecated_directive_min_version:
		min_version: '5.0'

		# do not report as violation
		whitelist:
Expand All		@@ -67,8 +76,14 @@ whitelist:
		- '.. versionadded:: 1.11' # MakerBundle
		- '.. versionadded:: 1.3' # MakerBundle
		- '.. versionadded:: 1.8' # MakerBundle
		- '.. versionadded:: 1.6' # Flex in setup/upgrade_minor.rst
		- '0 => 123' # assertion for var_dumper - components/var_dumper.rst
		- '1 => "foo"' # assertion for var_dumper - components/var_dumper.rst
		- '123,' # assertion for var_dumper - components/var_dumper.rst
		- '"foo",' # assertion for var_dumper - components/var_dumper.rst
		- '$var .= "Because of this `\xE9` octet (\\xE9),\n";'
		- "`Deploying Symfony 4 Apps on Heroku`_."
		- ".. _`Deploying Symfony 4 Apps on Heroku`: https://devcenter.heroku.com/articles/deploying-symfony4"
		- "// 224, 165, 141, 224, 164, 164, 224, 165, 135])"
		- '.. versionadded:: 0.2' # MercureBundle
		- 'provides a ``loginUser()`` method to simulate logging in in your functional'
Original file line number	Diff line number	Diff line change
Expand Up		@@ -134,9 +134,9 @@ original contributor.
		$ cd symfony-docs/

		# make sure that your local branch is updated
		$ git checkout3.4
		$ git checkout4.4
		$ git fetch upstream
		$ git merge upstream/3.4
		$ git merge upstream/4.4

		# merge any PR passing its GitHub number as argument
		$ gh merge 11159
Expand All		@@ -153,20 +153,20 @@ the ``-s`` option:

		.. code-block:: terminal

		# e.g. this PR was sent against 'master', but it's merged in '3.4'
		$ gh merge 11160 -s3.4
		# e.g. this PR was sent against 'master', but it's merged in '4.4'
		$ gh merge 11160 -s4.4

		Sometimes, when changing the branch, you may face rebase issues, but they are
		usually simple to fix:

		.. code-block:: terminal

		$ gh merge 11160 -s3.4
		$ gh merge 11160 -s4.4

		...

		Unable to rebase the patch for <comment>pull/11183</comment>
		The command "'git' 'rebase' '--onto' '3.4' '4.4' 'pull/11160'" failed.
		The command "'git' 'rebase' '--onto' '4.4' '5.0' 'pull/11160'" failed.
		Exit Code: 128(Invalid exit argument)

		[...]
Expand All		@@ -183,7 +183,7 @@ usually simple to fix:

		# Lastly, re-run the exact same original command that resulted in a conflict
		# There's no need to change the branch or do anything else.
		$ gh merge 11160 -s3.4
		$ gh merge 11160 -s4.4

		The previous run had some conflicts. Do you want to resume the merge? (Y/n)

Expand All		@@ -195,29 +195,29 @@ Step 3: Merge it into the other branches

		If a PR has not been merged in ``master``, you must merge it up into all the
		maintained branches until ``master``. Imagine that you are merging a PR against
		``3.4`` and the maintained branches are ``3.4``, ``4.4`` and ``master``:
		``4.4`` and the maintained branches are ``4.4``, ``5.0`` and ``master``:

		.. code-block:: terminal

		$ git fetch upstream

		$ git checkout3.4
		$ git merge upstream/3.4
		$ git checkout4.4
		$ git merge upstream/4.4

		$ gh merge 11159
		$ git push origin
		$ git push upstream

		$ git checkout4.4
		$ git merge upstream/4.4
		$ git merge --log3.4
		$ git checkout5.0
		$ git merge upstream/5.0
		$ git merge --log4.4
		# here you can face several errors explained later
		$ git push origin
		$ git push upstream

		$ git checkout master
		$ git merge upstream/master
		$ git merge --log4.4
		$ git merge --log5.0
		$ git push origin
		$ git push upstream

Expand DownExpand Up		@@ -247,26 +247,26 @@ When updating your local branches before merging:
		.. code-block:: terminal

		$ git fetch upstream
		$ git checkout3.4
		$ git merge upstream/3.4
		$ git checkout4.4
		$ git merge upstream/4.4

		It's possible that you merge a wrong upstream branch unawarely. It's usually
		easy to spot because you'll see lots of conflicts:

		.. code-block:: terminal

		# DON'T DO THIS! It's a wrong branch merge
		$ git checkout3.4
		$ git merge upstream/4.4
		$ git checkout4.4
		$ git merge upstream/5.0

		As long as you don't push this wrong merge, there's no problem. Delete your
		local branch and check it out again:

		.. code-block:: terminal

		$ git checkout master
		$ git branch -D3.4
		$ git checkout3.4 upstream/3.4
		$ git branch -D4.4
		$ git checkout4.4 upstream/4.4

		If you did push the wrong branch merge, ask for help in the documentation
		mergers chat and we'll help solve the problem.
Expand All		@@ -278,9 +278,9 @@ When merging things to upper branches, most of the times you'll see conflicts:

		.. code-block:: terminal

		$ git checkout4.4
		$ git merge upstream/4.4
		$ git merge --log3.4
		$ git checkout5.0
		$ git merge upstream/5.0
		$ git merge --log4.4

		Auto-merging security/entity_provider.rst
		Auto-merging logging/monolog_console.rst
Expand DownExpand Up		@@ -314,13 +314,13 @@ were modified by the PR but no longer exist in newer branches:

		.. code-block:: terminal

		$ git checkout4.4
		$ git merge upstream/4.4
		$ git merge --log3.4
		$ git checkout5.0
		$ git merge upstream/5.0
		$ git merge --log4.4

		Auto-merging translation/debug.rst
		CONFLICT (modify/delete): service_container/scopes.rst deleted in HEAD and
		modified in3.4. Version3.4 of service_container/scopes.rst left in tree.
		modified in4.4. Version4.4 of service_container/scopes.rst left in tree.
		Auto-merging service_container.rst

		If the contents of the deleted file were moved to a different file in newer
Expand Down