Merge 4.x into 5.x

.github/ISSUE_TEMPLATE/Bug.md

@@ -68,5 +68,5 @@ $ php -v
     If it's an error message or piece of code, use code block tags,
     and make sure you provide the whole stack trace(s),
     not just the first error message you can see.
-    More details here: https://github.com/sonata-project/SonataMediaBundle/blob/3.x/CONTRIBUTING.md#issues
+    More details here: https://github.com/sonata-project/SonataMediaBundle/blob/4.x/CONTRIBUTING.md#issues
 -->

.github/PULL_REQUEST_TEMPLATE.md

@@ -6,9 +6,9 @@
 <!--
     Show us you choose the right branch.
     Different branches are used for different things :
-    - 3.x is for everything backwards compatible, like patches, features and deprecation notices
-    - 4.x is for deprecation removals and other changes that cannot be done without a BC-break
-    More details here: https://github.com/sonata-project/SonataMediaBundle/blob/3.x/CONTRIBUTING.md#base-branch
+    - 4.x is for everything backwards compatible, like patches, features and deprecation notices
+    - 5.x is for deprecation removals and other changes that cannot be done without a BC-break
+    More details here: https://github.com/sonata-project/SonataMediaBundle/blob/4.x/CONTRIBUTING.md#base-branch
 -->
 I am targeting this branch, because {reason}.
 

.github/workflows/documentation.yaml

@@ -9,6 +9,7 @@ on:
         branches:
             - 3.x
             - 4.x
+            - 5.x
     pull_request:
 
 jobs:

.github/workflows/lint.yaml

@@ -9,6 +9,7 @@ on:
         branches:
             - 3.x
             - 4.x
+            - 5.x
     pull_request:
 
 jobs:

.github/workflows/qa.yaml

@@ -9,6 +9,7 @@ on:
         branches:
             - 3.x
             - 4.x
+            - 5.x
     pull_request:
 
 jobs:

.github/workflows/test.yaml

@@ -9,6 +9,7 @@ on:
         branches:
             - 3.x
             - 4.x
+            - 5.x
     pull_request:
 
 jobs:
@@ -94,7 +95,7 @@ jobs:
 
             - name: Remove dev dependencies not compatible with Symfony 6
               if: matrix.symfony-require == '6.0.*'
-              run: composer remove vimeo/psalm psalm/plugin-phpunit psalm/plugin-symfony weirdan/doctrine-psalm-plugin --dev --no-update --no-interaction
+              run: composer remove vimeo/psalm psalm/plugin-phpunit psalm/plugin-symfony weirdan/doctrine-psalm-plugin symfony/maker-bundle --dev --no-update --no-interaction
 
             - name: Install Composer dependencies (${{ matrix.dependencies }})
               uses: ramsey/composer-install@v1

.symfony.bundle.yaml

@@ -5,15 +5,17 @@
 branches:
     - 3.x
     - 4.x
+    - 5.x
 
 maintained_branches:
     - 3.x
     - 4.x
+    - 5.x
 
 doc_dir: 'docs/'
 
-current_branch: 3.x
+current_branch: 4.x
 
-dev_branch: 4.x
+dev_branch: 5.x
 
 # dev_branch_alias:

CONTRIBUTING.md

@@ -215,20 +215,20 @@ Here is a short table resuming on which you have to start:
 
 Kind of modification | Backward Compatible (BC) | Type of release | Branch to target        | Label |
 -------------------- | ------------------------ | --------------- | ----------------------- | ----- |
