Merge 4.x into master

sonata-project · Aug 10, 2021 · 63d851b · 63d851b
2 parents c36d2ad + 8f7c4ae
commit 63d851b
Show file tree

Hide file tree

Showing 14 changed files with 62 additions and 30 deletions.
diff --git a/.flintci.yml b/.flintci.yml
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/SonataDoctrineORMAdminBundle/blob/3.x/CONTRIBUTING.md#issues
+    More details here: https://github.com/sonata-project/SonataDoctrineORMAdminBundle/blob/4.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 :
-    - 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/SonataDoctrineORMAdminBundle/blob/3.x/CONTRIBUTING.md#base-branch
+    More details here: https://github.com/sonata-project/SonataDoctrineORMAdminBundle/blob/4.x/CONTRIBUTING.md#base-branch
 -->
 I am targeting this branch, because {reason}.
 

diff --git 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
@@ -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
@@ -8,6 +8,7 @@ on:
     push:
         branches:
             - 3.x
+            - 4.x
             - master
     pull_request:
 

diff --git a/.github/workflows/test.yaml b/.github/workflows/test.yaml
@@ -8,6 +8,7 @@ on:
     push:
         branches:
             - 3.x
+            - 4.x
             - master
     pull_request:
 
@@ -40,12 +41,17 @@ jobs:
                     - php-version: '8.0'
                       dependencies: highest
                       allowed-to-fail: false
-                      variant: 'sonata-project/admin-bundle:"dev-master"'
+                      variant: 'sonata-project/admin-bundle:"^4@rc"'
                     - php-version: '8.0'
                       dependencies: highest
                       allowed-to-fail: false
                       symfony-require: 4.4.*
                       variant: 'symfony/symfony:"4.4.*"'
+                    - php-version: '8.0'
+                      dependencies: highest
+                      allowed-to-fail: false
+                      symfony-require: 5.3.*
+                      variant: 'symfony/symfony:"5.3.*"'
 
         steps:
             - name: Checkout

