Drop unnesessary constructor

sonata-project · May 8, 2020 · 7dd12dd · 7dd12dd
1 parent 5b5115a
commit 7dd12dd
Show file tree

Hide file tree

Showing 3 changed files with 2 additions and 11 deletions.
diff --git a/src/Block/BlockContextManager.php b/src/Block/BlockContextManager.php
@@ -153,7 +153,7 @@ public function get($meta, array $settings = [])
      */
     protected function setDefaultSettings(OptionsResolverInterface $optionsResolver, BlockInterface $block)
     {
-        if (__CLASS__ !== \get_called_class()) {
+        if (__CLASS__ !== static::class) {
             @trigger_error(
                 'The '.__METHOD__.' is deprecated since version 2.3, to be renamed in 4.0.'
                 .' Use '.__CLASS__.'::configureSettings instead.',

diff --git a/src/Block/Service/AbstractAdminBlockService.php b/src/Block/Service/AbstractAdminBlockService.php
@@ -17,7 +17,6 @@
 use Sonata\BlockBundle\Meta\Metadata;
 use Sonata\BlockBundle\Model\BlockInterface;
 use Sonata\CoreBundle\Validator\ErrorElement;
-use Symfony\Component\Templating\EngineInterface;
 
 @trigger_error(
     'The '.__NAMESPACE__.'\AbstractAdminBlockService class is deprecated since sonata-project/block-bundle 3.16 '.
@@ -32,14 +31,6 @@
  */
 abstract class AbstractAdminBlockService extends AbstractBlockService implements AdminBlockServiceInterface
 {
-    /**
-     * @param string $name
-     */
-    public function __construct($name, EngineInterface $templating)
-    {
-        parent::__construct($name, $templating);
-    }
-
     public function buildCreateForm(FormMapper $formMapper, BlockInterface $block)
     {
         $this->buildEditForm($formMapper, $block);

diff --git a/src/Block/Service/AbstractBlockService.php b/src/Block/Service/AbstractBlockService.php
@@ -48,7 +48,7 @@ abstract class AbstractBlockService implements BlockServiceInterface
      *
      * @param Environment|EngineInterface|string $templatingOrDeprecatedName
      */
-    public function __construct($templatingOrDeprecatedName = null, EngineInterface $templating = null)
+    public function __construct($templatingOrDeprecatedName = null, ?EngineInterface $templating = null)
     {
         // $this->twig = $twig;
         // NEXT_MAJOR: Uncomment the previous assignment and remove the following lines in this method.