-Bug fixes            | Yes                      | Patch           | `3.x`   |       |
-Bug fixes            | No (Only if no choice)   | Major           | `4.x` |       |
-Feature              | Yes                      | Minor           | `3.x`   |       |
-Feature              | No (Only if no choice)   | Major           | `4.x` |       |
-Deprecation          | Yes (Have to)            | Minor           | `3.x`   |       |
-Deprecation removal  | No (Can't be)            | Major           | `4.x` |       |
+Bug fixes            | Yes                      | Patch           | `4.x`   |       |
+Bug fixes            | No (Only if no choice)   | Major           | `5.x` |       |
+Feature              | Yes                      | Minor           | `4.x`   |       |
+Feature              | No (Only if no choice)   | Major           | `5.x` |       |
+Deprecation          | Yes (Have to)            | Minor           | `4.x`   |       |
+Deprecation removal  | No (Can't be)            | Major           | `5.x` |       |
 
 Notes:
-  * Branch `3.x` is the branch of the **latest stable** minor release and
+  * Branch `4.x` is the branch of the **latest stable** minor release and
   has to be used for Backward compatible PRs.
   * If you PR is not **Backward Compatible** but can be, it **MUST** be:
     * Changing a function/method signature? Prefer create a new one and deprecate the old one.
     * Code deletion? Don't. Please deprecate it instead.
-    * If your BC PR is accepted, you can do a new one on the `4.x` branch which removes the deprecated code.
+    * If your BC PR is accepted, you can do a new one on the `5.x` branch which removes the deprecated code.
     * SYMFONY DOC REF (same logic)?
 
 If you have a non-BC PR to propose, please try to create a related BC PR first.

README.md

@@ -19,8 +19,8 @@ Symfony SonataMediaBundle
 
 Branch | Github Actions | Code Coverage | Documentation |
 ------ | -------------- | ------------- | ------------- |
-3.x | [![Test][test_stable_badge]][test_stable_link] | [![Coverage Status][coverage_stable_badge]][coverage_stable_link] | [![Documentation Status][documentation_stable_badge]][documentation_stable_link] |
-4.x | [![Test][test_unstable_badge]][test_unstable_link] | [![Coverage Status][coverage_unstable_badge]][coverage_unstable_link] | [![Documentation Status][documentation_unstable_badge]][documentation_unstable_link] |
+4.x | [![Test][test_stable_badge]][test_stable_link] | [![Coverage Status][coverage_stable_badge]][coverage_stable_link] | [![Documentation Status][documentation_stable_badge]][documentation_stable_link] |
+5.x | [![Test][test_unstable_badge]][test_unstable_link] | [![Coverage Status][coverage_unstable_badge]][coverage_unstable_link] | [![Documentation Status][documentation_unstable_badge]][documentation_unstable_link] |
 
 ## Documentation
 
@@ -37,17 +37,17 @@ If you think you found a bug or you have a feature idea to propose, feel free to
 
 This package is available under the [MIT license](LICENSE).
 
-[test_stable_badge]: https://github.com/sonata-project/SonataMediaBundle/workflows/Test/badge.svg?branch=3.x
-[test_stable_link]: https://github.com/sonata-project/SonataMediaBundle/actions?query=workflow:test+branch:3.x
-[test_unstable_badge]: https://github.com/sonata-project/SonataMediaBundle/workflows/Test/badge.svg?branch=4.x
-[test_unstable_link]: https://github.com/sonata-project/SonataMediaBundle/actions?query=workflow:test+branch:4.x
-[coverage_stable_badge]: https://codecov.io/gh/sonata-project/SonataMediaBundle/branch/3.x/graph/badge.svg
-[coverage_stable_link]: https://codecov.io/gh/sonata-project/SonataMediaBundle/branch/3.x
-[coverage_unstable_badge]: https://codecov.io/gh/sonata-project/SonataMediaBundle/branch/4.x/graph/badge.svg
-[coverage_unstable_link]: https://codecov.io/gh/sonata-project/SonataMediaBundle/branch/4.x
+[test_stable_badge]: https://github.com/sonata-project/SonataMediaBundle/workflows/Test/badge.svg?branch=4.x
+[test_stable_link]: https://github.com/sonata-project/SonataMediaBundle/actions?query=workflow:test+branch:4.x
+[test_unstable_badge]: https://github.com/sonata-project/SonataMediaBundle/workflows/Test/badge.svg?branch=5.x
+[test_unstable_link]: https://github.com/sonata-project/SonataMediaBundle/actions?query=workflow:test+branch:5.x
+[coverage_stable_badge]: https://codecov.io/gh/sonata-project/SonataMediaBundle/branch/4.x/graph/badge.svg
+[coverage_stable_link]: https://codecov.io/gh/sonata-project/SonataMediaBundle/branch/4.x
+[coverage_unstable_badge]: https://codecov.io/gh/sonata-project/SonataMediaBundle/branch/5.x/graph/badge.svg
+[coverage_unstable_link]: https://codecov.io/gh/sonata-project/SonataMediaBundle/branch/5.x
 [shepherd_stable_badge]: https://shepherd.dev/github/sonata-project/SonataMediaBundle/coverage.svg
 [shepherd_stable_link]: https://shepherd.dev/github/sonata-project/SonataMediaBundle
-[documentation_stable_badge]: https://readthedocs.org/projects/sonata-project-sonatamediabundle/badge/?version=3.x
-[documentation_stable_link]: https://docs.sonata-project.org/projects/SonataMediaBundle/en/3.x/?badge=3.x
-[documentation_unstable_badge]: https://readthedocs.org/projects/sonata-project-sonatamediabundle/badge/?version=4.x
-[documentation_unstable_link]: https://docs.sonata-project.org/projects/SonataMediaBundle/en/4.x/?badge=4.x
+[documentation_stable_badge]: https://readthedocs.org/projects/sonata-project-sonatamediabundle/badge/?version=4.x
+[documentation_stable_link]: https://docs.sonata-project.org/projects/SonataMediaBundle/en/4.x/?badge=4.x
+[documentation_unstable_badge]: https://readthedocs.org/projects/sonata-project-sonatamediabundle/badge/?version=5.x
+[documentation_unstable_link]: https://docs.sonata-project.org/projects/SonataMediaBundle/en/5.x/?badge=5.x

docs/.doctor-rst.yaml

@@ -43,5 +43,5 @@ rules:
 
 whitelist:
     lines:
-        - '.. versionadded:: 3.x'
+        - '.. versionadded:: 4.x'
         - 'resource: "@NelmioApiDocBundle/Resources/config/routing.yml"'