diff --git 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/CHANGELOG.md b/CHANGELOG.md
@@ -2,6 +2,27 @@
 All notable changes to this project will be documented in this file.
 This project adheres to [Semantic Versioning](http://semver.org/).
 
+## [4.0.0-rc.1](https://github.com/sonata-project/SonataDoctrineORMAdminBundle/compare/4.0.0-alpha-2...4.0.0-rc.1) - 2021-08-10
+### Added
+- [[#1458](https://github.com/sonata-project/SonataDoctrineORMAdminBundle/pull/1458)] `EmptyFilter` ([@VincentLanglet](https://github.com/VincentLanglet))
+
+### Changed
+- [[#1480](https://github.com/sonata-project/SonataDoctrineORMAdminBundle/pull/1480)] `Pager::getCurrentPageResults()` does not return `Paginator` anymore. ([@VincentLanglet](https://github.com/VincentLanglet))
+
+## [4.0.0-alpha-2](https://github.com/sonata-project/SonataDoctrineORMAdminBundle/compare/4.0.0-alpha-1...4.0.0-alpha-2) - 2021-05-14
+### Added
+- [[#1412](https://github.com/sonata-project/SonataDoctrineORMAdminBundle/pull/1412)] Add compatiblity with all SonataAdmin 4.0 versions ([@jordisala1991](https://github.com/jordisala1991))
+
+### Changed
+- [[#1421](https://github.com/sonata-project/SonataDoctrineORMAdminBundle/pull/1421)] Use `FilterData` instead of `array` in filters. ([@VincentLanglet](https://github.com/VincentLanglet))
+- [[#1438](https://github.com/sonata-project/SonataDoctrineORMAdminBundle/pull/1438)] Add final to abstract classes method. ([@VincentLanglet](https://github.com/VincentLanglet))
+
+### Fixed
+- [[#1435](https://github.com/sonata-project/SonataDoctrineORMAdminBundle/pull/1435)] BatchDelete method. ([@VincentLanglet](https://github.com/VincentLanglet))
+
+## [4.0.0-alpha-1](https://github.com/sonata-project/SonataDoctrineORMAdminBundle/compare/3.35.0...4.0.0-alpha-1) - 2021-04-11
+See Changelog
+
 ## [3.35.0](https://github.com/sonata-project/SonataDoctrineORMAdminBundle/compare/3.34.3...3.35.0) - 2021-07-20
 ### Added
 - [[#1470](https://github.com/sonata-project/SonataDoctrineORMAdminBundle/pull/1470)] `global_search` option to the `StringFilter` ([@VincentLanglet](https://github.com/VincentLanglet))

diff --git 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/Makefile b/Makefile
@@ -46,15 +46,15 @@ lint-php:
 	php-cs-fixer fix --ansi --verbose --diff --dry-run
 .PHONY: lint-php
 
-cs-fix: cs-fix-php cs-fix-xml
+cs-fix: cs-fix-php cs-fix-xml cs-fix-xliff
 .PHONY: cs-fix
 
 cs-fix-php:
 	php-cs-fixer fix --verbose
 .PHONY: cs-fix-php
 
 cs-fix-xml:
-	find . \( -name '*.xml' -or -name '*.xliff' \) \
+	find . -name '*.xml' \
 		-not -path './vendor/*' \
 		-not -path './src/Resources/public/vendor/*' \
 		| while read xmlFile; \
@@ -63,6 +63,16 @@ cs-fix-xml:
 	done
 .PHONY: cs-fix-xml
 
+cs-fix-xliff:
+	find . -name '*.xliff' \
+		-not -path './vendor/*' \
+		-not -path './src/Resources/public/vendor/*' \
+		| while read xmlFile; \
+	do \
+		XMLLINT_INDENT='  ' xmllint --encode UTF-8 --format "$$xmlFile" --output "$$xmlFile"; \
+	done
+.PHONY: cs-fix-xliff
+
 build:
 	mkdir $@
 

diff --git a/README.md b/README.md
@@ -19,7 +19,7 @@ Integrate Doctrine ORM into the SonataAdminBundle
 
 Branch | Github Actions | Code Coverage |
 ------ | -------------- | ------------- |
-3.x    | [![Test][test_stable_badge]][test_stable_link]     | [![Coverage Status][coverage_stable_badge]][coverage_stable_link]     |
+4.x    | [![Test][test_stable_badge]][test_stable_link]     | [![Coverage Status][coverage_stable_badge]][coverage_stable_link]     |
 master | [![Test][test_unstable_badge]][test_unstable_link] | [![Coverage Status][coverage_unstable_badge]][coverage_unstable_link] |
 
 ## Documentation
@@ -37,13 +37,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/SonataDoctrineORMAdminBundle/workflows/Test/badge.svg?branch=3.x
-[test_stable_link]: https://github.com/sonata-project/SonataDoctrineORMAdminBundle/actions?query=workflow:test+branch:3.x
+[test_stable_badge]: https://github.com/sonata-project/SonataDoctrineORMAdminBundle/workflows/Test/badge.svg?branch=4.x
+[test_stable_link]: https://github.com/sonata-project/SonataDoctrineORMAdminBundle/actions?query=workflow:test+branch:4.x
 [test_unstable_badge]: https://github.com/sonata-project/SonataDoctrineORMAdminBundle/workflows/Test/badge.svg?branch=master
 [test_unstable_link]: https://github.com/sonata-project/SonataDoctrineORMAdminBundle/actions?query=workflow:test+branch:master
 
-[coverage_stable_badge]: https://codecov.io/gh/sonata-project/SonataDoctrineORMAdminBundle/branch/3.x/graph/badge.svg
-[coverage_stable_link]: https://codecov.io/gh/sonata-project/SonataDoctrineORMAdminBundle/branch/3.x
+[coverage_stable_badge]: https://codecov.io/gh/sonata-project/SonataDoctrineORMAdminBundle/branch/4.x/graph/badge.svg
+[coverage_stable_link]: https://codecov.io/gh/sonata-project/SonataDoctrineORMAdminBundle/branch/4.x
 [coverage_unstable_badge]: https://codecov.io/gh/sonata-project/SonataDoctrineORMAdminBundle/branch/master/graph/badge.svg
 [coverage_unstable_link]: https://codecov.io/gh/sonata-project/SonataDoctrineORMAdminBundle/branch/master
 [shepherd_stable_badge]: https://shepherd.dev/github/sonata-project/SonataDoctrineORMAdminBundle/coverage.svg

diff --git a/composer.json b/composer.json
@@ -30,7 +30,7 @@
         "doctrine/doctrine-bundle": "^2.3",
         "doctrine/orm": "^2.8",
         "doctrine/persistence": "^2.1",
-        "sonata-project/admin-bundle": "^4.0@dev",
+        "sonata-project/admin-bundle": "^4.0@rc",
         "sonata-project/exporter": "^2.0",
         "sonata-project/form-extensions": "^1.4",
         "symfony/config": "^4.4 || ^5.2",
@@ -47,9 +47,8 @@
         "twig/twig": "^2.10 || ^3.0"
     },
     "conflict": {
-        "simplethings/entity-audit-bundle": ">=2.0",
-        "sonata-project/admin-bundle": "<=4.0.0-alpha-2",
-        "sonata-project/block-bundle": "<4.2"
+        "sonata-project/block-bundle": "<4.2",
+        "sonata-project/entity-audit-bundle": ">=2.0"
     },
     "provide": {
         "sonata-project/admin-bundle-persistency-layer": "1.0.0"

diff --git a/docs/.doctor-rst.yaml b/docs/.doctor-rst.yaml
@@ -43,4 +43,4 @@ rules:
 
 whitelist:
     lines:
-        - '.. versionadded:: 3.x'
+        - '.. versionadded:: 4.x'