From 2e56fb160085fc800bb63f564160611eb5e45e4f Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Wojciech=20B=C5=82oszyk?= Date: Mon, 30 Mar 2020 12:51:01 +0200 Subject: [PATCH] Add support for BlockBundle 4.x --- composer.json | 4 ++-- src/Block/Service/AbstractTagsBlockService.php | 10 +++++----- 2 files changed, 7 insertions(+), 7 deletions(-) diff --git a/composer.json b/composer.json index 261b94e9..be206907 100644 --- a/composer.json +++ b/composer.json @@ -41,13 +41,13 @@ "conflict": { "friendsofsymfony/rest-bundle": "<2.1 || >=3.0", "jms/serializer": "<0.13", - "sonata-project/block-bundle": "<3.14 || >=4.0", + "sonata-project/block-bundle": "<3.14", "sonata-project/media-bundle": "<3.17 || >=4.0" }, "require-dev": { "friendsofsymfony/rest-bundle": "^2.1", "jms/serializer-bundle": "^1.0 || ^2.0", - "sonata-project/block-bundle": "^3.16.1", + "sonata-project/block-bundle": "^3.16.1 || ^4.0", "sonata-project/media-bundle": "^3.17", "symfony/phpunit-bridge": "^5.0" }, diff --git a/src/Block/Service/AbstractTagsBlockService.php b/src/Block/Service/AbstractTagsBlockService.php index 8ba187c0..eb22d26e 100755 --- a/src/Block/Service/AbstractTagsBlockService.php +++ b/src/Block/Service/AbstractTagsBlockService.php @@ -44,11 +44,11 @@ abstract class AbstractTagsBlockService extends AbstractClassificationBlockServi private $tagAdmin; /** - * @param string|Environment $twigOrDeprecatedName - * @param EngineInterface|ContextManagerInterface $contextManagerOrDeprecatedTemplating - * @param ContextManagerInterface|TagManagerInterface| $tagManagerOrDeprecatedContextManager - * @param TagManagerInterface|AdminInterface $tagAdminOrDeprecatedTagManager - * @param AdminInterface|null $deprecatedTagAdmin + * @param string|Environment $twigOrDeprecatedName + * @param EngineInterface|ContextManagerInterface $contextManagerOrDeprecatedTemplating + * @param ContextManagerInterface|TagManagerInterface $tagManagerOrDeprecatedContextManager + * @param TagManagerInterface|AdminInterface $tagAdminOrDeprecatedTagManager + * @param AdminInterface|null $deprecatedTagAdmin */ public function __construct( $twigOrDeprecatedName,