3.60.0

sonata-project · Feb 17, 2020 · 1361f78 · 1361f78
1 parent 2b78b8b
commit 1361f78
Show file tree

Hide file tree

Showing 6 changed files with 16 additions and 6 deletions.
diff --git 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
@@ -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
@@ -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
@@ -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
@@ -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 %}
     <span class="help-block sonata-ba-field-widget-help">{{ sonata_help|raw }}</span>

diff --git 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
     {