From 95a5e730133f93f255a122469dc0ee162d5d9772 Mon Sep 17 00:00:00 2001 From: Sonata CI Date: Wed, 11 Aug 2021 20:53:41 +0100 Subject: [PATCH 1/2] DevKit updates (#636) --- README.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/README.md b/README.md index dd4ffb7c..c2820966 100644 --- a/README.md +++ b/README.md @@ -52,4 +52,4 @@ This package is available under the [MIT license](LICENSE). [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_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 From a887ceed82f81c79aa14cc284e7065bd31959a56 Mon Sep 17 00:00:00 2001 From: Sonata CI Date: Thu, 12 Aug 2021 08:28:48 +0100 Subject: [PATCH 2/2] DevKit updates (#638) --- .github/ISSUE_TEMPLATE/Bug.md | 2 +- .github/PULL_REQUEST_TEMPLATE.md | 4 ++-- .github/workflows/documentation.yaml | 1 + .github/workflows/lint.yaml | 1 + .github/workflows/qa.yaml | 7 ++++--- .github/workflows/test.yaml | 5 +++-- .symfony.bundle.yaml | 4 +++- CONTRIBUTING.md | 8 ++++---- README.md | 14 +++++++------- docs/.doctor-rst.yaml | 2 +- phpunit.xml.dist | 2 +- 11 files changed, 28 insertions(+), 22 deletions(-) diff --git a/.github/ISSUE_TEMPLATE/Bug.md b/.github/ISSUE_TEMPLATE/Bug.md index 00dc3147..373963db 100644 --- a/.github/ISSUE_TEMPLATE/Bug.md +++ b/.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 --> diff --git a/.github/PULL_REQUEST_TEMPLATE.md b/.github/PULL_REQUEST_TEMPLATE.md index 068dfec4..861cdaca 100644 --- a/.github/PULL_REQUEST_TEMPLATE.md +++ b/.github/PULL_REQUEST_TEMPLATE.md @@ -6,9 +6,9 @@ I am targeting this branch, because {reason}. diff --git a/.github/workflows/documentation.yaml b/.github/workflows/documentation.yaml index 8bb2bffa..695d3737 100644 --- a/.github/workflows/documentation.yaml +++ b/.github/workflows/documentation.yaml @@ -8,6 +8,7 @@ on: push: branches: - 3.x + - 4.x - master pull_request: diff --git a/.github/workflows/lint.yaml b/.github/workflows/lint.yaml index db5377cb..98576b51 100644 --- a/.github/workflows/lint.yaml +++ b/.github/workflows/lint.yaml @@ -8,6 +8,7 @@ on: push: branches: - 3.x + - 4.x - master pull_request: diff --git a/.github/workflows/qa.yaml b/.github/workflows/qa.yaml index 010b2b3f..12fd405b 100644 --- a/.github/workflows/qa.yaml +++ b/.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 diff --git a/.github/workflows/test.yaml b/.github/workflows/test.yaml index 7b4cc263..66ce71ee 100644 --- a/.github/workflows/test.yaml +++ b/.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:"3.*"' - - php-version: '7.4' + - php-version: '8.0' dependencies: highest allowed-to-fail: false symfony-require: 4.4.* diff --git a/.symfony.bundle.yaml b/.symfony.bundle.yaml index 8b374e69..c574dfc8 100644 --- a/.symfony.bundle.yaml +++ b/.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 diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md index 86544a36..5d1b14aa 100644 --- a/CONTRIBUTING.md +++ b/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. diff --git a/README.md b/README.md index c2820966..408bc6c1 100644 --- a/README.md +++ b/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.sonata-project.org/projects/SonataDoctrineMongoDBAdminBundle/en/master/?badge=master diff --git a/docs/.doctor-rst.yaml b/docs/.doctor-rst.yaml index ce53dfd4..75d904fa 100644 --- a/docs/.doctor-rst.yaml +++ b/docs/.doctor-rst.yaml @@ -43,4 +43,4 @@ rules: whitelist: lines: - - '.. versionadded:: 3.x' + - '.. versionadded:: 4.x' diff --git a/phpunit.xml.dist b/phpunit.xml.dist index 053e5244..dbf05520 100644 --- a/phpunit.xml.dist +++ b/phpunit.xml.dist @@ -33,7 +33,7 @@ It's auto-generated by sonata-project/dev-kit package. - +