From cd0087a9884b577d615d77a4efb507778dbba8f5 Mon Sep 17 00:00:00 2001 From: Vincent Langlet Date: Tue, 27 Apr 2021 16:18:42 +0200 Subject: [PATCH 01/11] 3.98 --- CHANGELOG.md | 30 +++++++++++++++ UPGRADE-3.x.md | 4 +- .../Admin/AbstractTaggedAdmin.php | 4 +- src/Resources/config/commands.php | 10 ++--- src/Resources/config/core.php | 38 +++++++++---------- src/Resources/config/exporter.php | 2 +- src/Resources/config/form_types.php | 36 +++++++++--------- src/Resources/config/menu.php | 10 ++--- src/Resources/config/route.php | 10 ++--- src/Resources/config/security.php | 4 +- src/Resources/config/twig.php | 2 +- src/Resources/config/validator.php | 2 +- .../views/CRUD/_email_link.html.twig | 2 +- src/Twig/Extension/BreadcrumbsExtension.php | 4 +- .../Extension/BreadcrumbsExtensionTest.php | 2 +- 15 files changed, 95 insertions(+), 65 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 57e5f55dcd..8f5906bafa 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -2,6 +2,36 @@ All notable changes to this project will be documented in this file. This project adheres to [Semantic Versioning](http://semver.org/). +## [3.98.0](https://github.com/sonata-project/SonataAdminBundle/compare/3.97.0...3.98.0) - 2021-04-27 +### Added +- [[#7118](https://github.com/sonata-project/SonataAdminBundle/pull/7118)] Added `FilterData` to use it for forward compatibility with `4.0`. ([@franmomu](https://github.com/franmomu)) +- [[#7115](https://github.com/sonata-project/SonataAdminBundle/pull/7115)] `TaggedAdmin::setListModes()` ([@VincentLanglet](https://github.com/VincentLanglet)) +- [[#7092](https://github.com/sonata-project/SonataAdminBundle/pull/7092)] Generic template for DatagridBuilderInterface ([@VincentLanglet](https://github.com/VincentLanglet)) +- [[#7092](https://github.com/sonata-project/SonataAdminBundle/pull/7092)] Generic template for LockInterface ([@VincentLanglet](https://github.com/VincentLanglet)) +- [[#7088](https://github.com/sonata-project/SonataAdminBundle/pull/7088)] Added `render_breadcrumbs` and `render_breadcrumbs_for_title` Twig functions to render breadcrumbs. ([@franmomu](https://github.com/franmomu)) + +### Changed +- [[#7112](https://github.com/sonata-project/SonataAdminBundle/pull/7112)] Restrict return type of `ProxyQuery::execute()` method to `array|(\Traversable&\Countable)` ([@VincentLanglet](https://github.com/VincentLanglet)) + +### Deprecated +- [[#7115](https://github.com/sonata-project/SonataAdminBundle/pull/7115)] `TaggedAdmin::showMosaicButton()` ([@VincentLanglet](https://github.com/VincentLanglet)) +- [[#7110](https://github.com/sonata-project/SonataAdminBundle/pull/7110)] `_email_link.html.twig` template, use `display_email.html.twig` instead. ([@VincentLanglet](https://github.com/VincentLanglet)) +- [[#7110](https://github.com/sonata-project/SonataAdminBundle/pull/7110)] Using a `display_*` templates passing a field_description. You should passed the option directly instead. ([@VincentLanglet](https://github.com/VincentLanglet)) +- [[#7088](https://github.com/sonata-project/SonataAdminBundle/pull/7088)] Deprecated overriding the `breadcrumbs_builder` variable passed to Twig templates. ([@franmomu](https://github.com/franmomu)) + +### Fixed +- [[#7103](https://github.com/sonata-project/SonataAdminBundle/pull/7103)] FieldDescriptions options phpdoc to keep only common options. ([@VincentLanglet](https://github.com/VincentLanglet)) +- [[#7121](https://github.com/sonata-project/SonataAdminBundle/pull/7121)] Calling foreach on `ArrayAccess` in ModelToIdPropertyTransformer ([@VincentLanglet](https://github.com/VincentLanglet)) +- [[#7065](https://github.com/sonata-project/SonataAdminBundle/pull/7065)] Fixed "Field "FIELD" has already been rendered" error message when using ModelType ([@epci](https://github.com/epci)) +- [[#7092](https://github.com/sonata-project/SonataAdminBundle/pull/7092)] `DatagridBuilderInterface::addFilter` phpdoc: The `$type` MUST be a class-string. ([@VincentLanglet](https://github.com/VincentLanglet)) +- [[#7092](https://github.com/sonata-project/SonataAdminBundle/pull/7092)] Missing generic template for ModelManagerInterface ([@VincentLanglet](https://github.com/VincentLanglet)) +- [[#7110](https://github.com/sonata-project/SonataAdminBundle/pull/7110)] Stop throwing an error when using a `display_*` templates without passing a field_description. ([@VincentLanglet](https://github.com/VincentLanglet)) +- [[#7093](https://github.com/sonata-project/SonataAdminBundle/pull/7093)] URLs generated at global search results for the list filtering, which were missing the `value` dimension; ([@phansys](https://github.com/phansys)) +- [[#7093](https://github.com/sonata-project/SonataAdminBundle/pull/7093)] Layout for the filter links generated at global search results. ([@phansys](https://github.com/phansys)) + +### Removed +- [[#7100](https://github.com/sonata-project/SonataAdminBundle/pull/7100)] Remove deprecation for `AbstractAdmin::preValidate()` method ([@VincentLanglet](https://github.com/VincentLanglet)) + ## [3.97.0](https://github.com/sonata-project/SonataAdminBundle/compare/3.96.0...3.97.0) - 2021-04-19 ### Added - [[#7033](https://github.com/sonata-project/SonataAdminBundle/pull/7033)] Added "block.admin_preview" block in order to show a preview for admin lists in dashboard ([@phansys](https://github.com/phansys)) diff --git a/UPGRADE-3.x.md b/UPGRADE-3.x.md index 8e8c7478eb..239d96c99d 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.97 to 3.98 +========================= ### Deprecated overriding `breadcrumbs_builder` variable in templates diff --git a/src/DependencyInjection/Admin/AbstractTaggedAdmin.php b/src/DependencyInjection/Admin/AbstractTaggedAdmin.php index d5c104def9..42203b01de 100644 --- a/src/DependencyInjection/Admin/AbstractTaggedAdmin.php +++ b/src/DependencyInjection/Admin/AbstractTaggedAdmin.php @@ -40,7 +40,7 @@ abstract class AbstractTaggedAdmin implements TaggedAdminInterface /** * NEXT_MAJOR: Remove this constant. * - * @deprecated since sonata-project/sonata-admin 3.x, will be removed in 4.0 + * @deprecated since sonata-project/sonata-admin 3.98, will be removed in 4.0 */ public const MOSAIC_ICON_CLASS = 'fa fa-th-large fa-fw'; @@ -271,7 +271,7 @@ public function getLabel() final public function showMosaicButton($isShown) { @trigger_error(sprintf( - 'The method %s() is deprecated since sonata-project/admin-bundle 3.x. Use `setListModes` instead.', + 'The method %s() is deprecated since sonata-project/admin-bundle 3.98. Use `setListModes` instead.', __METHOD__ ), \E_USER_DEPRECATED); diff --git a/src/Resources/config/commands.php b/src/Resources/config/commands.php index 317f7ee15b..dd2b9c3083 100644 --- a/src/Resources/config/commands.php +++ b/src/Resources/config/commands.php @@ -30,7 +30,7 @@ ->set(CreateClassCacheCommand::class, CreateClassCacheCommand::class) // NEXT_MAJOR: Remove public and sonata.container.private tag. ->public() - ->tag(AliasDeprecatedPublicServicesCompilerPass::PRIVATE_TAG_NAME, ['version' => '3.x']) + ->tag(AliasDeprecatedPublicServicesCompilerPass::PRIVATE_TAG_NAME, ['version' => '3.98']) ->tag('console.command', [ 'command' => 'cache:create-cache-class', ]) @@ -46,7 +46,7 @@ ->set('sonata.admin.command.explain', ExplainAdminCommand::class) // NEXT_MAJOR: Remove public and sonata.container.private tag. ->public() - ->tag(AliasDeprecatedPublicServicesCompilerPass::PRIVATE_TAG_NAME, ['version' => '3.x']) + ->tag(AliasDeprecatedPublicServicesCompilerPass::PRIVATE_TAG_NAME, ['version' => '3.98']) ->tag('console.command') ->args([ new ReferenceConfigurator('sonata.admin.pool'), @@ -64,7 +64,7 @@ ->set('sonata.admin.command.generate_object_acl', GenerateObjectAclCommand::class) // NEXT_MAJOR: Remove public and sonata.container.private tag. ->public() - ->tag(AliasDeprecatedPublicServicesCompilerPass::PRIVATE_TAG_NAME, ['version' => '3.x']) + ->tag(AliasDeprecatedPublicServicesCompilerPass::PRIVATE_TAG_NAME, ['version' => '3.98']) ->tag('console.command') ->args([ new ReferenceConfigurator('sonata.admin.pool'), @@ -81,7 +81,7 @@ ->set('sonata.admin.command.list', ListAdminCommand::class) // NEXT_MAJOR: Remove public and sonata.container.private tag. ->public() - ->tag(AliasDeprecatedPublicServicesCompilerPass::PRIVATE_TAG_NAME, ['version' => '3.x']) + ->tag(AliasDeprecatedPublicServicesCompilerPass::PRIVATE_TAG_NAME, ['version' => '3.98']) ->tag('console.command') ->args([ new ReferenceConfigurator('sonata.admin.pool'), @@ -97,7 +97,7 @@ ->set('sonata.admin.command.setup_acl', SetupAclCommand::class) // NEXT_MAJOR: Remove public and sonata.container.private tag. ->public() - ->tag(AliasDeprecatedPublicServicesCompilerPass::PRIVATE_TAG_NAME, ['version' => '3.x']) + ->tag(AliasDeprecatedPublicServicesCompilerPass::PRIVATE_TAG_NAME, ['version' => '3.98']) ->tag('console.command') ->args([ new ReferenceConfigurator('sonata.admin.pool'), diff --git a/src/Resources/config/core.php b/src/Resources/config/core.php index 1f5d2a2ee4..022d019598 100644 --- a/src/Resources/config/core.php +++ b/src/Resources/config/core.php @@ -53,7 +53,7 @@ // NEXT_MAJOR: Remove public and sonata.container.private tag. ->public() // NEXT_MAJOR: Remove alias. - ->tag(AliasDeprecatedPublicServicesCompilerPass::PRIVATE_TAG_NAME, ['version' => '3.x']) + ->tag(AliasDeprecatedPublicServicesCompilerPass::PRIVATE_TAG_NAME, ['version' => '3.98']) ->args([ new ReferenceConfigurator('service_container'), [], // admin service ids @@ -88,7 +88,7 @@ ->set('sonata.admin.route_loader', AdminPoolLoader::class) // NEXT_MAJOR: Remove public and sonata.container.private tag. ->public() - ->tag(AliasDeprecatedPublicServicesCompilerPass::PRIVATE_TAG_NAME, ['version' => '3.x']) + ->tag(AliasDeprecatedPublicServicesCompilerPass::PRIVATE_TAG_NAME, ['version' => '3.98']) ->tag('routing.loader') ->args([ new ReferenceConfigurator('sonata.admin.pool'), @@ -104,7 +104,7 @@ ->set('sonata.admin.helper', AdminHelper::class) // NEXT_MAJOR: Remove public and sonata.container.private tag. ->public() - ->tag(AliasDeprecatedPublicServicesCompilerPass::PRIVATE_TAG_NAME, ['version' => '3.x']) + ->tag(AliasDeprecatedPublicServicesCompilerPass::PRIVATE_TAG_NAME, ['version' => '3.98']) ->args([ new ReferenceConfigurator('property_accessor'), // NEXT_MAJOR: Remove next line. @@ -121,7 +121,7 @@ ->set('sonata.admin.builder.filter.factory', FilterFactory::class) // NEXT_MAJOR: Remove public and sonata.container.private tag. ->public() - ->tag(AliasDeprecatedPublicServicesCompilerPass::PRIVATE_TAG_NAME, ['version' => '3.x']) + ->tag(AliasDeprecatedPublicServicesCompilerPass::PRIVATE_TAG_NAME, ['version' => '3.98']) ->args([ new ReferenceConfigurator('service_container'), [], @@ -139,7 +139,7 @@ ->set('sonata.admin.breadcrumbs_builder', BreadcrumbsBuilder::class) // NEXT_MAJOR: Remove public and sonata.container.private tag. ->public() - ->tag(AliasDeprecatedPublicServicesCompilerPass::PRIVATE_TAG_NAME, ['version' => '3.x']) + ->tag(AliasDeprecatedPublicServicesCompilerPass::PRIVATE_TAG_NAME, ['version' => '3.98']) ->args([ '%sonata.admin.configuration.breadcrumbs%', ]) @@ -161,7 +161,7 @@ ->set('sonata.admin.label.strategy.bc', BCLabelTranslatorStrategy::class) // NEXT_MAJOR: Remove public and sonata.container.private tag. ->public() - ->tag(AliasDeprecatedPublicServicesCompilerPass::PRIVATE_TAG_NAME, ['version' => '3.x']) + ->tag(AliasDeprecatedPublicServicesCompilerPass::PRIVATE_TAG_NAME, ['version' => '3.98']) // NEXT_MAJOR: Remove this alias. ->alias(BCLabelTranslatorStrategy::class, 'sonata.admin.label.strategy.bc') @@ -173,7 +173,7 @@ ->set('sonata.admin.label.strategy.native', NativeLabelTranslatorStrategy::class) // NEXT_MAJOR: Remove public and sonata.container.private tag. ->public() - ->tag(AliasDeprecatedPublicServicesCompilerPass::PRIVATE_TAG_NAME, ['version' => '3.x']) + ->tag(AliasDeprecatedPublicServicesCompilerPass::PRIVATE_TAG_NAME, ['version' => '3.98']) // NEXT_MAJOR: Remove this alias. ->alias(NativeLabelTranslatorStrategy::class, 'sonata.admin.label.strategy.native') @@ -187,7 +187,7 @@ ->set('sonata.admin.label.strategy.noop', NoopLabelTranslatorStrategy::class) // NEXT_MAJOR: Remove public and sonata.container.private tag. ->public() - ->tag(AliasDeprecatedPublicServicesCompilerPass::PRIVATE_TAG_NAME, ['version' => '3.x']) + ->tag(AliasDeprecatedPublicServicesCompilerPass::PRIVATE_TAG_NAME, ['version' => '3.98']) // NEXT_MAJOR: Remove this alias. ->alias(NoopLabelTranslatorStrategy::class, 'sonata.admin.label.strategy.noop') @@ -199,7 +199,7 @@ ->set('sonata.admin.label.strategy.underscore', UnderscoreLabelTranslatorStrategy::class) // NEXT_MAJOR: Remove public and sonata.container.private tag. ->public() - ->tag(AliasDeprecatedPublicServicesCompilerPass::PRIVATE_TAG_NAME, ['version' => '3.x']) + ->tag(AliasDeprecatedPublicServicesCompilerPass::PRIVATE_TAG_NAME, ['version' => '3.98']) // NEXT_MAJOR: Remove this alias. ->alias(UnderscoreLabelTranslatorStrategy::class, 'sonata.admin.label.strategy.underscore') @@ -211,7 +211,7 @@ ->set('sonata.admin.label.strategy.form_component', FormLabelTranslatorStrategy::class) // NEXT_MAJOR: Remove public and sonata.container.private tag. ->public() - ->tag(AliasDeprecatedPublicServicesCompilerPass::PRIVATE_TAG_NAME, ['version' => '3.x']) + ->tag(AliasDeprecatedPublicServicesCompilerPass::PRIVATE_TAG_NAME, ['version' => '3.98']) // NEXT_MAJOR: Remove this alias. ->alias(FormLabelTranslatorStrategy::class, 'sonata.admin.label.strategy.form_component') @@ -224,7 +224,7 @@ ->set('sonata.admin.translator.extractor.jms_translator_bundle', DeprecatedAdminExtractor::class) // NEXT_MAJOR: Remove public and sonata.container.private tag. ->public() - ->tag(AliasDeprecatedPublicServicesCompilerPass::PRIVATE_TAG_NAME, ['version' => '3.x']) + ->tag(AliasDeprecatedPublicServicesCompilerPass::PRIVATE_TAG_NAME, ['version' => '3.98']) ->tag('jms_translation.extractor', [ 'alias' => 'sonata_admin', ]) @@ -260,7 +260,7 @@ ->set('sonata.admin.controller.admin', HelperController::class) // NEXT_MAJOR: Remove public and sonata.container.private tag. ->public() - ->tag(AliasDeprecatedPublicServicesCompilerPass::PRIVATE_TAG_NAME, ['version' => '3.x']) + ->tag(AliasDeprecatedPublicServicesCompilerPass::PRIVATE_TAG_NAME, ['version' => '3.98']) ->deprecate(...BCDeprecationParameters::forConfig( 'The controller service "%service_id%" is deprecated in favor of several action services since sonata-project/admin-bundle 3.38.0 and will be removed in 4.0.', '3.38.0' @@ -276,7 +276,7 @@ ->set('sonata.admin.audit.manager', AuditManager::class) // NEXT_MAJOR: Remove public and sonata.container.private tag. ->public() - ->tag(AliasDeprecatedPublicServicesCompilerPass::PRIVATE_TAG_NAME, ['version' => '3.x']) + ->tag(AliasDeprecatedPublicServicesCompilerPass::PRIVATE_TAG_NAME, ['version' => '3.98']) ->args([ // NEXT_MAJOR: Remove next line. new ReferenceConfigurator('service_container'), @@ -299,7 +299,7 @@ ->set('sonata.admin.exporter', Exporter::class) // NEXT_MAJOR: Remove public and sonata.container.private tag. ->public() - ->tag(AliasDeprecatedPublicServicesCompilerPass::PRIVATE_TAG_NAME, ['version' => '3.x']) + ->tag(AliasDeprecatedPublicServicesCompilerPass::PRIVATE_TAG_NAME, ['version' => '3.98']) ->deprecate(...BCDeprecationParameters::forConfig( 'The service "%service_id%" is deprecated since sonata-project/admin-bundle 3.14.0 and will be removed in 4.0. Use "sonata.exporter.exporter" service instead.', '3.14.0' @@ -308,7 +308,7 @@ ->set('sonata.admin.search.handler', SearchHandler::class) // NEXT_MAJOR: Remove public and sonata.container.private tag. ->public() - ->tag(AliasDeprecatedPublicServicesCompilerPass::PRIVATE_TAG_NAME, ['version' => '3.x']) + ->tag(AliasDeprecatedPublicServicesCompilerPass::PRIVATE_TAG_NAME, ['version' => '3.98']) ->args([ '%sonata.admin.configuration.global_search.case_sensitive%', ]) @@ -323,7 +323,7 @@ ->set('sonata.admin.event.extension', AdminEventExtension::class) // NEXT_MAJOR: Remove public and sonata.container.private tag. ->public() - ->tag(AliasDeprecatedPublicServicesCompilerPass::PRIVATE_TAG_NAME, ['version' => '3.x']) + ->tag(AliasDeprecatedPublicServicesCompilerPass::PRIVATE_TAG_NAME, ['version' => '3.98']) ->tag('sonata.admin.extension', ['global' => true]) ->args([ new ReferenceConfigurator('event_dispatcher'), @@ -339,14 +339,14 @@ ->set('sonata.admin.lock.extension', LockExtension::class) // NEXT_MAJOR: Remove public and sonata.container.private tag. ->public() - ->tag(AliasDeprecatedPublicServicesCompilerPass::PRIVATE_TAG_NAME, ['version' => '3.x']) + ->tag(AliasDeprecatedPublicServicesCompilerPass::PRIVATE_TAG_NAME, ['version' => '3.98']) ->tag('sonata.admin.extension', ['global' => true]) // NEXT_MAJOR: Remove this service definition and alias. ->set('sonata.admin.twig.global', GlobalVariables::class) // NEXT_MAJOR: Remove public and sonata.container.private tag. ->public() - ->tag(AliasDeprecatedPublicServicesCompilerPass::PRIVATE_TAG_NAME, ['version' => '3.x']) + ->tag(AliasDeprecatedPublicServicesCompilerPass::PRIVATE_TAG_NAME, ['version' => '3.98']) ->args([ new ReferenceConfigurator('sonata.admin.pool'), '%sonata.admin.configuration.mosaic_background%', @@ -371,7 +371,7 @@ ->set('sonata.admin.global_template_registry', TemplateRegistry::class) // NEXT_MAJOR: Remove public and sonata.container.private tag. ->public() - ->tag(AliasDeprecatedPublicServicesCompilerPass::PRIVATE_TAG_NAME, ['version' => '3.x']) + ->tag(AliasDeprecatedPublicServicesCompilerPass::PRIVATE_TAG_NAME, ['version' => '3.98']) ->args([ '%sonata.admin.configuration.templates%', ]) diff --git a/src/Resources/config/exporter.php b/src/Resources/config/exporter.php index 458f770ddd..78288310c4 100644 --- a/src/Resources/config/exporter.php +++ b/src/Resources/config/exporter.php @@ -24,7 +24,7 @@ ->set('sonata.admin.admin_exporter', AdminExporter::class) // NEXT_MAJOR: Remove public and sonata.container.private tag. ->public() - ->tag(AliasDeprecatedPublicServicesCompilerPass::PRIVATE_TAG_NAME, ['version' => '3.x']) + ->tag(AliasDeprecatedPublicServicesCompilerPass::PRIVATE_TAG_NAME, ['version' => '3.98']) ->args([ new ReferenceConfigurator('sonata.exporter.exporter'), ]) diff --git a/src/Resources/config/form_types.php b/src/Resources/config/form_types.php index 5de0a74db1..cf298a6535 100644 --- a/src/Resources/config/form_types.php +++ b/src/Resources/config/form_types.php @@ -45,7 +45,7 @@ ->set('sonata.admin.form.type.admin', AdminType::class) // NEXT_MAJOR: Remove public and sonata.container.private tag. ->public() - ->tag(AliasDeprecatedPublicServicesCompilerPass::PRIVATE_TAG_NAME, ['version' => '3.x']) + ->tag(AliasDeprecatedPublicServicesCompilerPass::PRIVATE_TAG_NAME, ['version' => '3.98']) ->tag('form.type', ['alias' => 'sonata_type_admin']) ->args([ new ReferenceConfigurator('sonata.admin.helper'), @@ -54,7 +54,7 @@ ->set('sonata.admin.form.type.model_choice', ModelType::class) // NEXT_MAJOR: Remove public and sonata.container.private tag. ->public() - ->tag(AliasDeprecatedPublicServicesCompilerPass::PRIVATE_TAG_NAME, ['version' => '3.x']) + ->tag(AliasDeprecatedPublicServicesCompilerPass::PRIVATE_TAG_NAME, ['version' => '3.98']) ->tag('form.type', ['alias' => 'sonata_type_model']) ->args([ new ReferenceConfigurator('property_accessor'), @@ -63,43 +63,43 @@ ->set('sonata.admin.form.type.model_list', ModelListType::class) // NEXT_MAJOR: Remove public and sonata.container.private tag. ->public() - ->tag(AliasDeprecatedPublicServicesCompilerPass::PRIVATE_TAG_NAME, ['version' => '3.x']) + ->tag(AliasDeprecatedPublicServicesCompilerPass::PRIVATE_TAG_NAME, ['version' => '3.98']) ->tag('form.type', ['alias' => 'sonata_type_model_list']) ->set('sonata.admin.form.type.model_reference', ModelReferenceType::class) // NEXT_MAJOR: Remove public and sonata.container.private tag. ->public() - ->tag(AliasDeprecatedPublicServicesCompilerPass::PRIVATE_TAG_NAME, ['version' => '3.x']) + ->tag(AliasDeprecatedPublicServicesCompilerPass::PRIVATE_TAG_NAME, ['version' => '3.98']) ->tag('form.type', ['alias' => 'sonata_type_model_reference']) ->set('sonata.admin.form.type.model_hidden', ModelHiddenType::class) // NEXT_MAJOR: Remove public and sonata.container.private tag. ->public() - ->tag(AliasDeprecatedPublicServicesCompilerPass::PRIVATE_TAG_NAME, ['version' => '3.x']) + ->tag(AliasDeprecatedPublicServicesCompilerPass::PRIVATE_TAG_NAME, ['version' => '3.98']) ->tag('form.type', ['alias' => 'sonata_type_model_hidden']) ->set('sonata.admin.form.type.model_autocomplete', ModelAutocompleteType::class) // NEXT_MAJOR: Remove public and sonata.container.private tag. ->public() - ->tag(AliasDeprecatedPublicServicesCompilerPass::PRIVATE_TAG_NAME, ['version' => '3.x']) + ->tag(AliasDeprecatedPublicServicesCompilerPass::PRIVATE_TAG_NAME, ['version' => '3.98']) ->tag('form.type', ['alias' => 'sonata_type_model_autocomplete']) ->set('sonata.admin.form.type.collection', CollectionType::class) // NEXT_MAJOR: Remove public and sonata.container.private tag. ->public() - ->tag(AliasDeprecatedPublicServicesCompilerPass::PRIVATE_TAG_NAME, ['version' => '3.x']) + ->tag(AliasDeprecatedPublicServicesCompilerPass::PRIVATE_TAG_NAME, ['version' => '3.98']) ->tag('form.type', ['alias' => 'sonata_type_native_collection']) ->set('sonata.admin.doctrine_orm.form.type.choice_field_mask', ChoiceFieldMaskType::class) // NEXT_MAJOR: Remove public and sonata.container.private tag. ->public() - ->tag(AliasDeprecatedPublicServicesCompilerPass::PRIVATE_TAG_NAME, ['version' => '3.x']) + ->tag(AliasDeprecatedPublicServicesCompilerPass::PRIVATE_TAG_NAME, ['version' => '3.98']) ->tag('form.type', ['alias' => 'sonata_type_choice_field_mask']) ->set('sonata.admin.form.extension.field', FormTypeFieldExtension::class) // NEXT_MAJOR: Remove public and sonata.container.private tag. ->public() - ->tag(AliasDeprecatedPublicServicesCompilerPass::PRIVATE_TAG_NAME, ['version' => '3.x']) + ->tag(AliasDeprecatedPublicServicesCompilerPass::PRIVATE_TAG_NAME, ['version' => '3.98']) ->tag('form.type_extension', [ 'alias' => 'form', 'extended_type' => FormType::class, @@ -109,7 +109,7 @@ ->set('sonata.admin.form.extension.field.mopa', MopaCompatibilityTypeFieldExtension::class) // NEXT_MAJOR: Remove public and sonata.container.private tag. ->public() - ->tag(AliasDeprecatedPublicServicesCompilerPass::PRIVATE_TAG_NAME, ['version' => '3.x']) + ->tag(AliasDeprecatedPublicServicesCompilerPass::PRIVATE_TAG_NAME, ['version' => '3.98']) ->tag('form.type_extension', [ 'alias' => 'form', 'extended_type' => FormType::class, @@ -118,7 +118,7 @@ ->set('sonata.admin.form.extension.choice', ChoiceTypeExtension::class) // NEXT_MAJOR: Remove public and sonata.container.private tag. ->public() - ->tag(AliasDeprecatedPublicServicesCompilerPass::PRIVATE_TAG_NAME, ['version' => '3.x']) + ->tag(AliasDeprecatedPublicServicesCompilerPass::PRIVATE_TAG_NAME, ['version' => '3.98']) ->tag('form.type_extension', [ 'alias' => 'choice', 'extended_type' => SymfonyChoiceType::class, @@ -127,7 +127,7 @@ ->set('sonata.admin.form.filter.type.number', NumberType::class) // NEXT_MAJOR: Remove public and sonata.container.private tag. ->public() - ->tag(AliasDeprecatedPublicServicesCompilerPass::PRIVATE_TAG_NAME, ['version' => '3.x']) + ->tag(AliasDeprecatedPublicServicesCompilerPass::PRIVATE_TAG_NAME, ['version' => '3.98']) ->tag('form.type', ['alias' => 'sonata_type_filter_number']) ->args([ new ReferenceConfigurator('translator'), @@ -136,7 +136,7 @@ ->set('sonata.admin.form.filter.type.choice', ChoiceType::class) // NEXT_MAJOR: Remove public and sonata.container.private tag. ->public() - ->tag(AliasDeprecatedPublicServicesCompilerPass::PRIVATE_TAG_NAME, ['version' => '3.x']) + ->tag(AliasDeprecatedPublicServicesCompilerPass::PRIVATE_TAG_NAME, ['version' => '3.98']) ->tag('form.type', ['alias' => 'sonata_type_filter_choice']) ->args([ new ReferenceConfigurator('translator'), @@ -145,13 +145,13 @@ ->set('sonata.admin.form.filter.type.default', DefaultType::class) // NEXT_MAJOR: Remove public and sonata.container.private tag. ->public() - ->tag(AliasDeprecatedPublicServicesCompilerPass::PRIVATE_TAG_NAME, ['version' => '3.x']) + ->tag(AliasDeprecatedPublicServicesCompilerPass::PRIVATE_TAG_NAME, ['version' => '3.98']) ->tag('form.type', ['alias' => 'sonata_type_filter_default']) ->set('sonata.admin.form.filter.type.date', DateType::class) // NEXT_MAJOR: Remove public and sonata.container.private tag. ->public() - ->tag(AliasDeprecatedPublicServicesCompilerPass::PRIVATE_TAG_NAME, ['version' => '3.x']) + ->tag(AliasDeprecatedPublicServicesCompilerPass::PRIVATE_TAG_NAME, ['version' => '3.98']) ->tag('form.type', ['alias' => 'sonata_type_filter_date']) ->args([ new ReferenceConfigurator('translator'), @@ -160,7 +160,7 @@ ->set('sonata.admin.form.filter.type.daterange', DateRangeType::class) // NEXT_MAJOR: Remove public and sonata.container.private tag. ->public() - ->tag(AliasDeprecatedPublicServicesCompilerPass::PRIVATE_TAG_NAME, ['version' => '3.x']) + ->tag(AliasDeprecatedPublicServicesCompilerPass::PRIVATE_TAG_NAME, ['version' => '3.98']) ->tag('form.type', ['alias' => 'sonata_type_filter_date_range']) ->args([ new ReferenceConfigurator('translator'), @@ -169,7 +169,7 @@ ->set('sonata.admin.form.filter.type.datetime', DateTimeType::class) // NEXT_MAJOR: Remove public and sonata.container.private tag. ->public() - ->tag(AliasDeprecatedPublicServicesCompilerPass::PRIVATE_TAG_NAME, ['version' => '3.x']) + ->tag(AliasDeprecatedPublicServicesCompilerPass::PRIVATE_TAG_NAME, ['version' => '3.98']) ->tag('form.type', ['alias' => 'sonata_type_filter_datetime']) ->args([ new ReferenceConfigurator('translator'), @@ -178,7 +178,7 @@ ->set('sonata.admin.form.filter.type.datetime_range', DateTimeRangeType::class) // NEXT_MAJOR: Remove public and sonata.container.private tag. ->public() - ->tag(AliasDeprecatedPublicServicesCompilerPass::PRIVATE_TAG_NAME, ['version' => '3.x']) + ->tag(AliasDeprecatedPublicServicesCompilerPass::PRIVATE_TAG_NAME, ['version' => '3.98']) ->tag('form.type', ['alias' => 'sonata_type_filter_datetime_range']) ->args([ new ReferenceConfigurator('translator'), diff --git a/src/Resources/config/menu.php b/src/Resources/config/menu.php index ec5dbaedd8..6a80584504 100644 --- a/src/Resources/config/menu.php +++ b/src/Resources/config/menu.php @@ -30,7 +30,7 @@ ->set('sonata.admin.menu_builder', MenuBuilder::class) // NEXT_MAJOR: Remove public and sonata.container.private tag. ->public() - ->tag(AliasDeprecatedPublicServicesCompilerPass::PRIVATE_TAG_NAME, ['version' => '3.x']) + ->tag(AliasDeprecatedPublicServicesCompilerPass::PRIVATE_TAG_NAME, ['version' => '3.98']) ->args([ new ReferenceConfigurator('sonata.admin.pool'), new ReferenceConfigurator('knp_menu.factory'), @@ -41,7 +41,7 @@ ->set('sonata.admin.sidebar_menu', MenuItem::class) // NEXT_MAJOR: Remove public and sonata.container.private tag. ->public() - ->tag(AliasDeprecatedPublicServicesCompilerPass::PRIVATE_TAG_NAME, ['version' => '3.x']) + ->tag(AliasDeprecatedPublicServicesCompilerPass::PRIVATE_TAG_NAME, ['version' => '3.98']) ->tag('knp_menu.menu', ['alias' => 'sonata_admin_sidebar']) ->factory([ new ReferenceConfigurator('sonata.admin.menu_builder'), @@ -59,7 +59,7 @@ ->set('sonata.admin.menu.matcher.voter.admin', AdminVoter::class) // NEXT_MAJOR: Remove public and sonata.container.private tag. ->public() - ->tag(AliasDeprecatedPublicServicesCompilerPass::PRIVATE_TAG_NAME, ['version' => '3.x']) + ->tag(AliasDeprecatedPublicServicesCompilerPass::PRIVATE_TAG_NAME, ['version' => '3.98']) ->tag('knp_menu.voter') ->args([ new ReferenceConfigurator('request_stack'), @@ -69,7 +69,7 @@ ->set('sonata.admin.menu.matcher.voter.children', ChildrenVoter::class) // NEXT_MAJOR: Remove public and sonata.container.private tag. ->public() - ->tag(AliasDeprecatedPublicServicesCompilerPass::PRIVATE_TAG_NAME, ['version' => '3.x']) + ->tag(AliasDeprecatedPublicServicesCompilerPass::PRIVATE_TAG_NAME, ['version' => '3.98']) ->deprecate(...BCDeprecationParameters::forConfig( 'The "%service_id%" service is deprecated since sonata-project/admin-bundle 3.28 and will be removed in 4.0.', '3.28' @@ -81,6 +81,6 @@ ->set('sonata.admin.menu.matcher.voter.active', ActiveVoter::class) // NEXT_MAJOR: Remove public and sonata.container.private tag. ->public() - ->tag(AliasDeprecatedPublicServicesCompilerPass::PRIVATE_TAG_NAME, ['version' => '3.x']) + ->tag(AliasDeprecatedPublicServicesCompilerPass::PRIVATE_TAG_NAME, ['version' => '3.98']) ->tag('knp_menu.voter'); }; diff --git a/src/Resources/config/route.php b/src/Resources/config/route.php index ba337e53e4..b14566ff83 100644 --- a/src/Resources/config/route.php +++ b/src/Resources/config/route.php @@ -28,7 +28,7 @@ ->set('sonata.admin.route.path_info', PathInfoBuilder::class) // NEXT_MAJOR: Remove public and sonata.container.private tag. ->public() - ->tag(AliasDeprecatedPublicServicesCompilerPass::PRIVATE_TAG_NAME, ['version' => '3.x']) + ->tag(AliasDeprecatedPublicServicesCompilerPass::PRIVATE_TAG_NAME, ['version' => '3.98']) ->args([ new ReferenceConfigurator('sonata.admin.audit.manager'), ]) @@ -36,7 +36,7 @@ ->set('sonata.admin.route.query_string', QueryStringBuilder::class) // NEXT_MAJOR: Remove public and sonata.container.private tag. ->public() - ->tag(AliasDeprecatedPublicServicesCompilerPass::PRIVATE_TAG_NAME, ['version' => '3.x']) + ->tag(AliasDeprecatedPublicServicesCompilerPass::PRIVATE_TAG_NAME, ['version' => '3.98']) ->args([ new ReferenceConfigurator('sonata.admin.audit.manager'), ]) @@ -44,7 +44,7 @@ ->set('sonata.admin.route.default_generator', DefaultRouteGenerator::class) // NEXT_MAJOR: Remove public and sonata.container.private tag. ->public() - ->tag(AliasDeprecatedPublicServicesCompilerPass::PRIVATE_TAG_NAME, ['version' => '3.x']) + ->tag(AliasDeprecatedPublicServicesCompilerPass::PRIVATE_TAG_NAME, ['version' => '3.98']) ->args([ new ReferenceConfigurator('router'), new ReferenceConfigurator('sonata.admin.route.cache'), @@ -53,7 +53,7 @@ ->set('sonata.admin.route.cache', RoutesCache::class) // NEXT_MAJOR: Remove public and sonata.container.private tag. ->public() - ->tag(AliasDeprecatedPublicServicesCompilerPass::PRIVATE_TAG_NAME, ['version' => '3.x']) + ->tag(AliasDeprecatedPublicServicesCompilerPass::PRIVATE_TAG_NAME, ['version' => '3.98']) ->args([ '%kernel.cache_dir%/sonata/admin', '%kernel.debug%', @@ -62,7 +62,7 @@ ->set('sonata.admin.route.cache_warmup', RoutesCacheWarmUp::class) // NEXT_MAJOR: Remove public and sonata.container.private tag. ->public() - ->tag(AliasDeprecatedPublicServicesCompilerPass::PRIVATE_TAG_NAME, ['version' => '3.x']) + ->tag(AliasDeprecatedPublicServicesCompilerPass::PRIVATE_TAG_NAME, ['version' => '3.98']) ->tag('kernel.cache_warmer') ->args([ new ReferenceConfigurator('sonata.admin.route.cache'), diff --git a/src/Resources/config/security.php b/src/Resources/config/security.php index 85199fc9c8..859c8a980d 100644 --- a/src/Resources/config/security.php +++ b/src/Resources/config/security.php @@ -66,7 +66,7 @@ ->set('sonata.admin.manipulator.acl.admin', '%sonata.admin.manipulator.acl.admin.class%') // NEXT_MAJOR: Remove public and sonata.container.private tag. ->public() - ->tag(AliasDeprecatedPublicServicesCompilerPass::PRIVATE_TAG_NAME, ['version' => '3.x']) + ->tag(AliasDeprecatedPublicServicesCompilerPass::PRIVATE_TAG_NAME, ['version' => '3.98']) ->args([ '%sonata.admin.security.mask.builder.class%', ]) @@ -74,7 +74,7 @@ ->set('sonata.admin.object.manipulator.acl.admin', '%sonata.admin.object.manipulator.acl.admin.class%') // NEXT_MAJOR: Remove public and sonata.container.private tag. ->public() - ->tag(AliasDeprecatedPublicServicesCompilerPass::PRIVATE_TAG_NAME, ['version' => '3.x']) + ->tag(AliasDeprecatedPublicServicesCompilerPass::PRIVATE_TAG_NAME, ['version' => '3.98']) ->args([ new ReferenceConfigurator('form.factory'), '%sonata.admin.security.mask.builder.class%', diff --git a/src/Resources/config/twig.php b/src/Resources/config/twig.php index 1636528ab7..45112ef958 100644 --- a/src/Resources/config/twig.php +++ b/src/Resources/config/twig.php @@ -36,7 +36,7 @@ ->set('sonata.admin.twig.extension', SonataAdminExtension::class) // NEXT_MAJOR: Remove public and sonata.container.private tag. ->public() - ->tag(AliasDeprecatedPublicServicesCompilerPass::PRIVATE_TAG_NAME, ['version' => '3.x']) + ->tag(AliasDeprecatedPublicServicesCompilerPass::PRIVATE_TAG_NAME, ['version' => '3.98']) ->tag('twig.extension') ->args([ new ReferenceConfigurator('sonata.admin.pool'), diff --git a/src/Resources/config/validator.php b/src/Resources/config/validator.php index 5b7f1b06c9..d7356fff43 100644 --- a/src/Resources/config/validator.php +++ b/src/Resources/config/validator.php @@ -26,7 +26,7 @@ ->set('sonata.admin.validator.inline', InlineValidator::class) // NEXT_MAJOR: Remove public and sonata.container.private tag. ->public() - ->tag(AliasDeprecatedPublicServicesCompilerPass::PRIVATE_TAG_NAME, ['version' => '3.x']) + ->tag(AliasDeprecatedPublicServicesCompilerPass::PRIVATE_TAG_NAME, ['version' => '3.98']) ->tag('validator.constraint_validator', ['alias' => 'sonata.admin.validator.inline']) ->args([ new ReferenceConfigurator('service_container'), diff --git a/src/Resources/views/CRUD/_email_link.html.twig b/src/Resources/views/CRUD/_email_link.html.twig index 4dfddd582f..c4564611f2 100644 --- a/src/Resources/views/CRUD/_email_link.html.twig +++ b/src/Resources/views/CRUD/_email_link.html.twig @@ -1,5 +1,5 @@ {# NEXT_MAJOR: Remove this template #} -{% deprecated 'The "_email_link.html.twig" is deprecated since sonata-project/admin-bundle 3.x and will be removed in 4.0.' %} +{% deprecated 'The "_email_link.html.twig" is deprecated since sonata-project/admin-bundle 3.98 and will be removed in 4.0.' %} {%- if value is empty -%}   {%- elseif field_description.option('as_string', false) -%} diff --git a/src/Twig/Extension/BreadcrumbsExtension.php b/src/Twig/Extension/BreadcrumbsExtension.php index 08a21559e8..60675578e9 100644 --- a/src/Twig/Extension/BreadcrumbsExtension.php +++ b/src/Twig/Extension/BreadcrumbsExtension.php @@ -65,7 +65,7 @@ public function renderBreadcrumbs( if (null !== $breadcrumbsBuilderForBC && \get_class($breadcrumbsBuilderForBC) !== \get_class($this->breadcrumbsBuilder)) { @trigger_error( 'Overriding "breadcrumbs_builder" parameter in twig templates is deprecated since' - .' sonata-project/admin-bundle version 3.x and this parameter will be removed in 4.0.' + .' sonata-project/admin-bundle version 3.98 and this parameter will be removed in 4.0.' .' Use "sonata.admin.breadcrumbs_builder" service instead.', \E_USER_DEPRECATED ); @@ -93,7 +93,7 @@ public function renderBreadcrumbsForTitle( if (null !== $breadcrumbsBuilderForBC && \get_class($breadcrumbsBuilderForBC) !== \get_class($this->breadcrumbsBuilder)) { @trigger_error( 'Overriding "breadcrumbs_builder" parameter in twig templates is deprecated since' - .' sonata-project/admin-bundle version 3.x and this parameter will be removed in 4.0.' + .' sonata-project/admin-bundle version 3.98 and this parameter will be removed in 4.0.' .' Use "sonata.admin.breadcrumbs_builder" service instead.', \E_USER_DEPRECATED ); diff --git a/tests/Twig/Extension/BreadcrumbsExtensionTest.php b/tests/Twig/Extension/BreadcrumbsExtensionTest.php index 9533457a66..00d41da4a9 100644 --- a/tests/Twig/Extension/BreadcrumbsExtensionTest.php +++ b/tests/Twig/Extension/BreadcrumbsExtensionTest.php @@ -218,7 +218,7 @@ public function buildBreadcrumbs(AdminInterface $admin, $action, ?ItemInterface ->expects($this->never()) ->method('getBreadcrumbs'); - $this->expectDeprecation('Overriding "breadcrumbs_builder" parameter in twig templates is deprecated since sonata-project/admin-bundle version 3.x and this parameter will be removed in 4.0. Use "sonata.admin.breadcrumbs_builder" service instead.'); + $this->expectDeprecation('Overriding "breadcrumbs_builder" parameter in twig templates is deprecated since sonata-project/admin-bundle version 3.98 and this parameter will be removed in 4.0. Use "sonata.admin.breadcrumbs_builder" service instead.'); $this->breadcrumbsExtension->renderBreadcrumbs( $this->environment, From 92ce9cf72b83c39df446426f32e3d3f96b44e829 Mon Sep 17 00:00:00 2001 From: Vincent Langlet Date: Tue, 27 Apr 2021 17:48:40 +0200 Subject: [PATCH 02/11] Update CHANGELOG.md Co-authored-by: Javier Spagnoletti --- CHANGELOG.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 8f5906bafa..b6d8706fd1 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -4,7 +4,7 @@ This project adheres to [Semantic Versioning](http://semver.org/). ## [3.98.0](https://github.com/sonata-project/SonataAdminBundle/compare/3.97.0...3.98.0) - 2021-04-27 ### Added -- [[#7118](https://github.com/sonata-project/SonataAdminBundle/pull/7118)] Added `FilterData` to use it for forward compatibility with `4.0`. ([@franmomu](https://github.com/franmomu)) +- [[#7118](https://github.com/sonata-project/SonataAdminBundle/pull/7118)] Added `FilterData` to use it for forward compatibility with `4.0` ([@franmomu](https://github.com/franmomu)) - [[#7115](https://github.com/sonata-project/SonataAdminBundle/pull/7115)] `TaggedAdmin::setListModes()` ([@VincentLanglet](https://github.com/VincentLanglet)) - [[#7092](https://github.com/sonata-project/SonataAdminBundle/pull/7092)] Generic template for DatagridBuilderInterface ([@VincentLanglet](https://github.com/VincentLanglet)) - [[#7092](https://github.com/sonata-project/SonataAdminBundle/pull/7092)] Generic template for LockInterface ([@VincentLanglet](https://github.com/VincentLanglet)) From a0915b69d0a145572f5a1ff996e66902e59717d4 Mon Sep 17 00:00:00 2001 From: Vincent Langlet Date: Tue, 27 Apr 2021 17:48:48 +0200 Subject: [PATCH 03/11] Update CHANGELOG.md Co-authored-by: Javier Spagnoletti --- CHANGELOG.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index b6d8706fd1..4a2e501510 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -16,7 +16,7 @@ This project adheres to [Semantic Versioning](http://semver.org/). ### Deprecated - [[#7115](https://github.com/sonata-project/SonataAdminBundle/pull/7115)] `TaggedAdmin::showMosaicButton()` ([@VincentLanglet](https://github.com/VincentLanglet)) - [[#7110](https://github.com/sonata-project/SonataAdminBundle/pull/7110)] `_email_link.html.twig` template, use `display_email.html.twig` instead. ([@VincentLanglet](https://github.com/VincentLanglet)) -- [[#7110](https://github.com/sonata-project/SonataAdminBundle/pull/7110)] Using a `display_*` templates passing a field_description. You should passed the option directly instead. ([@VincentLanglet](https://github.com/VincentLanglet)) +- [[#7110](https://github.com/sonata-project/SonataAdminBundle/pull/7110)] Using `display_*` templates passing a field_description, you SHOULD pass the option directly instead ([@VincentLanglet](https://github.com/VincentLanglet)) - [[#7088](https://github.com/sonata-project/SonataAdminBundle/pull/7088)] Deprecated overriding the `breadcrumbs_builder` variable passed to Twig templates. ([@franmomu](https://github.com/franmomu)) ### Fixed From 69b9bdf0d9d28d5332d841b4153a9a60024b2575 Mon Sep 17 00:00:00 2001 From: Vincent Langlet Date: Tue, 27 Apr 2021 17:48:54 +0200 Subject: [PATCH 04/11] Update CHANGELOG.md Co-authored-by: Javier Spagnoletti --- CHANGELOG.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 4a2e501510..188220e503 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -20,7 +20,7 @@ This project adheres to [Semantic Versioning](http://semver.org/). - [[#7088](https://github.com/sonata-project/SonataAdminBundle/pull/7088)] Deprecated overriding the `breadcrumbs_builder` variable passed to Twig templates. ([@franmomu](https://github.com/franmomu)) ### Fixed -- [[#7103](https://github.com/sonata-project/SonataAdminBundle/pull/7103)] FieldDescriptions options phpdoc to keep only common options. ([@VincentLanglet](https://github.com/VincentLanglet)) +- [[#7103](https://github.com/sonata-project/SonataAdminBundle/pull/7103)] FieldDescriptions options phpdoc to keep only common options ([@VincentLanglet](https://github.com/VincentLanglet)) - [[#7121](https://github.com/sonata-project/SonataAdminBundle/pull/7121)] Calling foreach on `ArrayAccess` in ModelToIdPropertyTransformer ([@VincentLanglet](https://github.com/VincentLanglet)) - [[#7065](https://github.com/sonata-project/SonataAdminBundle/pull/7065)] Fixed "Field "FIELD" has already been rendered" error message when using ModelType ([@epci](https://github.com/epci)) - [[#7092](https://github.com/sonata-project/SonataAdminBundle/pull/7092)] `DatagridBuilderInterface::addFilter` phpdoc: The `$type` MUST be a class-string. ([@VincentLanglet](https://github.com/VincentLanglet)) From 089c28ab3a8dbc90aa3e2719b8cce78dd958d4cf Mon Sep 17 00:00:00 2001 From: Vincent Langlet Date: Tue, 27 Apr 2021 17:48:58 +0200 Subject: [PATCH 05/11] Update CHANGELOG.md Co-authored-by: Javier Spagnoletti --- CHANGELOG.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 188220e503..06477c88aa 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -25,7 +25,7 @@ This project adheres to [Semantic Versioning](http://semver.org/). - [[#7065](https://github.com/sonata-project/SonataAdminBundle/pull/7065)] Fixed "Field "FIELD" has already been rendered" error message when using ModelType ([@epci](https://github.com/epci)) - [[#7092](https://github.com/sonata-project/SonataAdminBundle/pull/7092)] `DatagridBuilderInterface::addFilter` phpdoc: The `$type` MUST be a class-string. ([@VincentLanglet](https://github.com/VincentLanglet)) - [[#7092](https://github.com/sonata-project/SonataAdminBundle/pull/7092)] Missing generic template for ModelManagerInterface ([@VincentLanglet](https://github.com/VincentLanglet)) -- [[#7110](https://github.com/sonata-project/SonataAdminBundle/pull/7110)] Stop throwing an error when using a `display_*` templates without passing a field_description. ([@VincentLanglet](https://github.com/VincentLanglet)) +- [[#7110](https://github.com/sonata-project/SonataAdminBundle/pull/7110)] Stop throwing an error when using `display_*` templates without passing a field_description ([@VincentLanglet](https://github.com/VincentLanglet)) - [[#7093](https://github.com/sonata-project/SonataAdminBundle/pull/7093)] URLs generated at global search results for the list filtering, which were missing the `value` dimension; ([@phansys](https://github.com/phansys)) - [[#7093](https://github.com/sonata-project/SonataAdminBundle/pull/7093)] Layout for the filter links generated at global search results. ([@phansys](https://github.com/phansys)) From 3fdd8c76ada0f43ada075053104d3811a1898c5d Mon Sep 17 00:00:00 2001 From: Vincent Langlet Date: Tue, 27 Apr 2021 17:49:03 +0200 Subject: [PATCH 06/11] Update CHANGELOG.md Co-authored-by: Javier Spagnoletti --- CHANGELOG.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 06477c88aa..eca1a8d0aa 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -27,7 +27,7 @@ This project adheres to [Semantic Versioning](http://semver.org/). - [[#7092](https://github.com/sonata-project/SonataAdminBundle/pull/7092)] Missing generic template for ModelManagerInterface ([@VincentLanglet](https://github.com/VincentLanglet)) - [[#7110](https://github.com/sonata-project/SonataAdminBundle/pull/7110)] Stop throwing an error when using `display_*` templates without passing a field_description ([@VincentLanglet](https://github.com/VincentLanglet)) - [[#7093](https://github.com/sonata-project/SonataAdminBundle/pull/7093)] URLs generated at global search results for the list filtering, which were missing the `value` dimension; ([@phansys](https://github.com/phansys)) -- [[#7093](https://github.com/sonata-project/SonataAdminBundle/pull/7093)] Layout for the filter links generated at global search results. ([@phansys](https://github.com/phansys)) +- [[#7093](https://github.com/sonata-project/SonataAdminBundle/pull/7093)] Layout for the filter links generated at global search results ([@phansys](https://github.com/phansys)) ### Removed - [[#7100](https://github.com/sonata-project/SonataAdminBundle/pull/7100)] Remove deprecation for `AbstractAdmin::preValidate()` method ([@VincentLanglet](https://github.com/VincentLanglet)) From f2342205d79673f1141c2e42878c24cb29270525 Mon Sep 17 00:00:00 2001 From: Vincent Langlet Date: Tue, 27 Apr 2021 17:49:09 +0200 Subject: [PATCH 07/11] Update CHANGELOG.md Co-authored-by: Javier Spagnoletti --- CHANGELOG.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index eca1a8d0aa..a254aa868b 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -26,7 +26,7 @@ This project adheres to [Semantic Versioning](http://semver.org/). - [[#7092](https://github.com/sonata-project/SonataAdminBundle/pull/7092)] `DatagridBuilderInterface::addFilter` phpdoc: The `$type` MUST be a class-string. ([@VincentLanglet](https://github.com/VincentLanglet)) - [[#7092](https://github.com/sonata-project/SonataAdminBundle/pull/7092)] Missing generic template for ModelManagerInterface ([@VincentLanglet](https://github.com/VincentLanglet)) - [[#7110](https://github.com/sonata-project/SonataAdminBundle/pull/7110)] Stop throwing an error when using `display_*` templates without passing a field_description ([@VincentLanglet](https://github.com/VincentLanglet)) -- [[#7093](https://github.com/sonata-project/SonataAdminBundle/pull/7093)] URLs generated at global search results for the list filtering, which were missing the `value` dimension; ([@phansys](https://github.com/phansys)) +- [[#7093](https://github.com/sonata-project/SonataAdminBundle/pull/7093)] URLs generated at global search results for the list filtering, which were missing the `value` dimension ([@phansys](https://github.com/phansys)) - [[#7093](https://github.com/sonata-project/SonataAdminBundle/pull/7093)] Layout for the filter links generated at global search results ([@phansys](https://github.com/phansys)) ### Removed From 7d73b5b9c80c7645174b07df4c70c8792c43aea0 Mon Sep 17 00:00:00 2001 From: Vincent Langlet Date: Tue, 27 Apr 2021 17:49:15 +0200 Subject: [PATCH 08/11] Update CHANGELOG.md Co-authored-by: Javier Spagnoletti --- CHANGELOG.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index a254aa868b..957ce2d144 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -23,7 +23,7 @@ This project adheres to [Semantic Versioning](http://semver.org/). - [[#7103](https://github.com/sonata-project/SonataAdminBundle/pull/7103)] FieldDescriptions options phpdoc to keep only common options ([@VincentLanglet](https://github.com/VincentLanglet)) - [[#7121](https://github.com/sonata-project/SonataAdminBundle/pull/7121)] Calling foreach on `ArrayAccess` in ModelToIdPropertyTransformer ([@VincentLanglet](https://github.com/VincentLanglet)) - [[#7065](https://github.com/sonata-project/SonataAdminBundle/pull/7065)] Fixed "Field "FIELD" has already been rendered" error message when using ModelType ([@epci](https://github.com/epci)) -- [[#7092](https://github.com/sonata-project/SonataAdminBundle/pull/7092)] `DatagridBuilderInterface::addFilter` phpdoc: The `$type` MUST be a class-string. ([@VincentLanglet](https://github.com/VincentLanglet)) +- [[#7092](https://github.com/sonata-project/SonataAdminBundle/pull/7092)] `DatagridBuilderInterface::addFilter` phpdoc: The `$type` MUST be a class-string ([@VincentLanglet](https://github.com/VincentLanglet)) - [[#7092](https://github.com/sonata-project/SonataAdminBundle/pull/7092)] Missing generic template for ModelManagerInterface ([@VincentLanglet](https://github.com/VincentLanglet)) - [[#7110](https://github.com/sonata-project/SonataAdminBundle/pull/7110)] Stop throwing an error when using `display_*` templates without passing a field_description ([@VincentLanglet](https://github.com/VincentLanglet)) - [[#7093](https://github.com/sonata-project/SonataAdminBundle/pull/7093)] URLs generated at global search results for the list filtering, which were missing the `value` dimension ([@phansys](https://github.com/phansys)) From 0f256a3ae0cb4ea4376e4b37fbf4f1b610cf8d93 Mon Sep 17 00:00:00 2001 From: Vincent Langlet Date: Tue, 27 Apr 2021 17:49:20 +0200 Subject: [PATCH 09/11] Update CHANGELOG.md Co-authored-by: Javier Spagnoletti --- CHANGELOG.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 957ce2d144..c26c110b7f 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -17,7 +17,7 @@ This project adheres to [Semantic Versioning](http://semver.org/). - [[#7115](https://github.com/sonata-project/SonataAdminBundle/pull/7115)] `TaggedAdmin::showMosaicButton()` ([@VincentLanglet](https://github.com/VincentLanglet)) - [[#7110](https://github.com/sonata-project/SonataAdminBundle/pull/7110)] `_email_link.html.twig` template, use `display_email.html.twig` instead. ([@VincentLanglet](https://github.com/VincentLanglet)) - [[#7110](https://github.com/sonata-project/SonataAdminBundle/pull/7110)] Using `display_*` templates passing a field_description, you SHOULD pass the option directly instead ([@VincentLanglet](https://github.com/VincentLanglet)) -- [[#7088](https://github.com/sonata-project/SonataAdminBundle/pull/7088)] Deprecated overriding the `breadcrumbs_builder` variable passed to Twig templates. ([@franmomu](https://github.com/franmomu)) +- [[#7088](https://github.com/sonata-project/SonataAdminBundle/pull/7088)] Deprecated overriding the `breadcrumbs_builder` variable passed to Twig templates ([@franmomu](https://github.com/franmomu)) ### Fixed - [[#7103](https://github.com/sonata-project/SonataAdminBundle/pull/7103)] FieldDescriptions options phpdoc to keep only common options ([@VincentLanglet](https://github.com/VincentLanglet)) From 27f823cb2febe3da398ed293a95f7a9e373085d6 Mon Sep 17 00:00:00 2001 From: Vincent Langlet Date: Tue, 27 Apr 2021 17:49:24 +0200 Subject: [PATCH 10/11] Update CHANGELOG.md Co-authored-by: Javier Spagnoletti --- CHANGELOG.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index c26c110b7f..b4fd6ee3bf 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -8,7 +8,7 @@ This project adheres to [Semantic Versioning](http://semver.org/). - [[#7115](https://github.com/sonata-project/SonataAdminBundle/pull/7115)] `TaggedAdmin::setListModes()` ([@VincentLanglet](https://github.com/VincentLanglet)) - [[#7092](https://github.com/sonata-project/SonataAdminBundle/pull/7092)] Generic template for DatagridBuilderInterface ([@VincentLanglet](https://github.com/VincentLanglet)) - [[#7092](https://github.com/sonata-project/SonataAdminBundle/pull/7092)] Generic template for LockInterface ([@VincentLanglet](https://github.com/VincentLanglet)) -- [[#7088](https://github.com/sonata-project/SonataAdminBundle/pull/7088)] Added `render_breadcrumbs` and `render_breadcrumbs_for_title` Twig functions to render breadcrumbs. ([@franmomu](https://github.com/franmomu)) +- [[#7088](https://github.com/sonata-project/SonataAdminBundle/pull/7088)] Added `render_breadcrumbs` and `render_breadcrumbs_for_title` Twig functions to render breadcrumbs ([@franmomu](https://github.com/franmomu)) ### Changed - [[#7112](https://github.com/sonata-project/SonataAdminBundle/pull/7112)] Restrict return type of `ProxyQuery::execute()` method to `array|(\Traversable&\Countable)` ([@VincentLanglet](https://github.com/VincentLanglet)) From e912bb4b808ca955c8ca59a5a20c4be7703f73cb Mon Sep 17 00:00:00 2001 From: Vincent Langlet Date: Tue, 27 Apr 2021 18:05:46 +0200 Subject: [PATCH 11/11] Update CHANGELOG.md Co-authored-by: Javier Spagnoletti --- CHANGELOG.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index b4fd6ee3bf..368394a87d 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -15,7 +15,7 @@ This project adheres to [Semantic Versioning](http://semver.org/). ### Deprecated - [[#7115](https://github.com/sonata-project/SonataAdminBundle/pull/7115)] `TaggedAdmin::showMosaicButton()` ([@VincentLanglet](https://github.com/VincentLanglet)) -- [[#7110](https://github.com/sonata-project/SonataAdminBundle/pull/7110)] `_email_link.html.twig` template, use `display_email.html.twig` instead. ([@VincentLanglet](https://github.com/VincentLanglet)) +- [[#7110](https://github.com/sonata-project/SonataAdminBundle/pull/7110)] `_email_link.html.twig` template, use `display_email.html.twig` instead ([@VincentLanglet](https://github.com/VincentLanglet)) - [[#7110](https://github.com/sonata-project/SonataAdminBundle/pull/7110)] Using `display_*` templates passing a field_description, you SHOULD pass the option directly instead ([@VincentLanglet](https://github.com/VincentLanglet)) - [[#7088](https://github.com/sonata-project/SonataAdminBundle/pull/7088)] Deprecated overriding the `breadcrumbs_builder` variable passed to Twig templates ([@franmomu](https://github.com/franmomu))