Merge 12ddf48 into afe359f

sonata-project · Feb 15, 2020 · 7a091d7 · 7a091d7
2 parents afe359f + 12ddf48
commit 7a091d7
Show file tree

Hide file tree

Showing 4 changed files with 91 additions and 22 deletions.
diff --git a/src/Block/Service/AbstractCategoriesBlockService.php b/src/Block/Service/AbstractCategoriesBlockService.php
@@ -44,14 +44,33 @@ abstract class AbstractCategoriesBlockService extends AbstractClassificationBloc
     private $categoryAdmin;
 
     /**
-     * @param string $name
+     * @param string|Environment                               $twigOrDeprecatedName
+     * @param EngineInterface|ContextManagerInterface          $contextManagerOrDeprecatedTemplating
+     * @param ContextManagerInterface|CategoryManagerInterface $categoryManagerOrDeprecatedContextManager
+     * @param CategoryManagerInterface|AdminInterface          $categoryAdminOrDeprecatedCategoryManager
+     * @param AdminInterface|null                              $deprecatedCategoryAdmin
      */
-    public function __construct($name, EngineInterface $templating, ContextManagerInterface $contextManager, CategoryManagerInterface $categoryManager, AdminInterface $categoryAdmin)
+    public function __construct($twigOrDeprecatedName, $contextManagerOrDeprecatedTemplating, $categoryManagerOrDeprecatedContextManager, $categoryAdminOrDeprecatedCategoryManager, $deprecatedCategoryAdmin = null)
     {
-        parent::__construct($name, $templating, $contextManager);
-
-        $this->categoryManager = $categoryManager;
-        $this->categoryAdmin = $categoryAdmin;
+        // NEXT_MAJOR: remove the if block
+        if (\is_string($twigOrDeprecatedName)) {
+            parent::__construct(
+                $twigOrDeprecatedName,
+                $contextManagerOrDeprecatedTemplating,
+                $categoryManagerOrDeprecatedContextManager
+            );
+
+            $this->categoryManager = $categoryAdminOrDeprecatedCategoryManager;
+            $this->categoryAdmin = $deprecatedCategoryAdmin;
+        } else {
+            parent::__construct(
+                $twigOrDeprecatedName,
+                $contextManagerOrDeprecatedTemplating
+            );
+
+            $this->categoryManager = $categoryManagerOrDeprecatedContextManager;
+            $this->categoryAdmin = $categoryAdminOrDeprecatedCategoryManager;
+        }
     }
 
     public function execute(BlockContextInterface $blockContext, Response $response = null)

diff --git a/src/Block/Service/AbstractClassificationBlockService.php b/src/Block/Service/AbstractClassificationBlockService.php
@@ -22,6 +22,7 @@
 use Sonata\ClassificationBundle\Model\ContextManagerInterface;
 use Symfony\Bundle\FrameworkBundle\Templating\EngineInterface;
 use Symfony\Component\Form\FormBuilder;
+use Twig\Environment;
 
 /**
  * @author Christian Gripp <mail@core23.de>
@@ -34,13 +35,22 @@ abstract class AbstractClassificationBlockService extends AbstractAdminBlockServ
     protected $contextManager;
 
     /**
-     * @param string $name
+     * @param string|Environment                      $twigOrDeprecatedName
+     * @param EngineInterface|ContextManagerInterface $contextManagerOrDeprecatedTemplating
+     * @param ContextManagerInterface|null            $deprecatedContextManager
      */
-    public function __construct($name, EngineInterface $templating, ContextManagerInterface $contextManager)
+    public function __construct($twigOrDeprecatedName, $contextManagerOrDeprecatedTemplating, $deprecatedContextManager = null)
     {
-        parent::__construct($name, $templating);
+        // NEXT_MAJOR: remove the if block
+        if (\is_string($twigOrDeprecatedName)) {
+            parent::__construct($twigOrDeprecatedName, $contextManagerOrDeprecatedTemplating);
 
-        $this->contextManager = $contextManager;
+            $this->contextManager = $deprecatedContextManager;
+        } else {
+            parent::__construct($twigOrDeprecatedName);
+
+            $this->contextManager = $contextManagerOrDeprecatedTemplating;
+        }
     }
 
     /**

diff --git a/src/Block/Service/AbstractCollectionsBlockService.php b/src/Block/Service/AbstractCollectionsBlockService.php
@@ -44,14 +44,35 @@ abstract class AbstractCollectionsBlockService extends AbstractClassificationBlo
     private $collectionAdmin;
 
     /**
-     * @param string $name
+     * AbstractCollectionsBlockService constructor.
+     *
+     * @param string|Environment                                 $twigOrDeprecatedName
+     * @param EngineInterface|ContextManagerInterface            $contextManagerOrDeprecatedTemplating
+     * @param ContextManagerInterface|CollectionManagerInterface $collectionManagerOrDeprecatedContextManager
+     * @param CollectionManagerInterface|AdminInterface          $collectionManagerOrcollectionAdminOrDeprecatedTagManager
+     * @param AdminInterface|null                                $deprecatedCollectionAdmin
      */
