Add support for BlockBundle 4.x

sonata-project · Mar 30, 2020 · 2e56fb1 · 2e56fb1
1 parent 76570e9
commit 2e56fb1
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 7 deletions.
diff --git 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
@@ -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,