Merge pull request #352 from odolbeau/correct-extension

Do not extends extension marked as final

Author: XWB

DependencyInjection/TranslationExtension.php

@@ -190,7 +190,7 @@ private function enableEditInPlace(ContainerBuilder $container, array $config):
         $def->replaceArgument(1, $activatorRef);
 
         $def = $container->getDefinition('php_translation.edit_in_place.extension.trans');
-        $def->addMethodCall('setActivator', [$activatorRef]);
+        $def->replaceArgument(2, $activatorRef);
     }
 
     /**

Resources/config/edit_in_place.yml

@@ -26,9 +26,9 @@ services:
     public: false
     class: Translation\Bundle\Twig\EditInPlaceExtension
     arguments:
-      - '@php_translator.edit_in_place.xtrans_html_translator'
-    calls:
-      - [setRequestStack, ['@request_stack']]
+      - '@twig.extension.trans'
+      - '@request_stack'
+      - ~
     tags:
       - { name: 'twig.extension' }
 

Twig/EditInPlaceExtension.php

@@ -11,8 +11,10 @@
 
 namespace Translation\Bundle\Twig;
 
+use Symfony\Bridge\Twig\Extension\TranslationExtension;
 use Symfony\Component\HttpFoundation\RequestStack;
 use Translation\Bundle\EditInPlace\ActivatorInterface;
+use Twig\Extension\AbstractExtension;
 use Twig\TwigFilter;
 
 /**
@@ -21,26 +23,27 @@
  *
  * @author Damien Alexandre <dalexandre@jolicode.com>
  */
-final class EditInPlaceExtension extends \Symfony\Bridge\Twig\Extension\TranslationExtension
+final class EditInPlaceExtension extends AbstractExtension
 {
-    /**
-     * @var ActivatorInterface
-     */
+    private $extension;
+    private $requestStack;
     private $activator;
 
-    /**
-     * @var RequestStack
-     */
-    private $requestStack;
+    public function __construct(TranslationExtension $extension, RequestStack $requestStack, ActivatorInterface $activator)
+    {
+        $this->extension = $extension;
+        $this->requestStack = $requestStack;
+        $this->activator = $activator;
+    }
 
     /**
      * {@inheritdoc}
      */
     public function getFilters(): array
     {
         return [
-            new TwigFilter('trans', [$this, 'trans'], ['is_safe_callback' => [$this, 'isSafe']]),
-            new TwigFilter('transchoice', [$this, 'transchoice'], ['is_safe_callback' => [$this, 'isSafe']]),
+            new TwigFilter('trans', [$this->extension, 'trans'], ['is_safe_callback' => [$this, 'isSafe']]),
+            new TwigFilter('transchoice', [$this->extension, 'transchoice'], ['is_safe_callback' => [$this, 'isSafe']]),
         ];
     }
 
@@ -52,16 +55,6 @@ public function isSafe($node): array
         return $this->activator->checkRequest($this->requestStack->getMasterRequest()) ? ['html'] : [];
     }
 
-    public function setActivator(ActivatorInterface $activator): void
-    {
-        $this->activator = $activator;
-    }
-
-    public function setRequestStack(RequestStack $requestStack): void
-    {
-        $this->requestStack = $requestStack;
-    }
-
     /**
      * {@inheritdoc}
      */