-    public function __construct($name, EngineInterface $templating, ContextManagerInterface $contextManager, CollectionManagerInterface $collectionManager, AdminInterface $collectionAdmin)
+    public function __construct($twigOrDeprecatedName, $contextManagerOrDeprecatedTemplating, $collectionManagerOrDeprecatedContextManager, $collectionManagerOrcollectionAdminOrDeprecatedTagManager, $deprecatedCollectionAdmin = null)
     {
-        parent::__construct($name, $templating, $contextManager);
-
-        $this->collectionManager = $collectionManager;
-        $this->collectionAdmin = $collectionAdmin;
+        // NEXT_MAJOR: remove the if block
+        if (\is_string($twigOrDeprecatedName)) {
+            parent::__construct(
+                $twigOrDeprecatedName,
+                $contextManagerOrDeprecatedTemplating,
+                $collectionManagerOrDeprecatedContextManager
+            );
+
+            $this->collectionManager = $collectionManagerOrcollectionAdminOrDeprecatedTagManager;
+            $this->collectionAdmin = $deprecatedCollectionAdmin;
+        } else {
+            parent::__construct(
+                $twigOrDeprecatedName,
+                $contextManagerOrDeprecatedTemplating
+            );
+
+            $this->collectionManager = $collectionManagerOrDeprecatedContextManager;
+            $this->collectionAdmin = $collectionManagerOrcollectionAdminOrDeprecatedTagManager;
+        }
     }
 
     public function execute(BlockContextInterface $blockContext, Response $response = null)

diff --git a/src/Block/Service/AbstractTagsBlockService.php b/src/Block/Service/AbstractTagsBlockService.php
@@ -44,14 +44,33 @@ abstract class AbstractTagsBlockService extends AbstractClassificationBlockServi
     private $tagAdmin;
 
     /**
-     * @param string $name
+     * @param string|Environment                           $twigOrDeprecatedName
+     * @param EngineInterface|ContextManagerInterface      $contextManagerOrDeprecatedTemplating
+     * @param ContextManagerInterface|TagManagerInterface| $tagManagerOrDeprecatedContextManager
+     * @param TagManagerInterface|AdminInterface           $tagAdminOrDeprecatedTagManager
+     * @param AdminInterface|null                          $deprecatedTagAdmin
      */
-    public function __construct($name, EngineInterface $templating, ContextManagerInterface $contextManager, TagManagerInterface $tagManager, AdminInterface $tagAdmin)
+    public function __construct($twigOrDeprecatedName, $contextManagerOrDeprecatedTemplating, $tagManagerOrDeprecatedContextManager, $tagAdminOrDeprecatedTagManager, $deprecatedTagAdmin = null)
     {
-        parent::__construct($name, $templating, $contextManager);
-
-        $this->tagManager = $tagManager;
-        $this->tagAdmin = $tagAdmin;
+        // NEXT_MAJOR: remove the if block
+        if (\is_string($twigOrDeprecatedName)) {
+            parent::__construct(
+                $twigOrDeprecatedName,
+                $contextManagerOrDeprecatedTemplating,
+                $tagManagerOrDeprecatedContextManager
+            );
+
+            $this->tagManager = $tagAdminOrDeprecatedTagManager;
+            $this->tagAdmin = $deprecatedTagAdmin;
+        } else {
+            parent::__construct(
+                $twigOrDeprecatedName,
+                $contextManagerOrDeprecatedTemplating
+            );
+
+            $this->tagManager = $tagManagerOrDeprecatedContextManager;
+            $this->tagAdmin = $tagAdminOrDeprecatedTagManager;
+        }
     }
 
     public function execute(BlockContextInterface $blockContext, Response $response = null)