From 591efc7af9c3e4739ca3963c8d7abcbe5f24da12 Mon Sep 17 00:00:00 2001 From: Vincent Langlet Date: Wed, 15 Jul 2020 14:07:10 +0200 Subject: [PATCH] Prepare release 3.21 (#1075) --- CHANGELOG.md | 8 ++++++++ UPGRADE-3.x.md | 5 ++++- src/Block/AuditBlockService.php | 2 +- src/Filter/StringFilter.php | 2 +- tests/Block/DeprecatedAuditBlockServiceTest.php | 4 ++-- tests/Filter/StringFilterTest.php | 2 +- 6 files changed, 17 insertions(+), 6 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index c489145e1..09a7e55b5 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -2,6 +2,14 @@ All notable changes to this project will be documented in this file. This project adheres to [Semantic Versioning](http://semver.org/). +## [3.21.0](https://github.com/sonata-project/SonataDoctrineORMAdminBundle/compare/3.20.0...3.21.0) - 2020-07-14 +### Added +- [[#979](https://github.com/sonata-project/SonataDoctrineORMAdminBundle/pull/979)] Add new filter for empty fields ([@core23](https://github.com/core23)) + +### Deprecated +- [[#1061](https://github.com/sonata-project/SonataDoctrineORMAdminBundle/pull/1061)] `format` option of the `StringFilter`. ([@VincentLanglet](https://github.com/VincentLanglet)) +- [[#1067](https://github.com/sonata-project/SonataDoctrineORMAdminBundle/pull/1067)] Passing a string as argument 1 when instantiating Sonata\DoctrineORMAdminBundle\Block\AuditBlockService ([@VincentLanglet](https://github.com/VincentLanglet)) + ## [3.20.0](https://github.com/sonata-project/SonataDoctrineORMAdminBundle/compare/3.19.0...3.20.0) - 2020-06-30 ### Added - [[#1057](https://github.com/sonata-project/SonataDoctrineORMAdminBundle/pull/1057)] diff --git a/UPGRADE-3.x.md b/UPGRADE-3.x.md index 707715356..bb4f36710 100644 --- a/UPGRADE-3.x.md +++ b/UPGRADE-3.x.md @@ -1,13 +1,16 @@ UPGRADE 3.x =========== -UPGRADE FROM 3.19 to 3.20 +UPGRADE FROM 3.20 to 3.21 ========================= ### Sonata\DoctrineORMAdminBundle\Filter\StringFilter Deprecated `format` option with no replacement. +UPGRADE FROM 3.19 to 3.20 +========================= + ### Sonata\DoctrineORMAdminBundle\Admin\FieldDescription Deprecated `getTargetEntity()`, use `getTargetModel()` instead. diff --git a/src/Block/AuditBlockService.php b/src/Block/AuditBlockService.php index 6c472cb75..18c45bd03 100644 --- a/src/Block/AuditBlockService.php +++ b/src/Block/AuditBlockService.php @@ -43,7 +43,7 @@ public function __construct($templatingOrDeprecatedName, object $templatingOrAud { if ($templatingOrAuditReader instanceof EngineInterface) { @trigger_error(sprintf( - 'Passing %s as argument 2 to %s() is deprecated since sonata-project/doctrine-orm-admin-bundle 3.x' + 'Passing %s as argument 2 to %s() is deprecated since sonata-project/doctrine-orm-admin-bundle 3.21' .' and will throw a \TypeError in version 4.0. You must pass an instance of %s instead.', EngineInterface::class, __METHOD__, diff --git a/src/Filter/StringFilter.php b/src/Filter/StringFilter.php index d29676630..d0f686c53 100644 --- a/src/Filter/StringFilter.php +++ b/src/Filter/StringFilter.php @@ -77,7 +77,7 @@ public function filter(ProxyQueryInterface $queryBuilder, $alias, $field, $data) if ('%%%s%%' !== $format) { @trigger_error( - 'The "format" option is deprecated since sonata-project/doctrine-orm-admin-bundle 3.x and will be removed in version 4.0.', + 'The "format" option is deprecated since sonata-project/doctrine-orm-admin-bundle 3.21 and will be removed in version 4.0.', E_USER_DEPRECATED ); } diff --git a/tests/Block/DeprecatedAuditBlockServiceTest.php b/tests/Block/DeprecatedAuditBlockServiceTest.php index ea9484c2b..5f7bf8766 100644 --- a/tests/Block/DeprecatedAuditBlockServiceTest.php +++ b/tests/Block/DeprecatedAuditBlockServiceTest.php @@ -46,7 +46,7 @@ protected function setUp(): void } /** - * @expectedDeprecation Passing Symfony\Bundle\FrameworkBundle\Templating\EngineInterface as argument 2 to Sonata\DoctrineORMAdminBundle\Block\AuditBlockService::__construct() is deprecated since sonata-project/doctrine-orm-admin-bundle 3.x and will throw a \TypeError in version 4.0. You must pass an instance of SimpleThings\EntityAudit\AuditReader instead. + * @expectedDeprecation Passing Symfony\Bundle\FrameworkBundle\Templating\EngineInterface as argument 2 to Sonata\DoctrineORMAdminBundle\Block\AuditBlockService::__construct() is deprecated since sonata-project/doctrine-orm-admin-bundle 3.21 and will throw a \TypeError in version 4.0. You must pass an instance of SimpleThings\EntityAudit\AuditReader instead. */ public function testExecute(): void { @@ -75,7 +75,7 @@ public function testExecute(): void } /** - * @expectedDeprecation Passing Symfony\Bundle\FrameworkBundle\Templating\EngineInterface as argument 2 to Sonata\DoctrineORMAdminBundle\Block\AuditBlockService::__construct() is deprecated since sonata-project/doctrine-orm-admin-bundle 3.x and will throw a \TypeError in version 4.0. You must pass an instance of SimpleThings\EntityAudit\AuditReader instead. + * @expectedDeprecation Passing Symfony\Bundle\FrameworkBundle\Templating\EngineInterface as argument 2 to Sonata\DoctrineORMAdminBundle\Block\AuditBlockService::__construct() is deprecated since sonata-project/doctrine-orm-admin-bundle 3.21 and will throw a \TypeError in version 4.0. You must pass an instance of SimpleThings\EntityAudit\AuditReader instead. */ public function testDefaultSettings(): void { diff --git a/tests/Filter/StringFilterTest.php b/tests/Filter/StringFilterTest.php index b8a450968..81d41cfea 100644 --- a/tests/Filter/StringFilterTest.php +++ b/tests/Filter/StringFilterTest.php @@ -200,7 +200,7 @@ public function caseSensitiveDataProvider(): array * * @group legacy * - * @expectedDeprecation The "format" option is deprecated since sonata-project/doctrine-orm-admin-bundle 3.x and will be removed in version 4.0. + * @expectedDeprecation The "format" option is deprecated since sonata-project/doctrine-orm-admin-bundle 3.21 and will be removed in version 4.0. */ public function testFormatOption(): void {