Merge remote-tracking branch 'upstream/3.x' into 4.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/SonataDoctrineMongoDBAdminBundle/blob/3.x/CONTRIBUTING.md#issues
+    More details here: https://github.com/sonata-project/SonataDoctrineMongoDBAdminBundle/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 everything backwards compatible, like patches, features and deprecation notices
     - master is for deprecation removals and other changes that cannot be done without a BC-break
-    More details here: https://github.com/sonata-project/SonataDoctrineMongoDBAdminBundle/blob/3.x/CONTRIBUTING.md#base-branch
+    More details here: https://github.com/sonata-project/SonataDoctrineMongoDBAdminBundle/blob/4.x/CONTRIBUTING.md#base-branch
 -->
 I am targeting this branch, because {reason}.
 

.github/workflows/documentation.yaml

@@ -8,6 +8,7 @@ on:
     push:
         branches:
             - 3.x
+            - 4.x
             - master
     pull_request:
 

.github/workflows/lint.yaml

@@ -8,6 +8,7 @@ on:
     push:
         branches:
             - 3.x
+            - 4.x
             - master
     pull_request:
 

.github/workflows/qa.yaml

@@ -8,6 +8,7 @@ on:
     push:
         branches:
             - 3.x
+            - 4.x
             - master
     pull_request:
 
@@ -24,7 +25,7 @@ jobs:
             - name: Install PHP with extensions
               uses: shivammathur/setup-php@v2
               with:
-                  php-version: 7.4
+                  php-version: 8.0
                   coverage: none
                   tools: composer:v2
                   extensions: mongodb-1.9.0, zip
@@ -49,7 +50,7 @@ jobs:
             - name: Install PHP with extensions
               uses: shivammathur/setup-php@v2
               with:
-                  php-version: 7.4
+                  php-version: 8.0
                   coverage: none
                   tools: composer:v2
                   extensions: mongodb-1.9.0, zip
@@ -61,4 +62,4 @@ jobs:
                   composer-options: "--prefer-dist --prefer-stable"
 
             - name: Psalm
-              run: vendor/bin/psalm --show-info=false --stats --output-format=github --threads=$(nproc) --shepherd --php-version=7.4
+              run: vendor/bin/psalm --show-info=false --stats --output-format=github --threads=$(nproc) --shepherd --php-version=8.0

.github/workflows/test.yaml

@@ -8,6 +8,7 @@ on:
     push:
         branches:
             - 3.x
+            - 4.x
             - master
     pull_request:
 
@@ -43,11 +44,11 @@ jobs:
                       dependencies: lowest
                       allowed-to-fail: false
                       variant: normal
-                    - php-version: '7.4'
+                    - php-version: '8.0'
                       dependencies: highest
                       allowed-to-fail: false
                       variant: 'sonata-project/admin-bundle:"^4@rc"'
-                    - php-version: '7.4'
+                    - php-version: '8.0'
                       dependencies: highest
                       allowed-to-fail: false
                       symfony-require: 4.4.*

.symfony.bundle.yaml

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

CONTRIBUTING.md

@@ -215,15 +215,15 @@ 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            | Yes                      | Patch           | `4.x`   |       |
 Bug fixes            | No (Only if no choice)   | Major           | `master` |       |
-Feature              | Yes                      | Minor           | `3.x`   |       |
+Feature              | Yes                      | Minor           | `4.x`   |       |
 Feature              | No (Only if no choice)   | Major           | `master` |       |
