From 72cff95e75b0b89e3c693deb2a87bffa704d8f2a Mon Sep 17 00:00:00 2001 From: core23 Date: Wed, 25 Dec 2019 21:32:20 +0100 Subject: [PATCH] Remove block deprecations --- .../AbstractCategoriesBlockService.php | 38 ++++++++++++++---- .../AbstractClassificationBlockService.php | 23 ++++++++--- .../AbstractCollectionsBlockService.php | 40 +++++++++++++++---- .../Service/AbstractTagsBlockService.php | 38 ++++++++++++++---- 4 files changed, 113 insertions(+), 26 deletions(-) diff --git a/src/Block/Service/AbstractCategoriesBlockService.php b/src/Block/Service/AbstractCategoriesBlockService.php index 8ff0e4cc..b1018d9a 100755 --- a/src/Block/Service/AbstractCategoriesBlockService.php +++ b/src/Block/Service/AbstractCategoriesBlockService.php @@ -44,14 +44,38 @@ 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) - { - parent::__construct($name, $templating, $contextManager); - - $this->categoryManager = $categoryManager; - $this->categoryAdmin = $categoryAdmin; + public function __construct( + $twigOrDeprecatedName, + $contextManagerOrDeprecatedTemplating, + $categoryManagerOrDeprecatedContextManager, + $categoryAdminOrDeprecatedCategoryManager, + $deprecatedCategoryAdmin = null + ) { + // 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 index ab18ba09..cbc686c8 100644 --- 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 @@ -34,13 +35,25 @@ 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) - { - parent::__construct($name, $templating); + public function __construct( + $twigOrDeprecatedName, + $contextManagerOrDeprecatedTemplating, + $deprecatedContextManager = null + ) { + // NEXT_MAJOR: remove the if block + if (\is_string($twigOrDeprecatedName)) { + parent::__construct($twigOrDeprecatedName, $contextManagerOrDeprecatedTemplating); + + $this->contextManager = $deprecatedContextManager; + } else { + parent::__construct($twigOrDeprecatedName); - $this->contextManager = $contextManager; + $this->contextManager = $contextManagerOrDeprecatedTemplating; + } } /** diff --git a/src/Block/Service/AbstractCollectionsBlockService.php b/src/Block/Service/AbstractCollectionsBlockService.php index 87779778..b088a7cc 100755 --- a/src/Block/Service/AbstractCollectionsBlockService.php +++ b/src/Block/Service/AbstractCollectionsBlockService.php @@ -44,14 +44,40 @@ 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 $collectionAdminOrDeprecatedCollectionManager + * @param AdminInterface|null $deprecatedCollectionAdmin */ - public function __construct($name, EngineInterface $templating, ContextManagerInterface $contextManager, CollectionManagerInterface $collectionManager, AdminInterface $collectionAdmin) - { - parent::__construct($name, $templating, $contextManager); - - $this->collectionManager = $collectionManager; - $this->collectionAdmin = $collectionAdmin; + public function __construct( + $twigOrDeprecatedName, + $contextManagerOrDeprecatedTemplating, + $collectionManagerOrDeprecatedContextManager, + $collectionAdminOrDeprecatedCollectionManager, + $deprecatedCollectionAdmin = null + ) { + // NEXT_MAJOR: remove the if block + if (\is_string($twigOrDeprecatedName)) { + parent::__construct( + $twigOrDeprecatedName, + $contextManagerOrDeprecatedTemplating, + $collectionManagerOrDeprecatedContextManager + ); + + $this->collectionManager = $collectionAdminOrDeprecatedCollectionManager; + $this->collectionAdmin = $deprecatedCollectionAdmin; + } else { + parent::__construct( + $twigOrDeprecatedName, + $contextManagerOrDeprecatedTemplating + ); + + $this->collectionManager = $collectionManagerOrDeprecatedContextManager; + $this->collectionAdmin = $collectionAdminOrDeprecatedCollectionManager; + } } public function execute(BlockContextInterface $blockContext, Response $response = null) diff --git a/src/Block/Service/AbstractTagsBlockService.php b/src/Block/Service/AbstractTagsBlockService.php index 92cd7b9b..8ba187c0 100755 --- a/src/Block/Service/AbstractTagsBlockService.php +++ b/src/Block/Service/AbstractTagsBlockService.php @@ -44,14 +44,38 @@ 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) - { - parent::__construct($name, $templating, $contextManager); - - $this->tagManager = $tagManager; - $this->tagAdmin = $tagAdmin; + public function __construct( + $twigOrDeprecatedName, + $contextManagerOrDeprecatedTemplating, + $tagManagerOrDeprecatedContextManager, + $tagAdminOrDeprecatedTagManager, + $deprecatedTagAdmin = null + ) { + // 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)