DevKit updates (#432)

sonata-project · Jul 28, 2022 · 46e04a6 · 46e04a6
1 parent 4ed1b67
commit 46e04a6
Show file tree

Hide file tree

Showing 9 changed files with 27 additions and 24 deletions.
diff --git a/.github/FUNDING.yml b/.github/FUNDING.yml
@@ -2,4 +2,4 @@
 #
 # It's auto-generated by sonata-project/dev-kit package.
 
-github: [core23, greg0ire, jordisala1991, VincentLanglet]
+github: [core23, greg0ire, VincentLanglet, jordisala1991]
diff --git 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/sonata-doctrine-extensions/blob/1.x/CONTRIBUTING.md#issues
+    More details here: https://github.com/sonata-project/sonata-doctrine-extensions/blob/2.x/CONTRIBUTING.md#issues
 -->
diff --git a/.github/PULL_REQUEST_TEMPLATE.md b/.github/PULL_REQUEST_TEMPLATE.md
@@ -6,9 +6,9 @@
 <!--
     Show us you choose the right branch.
     Different branches are used for different things :
-    - 1.x is for everything backwards compatible, like patches, features and deprecation notices
-    - 2.x is for deprecation removals and other changes that cannot be done without a BC-break
-    More details here: https://github.com/sonata-project/sonata-doctrine-extensions/blob/1.x/CONTRIBUTING.md#base-branch
+    - 2.x is for everything backwards compatible, like patches, features and deprecation notices
+    - 3.x is for deprecation removals and other changes that cannot be done without a BC-break
+    More details here: https://github.com/sonata-project/sonata-doctrine-extensions/blob/2.x/CONTRIBUTING.md#base-branch
 -->
 I am targeting this branch, because {reason}.
 

diff --git a/.github/workflows/lint.yaml b/.github/workflows/lint.yaml
@@ -11,6 +11,7 @@ on:
         branches:
             - 1.x
             - 2.x
+            - 3.x
     pull_request:
 
 permissions:

diff --git a/.github/workflows/qa.yaml b/.github/workflows/qa.yaml
@@ -11,6 +11,7 @@ on:
         branches:
             - 1.x
             - 2.x
+            - 3.x
     pull_request:
 
 permissions:

diff --git a/.github/workflows/test.yaml b/.github/workflows/test.yaml
@@ -11,6 +11,7 @@ on:
         branches:
             - 1.x
             - 2.x
+            - 3.x
     pull_request:
 
 permissions:

diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md
@@ -219,20 +219,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           | `1.x`   |       |
-Bug fixes            | No (Only if no choice)   | Major           | `2.x` |       |
-Feature              | Yes                      | Minor           | `1.x`   |       |
-Feature              | No (Only if no choice)   | Major           | `2.x` |       |
-Deprecation          | Yes (Have to)            | Minor           | `1.x`   |       |
-Deprecation removal  | No (Can't be)            | Major           | `2.x` |       |
+Bug fixes            | Yes                      | Patch           | `2.x`   |       |
+Bug fixes            | No (Only if no choice)   | Major           | `3.x` |       |
+Feature              | Yes                      | Minor           | `2.x`   |       |
+Feature              | No (Only if no choice)   | Major           | `3.x` |       |
+Deprecation          | Yes (Have to)            | Minor           | `2.x`   |       |
+Deprecation removal  | No (Can't be)            | Major           | `3.x` |       |
 
 Notes:
-  * Branch `1.x` is the branch of the **latest stable** minor release and
+  * Branch `2.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 `2.x` branch which removes the deprecated code.
+    * If your BC PR is accepted, you can do a new one on the `3.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.

diff --git a/README.md b/README.md
@@ -19,8 +19,8 @@ Doctrine2 behavioral extensions
 
 Branch | Github Actions | Code Coverage |
 ------ | -------------- | ------------- |
-1.x | [![Test][test_stable_badge]][test_stable_link] | [![Coverage Status][coverage_stable_badge]][coverage_stable_link] |
-2.x | [![Test][test_unstable_badge]][test_unstable_link] | [![Coverage Status][coverage_unstable_badge]][coverage_unstable_link] |
+2.x | [![Test][test_stable_badge]][test_stable_link] | [![Coverage Status][coverage_stable_badge]][coverage_stable_link] |
+3.x | [![Test][test_unstable_badge]][test_unstable_link] | [![Coverage Status][coverage_unstable_badge]][coverage_unstable_link] |
 
 ## Support
 
@@ -33,13 +33,13 @@ 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/sonata-doctrine-extensions/workflows/Test/badge.svg?branch=1.x
-[test_stable_link]: https://github.com/sonata-project/sonata-doctrine-extensions/actions?query=workflow:test+branch:1.x
-[test_unstable_badge]: https://github.com/sonata-project/sonata-doctrine-extensions/workflows/Test/badge.svg?branch=2.x
-[test_unstable_link]: https://github.com/sonata-project/sonata-doctrine-extensions/actions?query=workflow:test+branch:2.x
-[coverage_stable_badge]: https://codecov.io/gh/sonata-project/sonata-doctrine-extensions/branch/1.x/graph/badge.svg
-[coverage_stable_link]: https://codecov.io/gh/sonata-project/sonata-doctrine-extensions/branch/1.x
-[coverage_unstable_badge]: https://codecov.io/gh/sonata-project/sonata-doctrine-extensions/branch/2.x/graph/badge.svg
-[coverage_unstable_link]: https://codecov.io/gh/sonata-project/sonata-doctrine-extensions/branch/2.x
+[test_stable_badge]: https://github.com/sonata-project/sonata-doctrine-extensions/workflows/Test/badge.svg?branch=2.x
+[test_stable_link]: https://github.com/sonata-project/sonata-doctrine-extensions/actions?query=workflow:test+branch:2.x
+[test_unstable_badge]: https://github.com/sonata-project/sonata-doctrine-extensions/workflows/Test/badge.svg?branch=3.x
+[test_unstable_link]: https://github.com/sonata-project/sonata-doctrine-extensions/actions?query=workflow:test+branch:3.x
+[coverage_stable_badge]: https://codecov.io/gh/sonata-project/sonata-doctrine-extensions/branch/2.x/graph/badge.svg
+[coverage_stable_link]: https://codecov.io/gh/sonata-project/sonata-doctrine-extensions/branch/2.x
+[coverage_unstable_badge]: https://codecov.io/gh/sonata-project/sonata-doctrine-extensions/branch/3.x/graph/badge.svg
+[coverage_unstable_link]: https://codecov.io/gh/sonata-project/sonata-doctrine-extensions/branch/3.x
 [shepherd_stable_badge]: https://shepherd.dev/github/sonata-project/sonata-doctrine-extensions/coverage.svg
 [shepherd_stable_link]: https://shepherd.dev/github/sonata-project/sonata-doctrine-extensions
diff --git a/rector.php b/rector.php
@@ -33,7 +33,7 @@
     ]);
 
     $rectorConfig->importNames();
-    $rectorConfig->disableImportShortClasses();
+    $rectorConfig->importShortClasses(false);
     $rectorConfig->skip([
         CountOnNullRector::class,
         ExceptionHandlerTypehintRector::class,