From 1361f78908102c9f1077be7560240a49d9eab397 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Gr=C3=A9goire=20Paris?= Date: Mon, 17 Feb 2020 23:31:51 +0100 Subject: [PATCH] 3.60.0 --- CHANGELOG.md | 10 ++++++++++ .../Compiler/ModelManagerCompilerPass.php | 2 +- .../Extension/Field/Type/FormTypeFieldExtension.php | 2 +- src/Form/Type/Operator/EqualOperatorType.php | 4 ++-- src/Resources/views/Form/form_admin_fields.html.twig | 2 +- .../Compiler/ModelManagerCompilerPassTest.php | 2 +- 6 files changed, 16 insertions(+), 6 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 247e520365..995ed1c741 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -2,6 +2,16 @@ All notable changes to this project will be documented in this file. This project adheres to [Semantic Versioning](http://semver.org/). +## [3.60.0](https://github.com/sonata-project/SonataAdminBundle/compare/3.59.0...3.60.0) - 2020-02-17 +### Added +- `sonata.admin.manager` tag to services implementing `ModelManagerInterface`. + +### Fixed +- Wording of `EqualOperatorType` + +### Deprecated +- The use of `sonata_help` in form types + ## [3.59.0](https://github.com/sonata-project/SonataAdminBundle/compare/3.58.0...3.59.0) - 2020-02-10 ### Added - Add support for symfony form help diff --git a/src/DependencyInjection/Compiler/ModelManagerCompilerPass.php b/src/DependencyInjection/Compiler/ModelManagerCompilerPass.php index f65339e2ce..d109c13bc8 100644 --- a/src/DependencyInjection/Compiler/ModelManagerCompilerPass.php +++ b/src/DependencyInjection/Compiler/ModelManagerCompilerPass.php @@ -50,7 +50,7 @@ public function process(ContainerBuilder $container): void // NEXT_MAJOR: Remove this check. if (!$definition->hasTag(self::MANAGER_TAG)) { @trigger_error(sprintf( - 'Not setting the "%s" tag on the "%s" service is deprecated since sonata-project/admin-bundle 3.x.', + 'Not setting the "%s" tag on the "%s" service is deprecated since sonata-project/admin-bundle 3.60.', self::MANAGER_TAG, $id ), E_USER_DEPRECATED); diff --git a/src/Form/Extension/Field/Type/FormTypeFieldExtension.php b/src/Form/Extension/Field/Type/FormTypeFieldExtension.php index f5644fb07c..9fa9618313 100644 --- a/src/Form/Extension/Field/Type/FormTypeFieldExtension.php +++ b/src/Form/Extension/Field/Type/FormTypeFieldExtension.php @@ -192,7 +192,7 @@ public function configureOptions(OptionsResolver $resolver) ]) ->setDeprecated( 'sonata_help', - 'The "sonata_help" option is deprecated since sonata-project/admin-bundle 3.x, to be removed in 4.0. Use "help" instead.' + 'The "sonata_help" option is deprecated since sonata-project/admin-bundle 3.60, to be removed in 4.0. Use "help" instead.' ); } diff --git a/src/Form/Type/Operator/EqualOperatorType.php b/src/Form/Type/Operator/EqualOperatorType.php index a256131413..ca98bae5f5 100644 --- a/src/Form/Type/Operator/EqualOperatorType.php +++ b/src/Form/Type/Operator/EqualOperatorType.php @@ -20,11 +20,11 @@ final class EqualOperatorType extends AbstractType { /** - * @deprecated since sonata-project/admin-bundle 3.x, to be removed with 4.0: Use EqualOperatorType::TYPE_EQUAL instead + * @deprecated since sonata-project/admin-bundle 3.60, to be removed with 4.0: Use EqualOperatorType::TYPE_EQUAL instead */ public const TYPE_YES = 1; /** - * @deprecated since sonata-project/admin-bundle 3.x, to be removed with 4.0: Use EqualOperatorType::TYPE_NOT_EQUAL instead + * @deprecated since sonata-project/admin-bundle 3.60, to be removed with 4.0: Use EqualOperatorType::TYPE_NOT_EQUAL instead */ public const TYPE_NO = 2; diff --git a/src/Resources/views/Form/form_admin_fields.html.twig b/src/Resources/views/Form/form_admin_fields.html.twig index 1a41e620f2..244bb4714d 100644 --- a/src/Resources/views/Form/form_admin_fields.html.twig +++ b/src/Resources/views/Form/form_admin_fields.html.twig @@ -25,7 +25,7 @@ file that was distributed with this source code. {# NEXT_MAJOR: Remove this block and all the calls made to this block #} {% block sonata_help %} -{% deprecated 'The "sonata_help" option is deprecated since sonata-project/admin-bundle 3.x, to be removed in 4.0. Use "help" instead.' %} +{% deprecated 'The "sonata_help" option is deprecated since sonata-project/admin-bundle 3.60, to be removed in 4.0. Use "help" instead.' %} {% apply spaceless %} {% if sonata_help is defined and sonata_help %} {{ sonata_help|raw }} diff --git a/tests/DependencyInjection/Compiler/ModelManagerCompilerPassTest.php b/tests/DependencyInjection/Compiler/ModelManagerCompilerPassTest.php index 186aa58eb6..3f9c5d9571 100644 --- a/tests/DependencyInjection/Compiler/ModelManagerCompilerPassTest.php +++ b/tests/DependencyInjection/Compiler/ModelManagerCompilerPassTest.php @@ -56,7 +56,7 @@ public function testProcess(): void * * @group legacy * - * @expectedDeprecation Not setting the "sonata.admin.manager" tag on the "sonata.admin.manager.test" service is deprecated since sonata-project/admin-bundle 3.x. + * @expectedDeprecation Not setting the "sonata.admin.manager" tag on the "sonata.admin.manager.test" service is deprecated since sonata-project/admin-bundle 3.60. */ public function testProcessWithUntaggedManagerDefinition(): void {