Prepare release 3.21 (#1075)

sonata-project · Jul 15, 2020 · 591efc7 · 591efc7
1 parent 08e1bea
commit 591efc7
Show file tree

Hide file tree

Showing 6 changed files with 17 additions and 6 deletions.
diff --git 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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
     {