From 79e71544b76c07b9b299b683326f9e6eadcbbfbf Mon Sep 17 00:00:00 2001 From: Vincent Langlet Date: Sun, 2 May 2021 15:29:49 +0200 Subject: [PATCH] 3.34 --- CHANGELOG.md | 13 +++++++++++++ UPGRADE-3.x.md | 4 ++-- src/DependencyInjection/Configuration.php | 4 ++-- src/Filter/CallbackFilter.php | 2 +- tests/Filter/CallbackFilterTest.php | 2 +- 5 files changed, 19 insertions(+), 6 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 408874a80..c1b2cdbe9 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -2,6 +2,19 @@ All notable changes to this project will be documented in this file. This project adheres to [Semantic Versioning](http://semver.org/). +## [3.34.0](https://github.com/sonata-project/SonataDoctrineORMAdminBundle/compare/3.33.0...3.34.0) - 2021-05-02 +### Changed +- [[#1425](https://github.com/sonata-project/SonataDoctrineORMAdminBundle/pull/1425)] `ProxyQuery::execute()` is now returning a Paginator instead of an array. ([@VincentLanglet](https://github.com/VincentLanglet)) + +### Deprecated +- [[#1427](https://github.com/sonata-project/SonataDoctrineORMAdminBundle/pull/1427)] `templates.form` and `templates.filter` config ([@VincentLanglet](https://github.com/VincentLanglet)) +- [[#1428](https://github.com/sonata-project/SonataDoctrineORMAdminBundle/pull/1428)] Deprecated not adding `FilterData` as type declaration of argument 4 in the callable passed to `CallbackFilter` ([@franmomu](https://github.com/franmomu)) + +### Fixed +- [[#1427](https://github.com/sonata-project/SonataDoctrineORMAdminBundle/pull/1427)] Always merge `SonataDoctrineORMAdmin` form and filter templates. ([@VincentLanglet](https://github.com/VincentLanglet)) +- [[#1427](https://github.com/sonata-project/SonataDoctrineORMAdminBundle/pull/1427)] Using `sonata_admin` configuration. ([@VincentLanglet](https://github.com/VincentLanglet)) +- [[#1425](https://github.com/sonata-project/SonataDoctrineORMAdminBundle/pull/1425)] Support for fetch join with simple pager. ([@VincentLanglet](https://github.com/VincentLanglet)) + ## [3.33.0](https://github.com/sonata-project/SonataDoctrineORMAdminBundle/compare/3.32.1...3.33.0) - 2021-04-19 ### Added - [[#1416](https://github.com/sonata-project/SonataDoctrineORMAdminBundle/pull/1416)] "force_case_insensitivity" option to `StringFilter` in order to force the database to ignore the case sensitivity when matching filters. ([@phansys](https://github.com/phansys)) diff --git a/UPGRADE-3.x.md b/UPGRADE-3.x.md index 36cc89e1d..5c6c4f2af 100644 --- a/UPGRADE-3.x.md +++ b/UPGRADE-3.x.md @@ -1,8 +1,8 @@ UPGRADE 3.x =========== -UPGRADE FROM 3.x to 3.x -======================= +UPGRADE FROM 3.33 to 3.34 +========================= ### Sonata\DoctrineORMAdminBundle\Filter\CallbackFilter diff --git a/src/DependencyInjection/Configuration.php b/src/DependencyInjection/Configuration.php index ee4c45157..a0fe3e605 100644 --- a/src/DependencyInjection/Configuration.php +++ b/src/DependencyInjection/Configuration.php @@ -58,13 +58,13 @@ public function getConfigTreeBuilder() ->children() // NEXT_MAJOR: Remove this option. ->arrayNode('form') - ->setDeprecated('The "%node%" option is deprecated since sonata-project/doctrine-orm-admin-bundle 3.x.') + ->setDeprecated('The "%node%" option is deprecated since sonata-project/doctrine-orm-admin-bundle 3.34.') ->prototype('scalar')->end() ->defaultValue(['@SonataDoctrineORMAdmin/Form/form_admin_fields.html.twig']) ->end() // NEXT_MAJOR: Remove this option. ->arrayNode('filter') - ->setDeprecated('The "%node%" option is deprecated since sonata-project/doctrine-orm-admin-bundle 3.x.') + ->setDeprecated('The "%node%" option is deprecated since sonata-project/doctrine-orm-admin-bundle 3.34.') ->prototype('scalar')->end() ->defaultValue(['@SonataDoctrineORMAdmin/Form/filter_admin_fields.html.twig']) ->end() diff --git a/src/Filter/CallbackFilter.php b/src/Filter/CallbackFilter.php index fe228854d..8bd6f7820 100644 --- a/src/Filter/CallbackFilter.php +++ b/src/Filter/CallbackFilter.php @@ -56,7 +56,7 @@ public function filter(BaseProxyQueryInterface $query, $alias, $field, $data) } else { @trigger_error(sprintf( 'Not adding "%1$s" as type declaration for argument 4 is deprecated since' - .' sonata-project/doctrine-orm-admin-bundle 3.x and the argument will be a "%1$s" instance in version 4.0.', + .' sonata-project/doctrine-orm-admin-bundle 3.34 and the argument will be a "%1$s" instance in version 4.0.', FilterData::class ), \E_USER_DEPRECATED); } diff --git a/tests/Filter/CallbackFilterTest.php b/tests/Filter/CallbackFilterTest.php index b99d0bdac..e25208f58 100644 --- a/tests/Filter/CallbackFilterTest.php +++ b/tests/Filter/CallbackFilterTest.php @@ -159,7 +159,7 @@ public function testItThrowsDeprecationWithoutFilterData(callable $callable): vo 'field_name' => 'field_name_test', ]); - $this->expectDeprecation('Not adding "Sonata\AdminBundle\Filter\Model\FilterData" as type declaration for argument 4 is deprecated since sonata-project/doctrine-orm-admin-bundle 3.x and the argument will be a "Sonata\AdminBundle\Filter\Model\FilterData" instance in version 4.0.'); + $this->expectDeprecation('Not adding "Sonata\AdminBundle\Filter\Model\FilterData" as type declaration for argument 4 is deprecated since sonata-project/doctrine-orm-admin-bundle 3.34 and the argument will be a "Sonata\AdminBundle\Filter\Model\FilterData" instance in version 4.0.'); $filter->apply($proxyQuery, ['value' => 'myValue']); $this->assertTrue($filter->isActive());