-Deprecation          | Yes (Have to)            | Minor           | `3.x`   |       |
+Deprecation          | Yes (Have to)            | Minor           | `4.x`   |       |
 Deprecation removal  | No (Can't be)            | Major           | `master` |       |
 
 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.

README.md

@@ -19,7 +19,7 @@ Symfony Sonata / Integrate Doctrine MongoDB ODM into the SonataAdminBundle
 
 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_stable_badge]][test_stable_link]     | [![Coverage Status][coverage_stable_badge]][coverage_stable_link]     | [![Documentation Status][documentation_stable_badge]][documentation_stable_link]     |
 master | [![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,19 +37,19 @@ 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/SonataDoctrineMongoDBAdminBundle/workflows/Test/badge.svg?branch=3.x
-[test_stable_link]: https://github.com/sonata-project/SonataDoctrineMongoDBAdminBundle/actions?query=workflow:test+branch:3.x
+[test_stable_badge]: https://github.com/sonata-project/SonataDoctrineMongoDBAdminBundle/workflows/Test/badge.svg?branch=4.x
+[test_stable_link]: https://github.com/sonata-project/SonataDoctrineMongoDBAdminBundle/actions?query=workflow:test+branch:4.x
 [test_unstable_badge]: https://github.com/sonata-project/SonataDoctrineMongoDBAdminBundle/workflows/Test/badge.svg?branch=master
 [test_unstable_link]: https://github.com/sonata-project/SonataDoctrineMongoDBAdminBundle/actions?query=workflow:test+branch:master
 
-[coverage_stable_badge]: https://codecov.io/gh/sonata-project/SonataDoctrineMongoDBAdminBundle/branch/3.x/graph/badge.svg
-[coverage_stable_link]: https://codecov.io/gh/sonata-project/SonataDoctrineMongoDBAdminBundle/branch/3.x
+[coverage_stable_badge]: https://codecov.io/gh/sonata-project/SonataDoctrineMongoDBAdminBundle/branch/4.x/graph/badge.svg
+[coverage_stable_link]: https://codecov.io/gh/sonata-project/SonataDoctrineMongoDBAdminBundle/branch/4.x
 [coverage_unstable_badge]: https://codecov.io/gh/sonata-project/SonataDoctrineMongoDBAdminBundle/branch/master/graph/badge.svg
 [coverage_unstable_link]: https://codecov.io/gh/sonata-project/SonataDoctrineMongoDBAdminBundle/branch/master
 [shepherd_stable_badge]: https://shepherd.dev/github/sonata-project/SonataDoctrineMongoDBAdminBundle/coverage.svg
 [shepherd_stable_link]: https://shepherd.dev/github/sonata-project/SonataDoctrineMongoDBAdminBundle
 
-[documentation_stable_badge]: https://readthedocs.org/projects/sonatadoctrinemongodbadminbundle/badge/?version=3.x
-[documentation_stable_link]: https://docs.sonata-project.org/projects/SonataDoctrineMongoDBAdminBundle/en/3.x/?badge=3.x
+[documentation_stable_badge]: https://readthedocs.org/projects/sonatadoctrinemongodbadminbundle/badge/?version=4.x
+[documentation_stable_link]: https://docs.sonata-project.org/projects/SonataDoctrineMongoDBAdminBundle/en/4.x/?badge=4.x
 [documentation_unstable_badge]: https://readthedocs.org/projects/sonatadoctrinemongodbadminbundle/badge/?version=master
-[documentation_unstable_link]: https://docs.readthedocs.org/projects/SonataDoctrineMongoDBAdminBundle/en/master/?badge=master
+[documentation_unstable_link]: https://docs.sonata-project.org/projects/SonataDoctrineMongoDBAdminBundle/en/master/?badge=master

docs/.doctor-rst.yaml

@@ -43,4 +43,4 @@ rules:
 
 whitelist:
     lines:
-        - '.. versionadded:: 3.x'
+        - '.. versionadded:: 4.x'

phpunit.xml.dist

@@ -33,7 +33,7 @@ It's auto-generated by sonata-project/dev-kit package.
     <php>
         <ini name="precision" value="8" />
         <env name="SYMFONY_DEPRECATIONS_HELPER" value="max[self]=0" />
-        <env name="SYMFONY_PHPUNIT_VERSION" value="9.4" />
+        <env name="SYMFONY_PHPUNIT_VERSION" value="9.5" />
         <server name="PANTHER_WEB_SERVER_DIR" value="./tests/App/public/" />
     </php>