Merge 4.x into 5.x

sonata-project · May 14, 2023 · 84126c5 · 84126c5
2 parents ae40d98 + 6f45c37
commit 84126c5
Show file tree

Hide file tree

Showing 3 changed files with 14 additions and 1 deletion.
diff --git a/.github/workflows/test.yaml b/.github/workflows/test.yaml
@@ -42,6 +42,10 @@ jobs:
                       dependencies: lowest
                       allowed-to-fail: false
                       variant: normal
+                    - php-version: '8.2'
+                      dependencies: highest
+                      allowed-to-fail: false
+                      variant: sonata-project/form-extensions:"2.0.0-alpha-1"
                     - php-version: '8.2'
                       dependencies: highest
                       allowed-to-fail: false

diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -2,6 +2,15 @@
 All notable changes to this project will be documented in this file.
 This project adheres to [Semantic Versioning](http://semver.org/).
 
+## [4.13.0](https://github.com/sonata-project/SonataDoctrineORMAdminBundle/compare/4.12.0...4.13.0) - 2023-05-13
+### Added
+- [[#1755](https://github.com/sonata-project/SonataDoctrineORMAdminBundle/pull/1755)] Support for `sonata-project/form-extensions` 2.0 ([@jordisala1991](https://github.com/jordisala1991))
+- [[#1738](https://github.com/sonata-project/SonataDoctrineORMAdminBundle/pull/1738)] Support for `symfony/uid` as primary keys using `Uuid` or `Ulid` ([@jordisala1991](https://github.com/jordisala1991))
+
+### Fixed
+- [[#1738](https://github.com/sonata-project/SonataDoctrineORMAdminBundle/pull/1738)] `ModelFilter` for related entities using compound ids ([@jordisala1991](https://github.com/jordisala1991))
+- [[#1738](https://github.com/sonata-project/SonataDoctrineORMAdminBundle/pull/1738)] `ModelFilter` when filtering for not equals and using an inverse side relation ([@jordisala1991](https://github.com/jordisala1991))
+
 ## [4.12.0](https://github.com/sonata-project/SonataDoctrineORMAdminBundle/compare/4.11.0...4.12.0) - 2023-04-24
 ### Changed
 - [[#1737](https://github.com/sonata-project/SonataDoctrineORMAdminBundle/pull/1737)] Bump `sonata-project/form-extensions` to ^1.19 ([@jordisala1991](https://github.com/jordisala1991))

diff --git a/composer.json b/composer.json
@@ -32,7 +32,7 @@
         "doctrine/persistence": "^3.0.2",
         "sonata-project/admin-bundle": "^4.18",
         "sonata-project/exporter": "^2.0 || ^3.0",
-        "sonata-project/form-extensions": "^1.19",
+        "sonata-project/form-extensions": "^1.19 || ^2.0",
         "symfony/config": "^5.4 || ^6.2",
         "symfony/console": "^5.4 || ^6.2",
         "symfony/dependency-injection": "^5.4 || ^6.2",