Skip to content

Do not extends extension marked as final #352

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
XWB merged 1 commit into from
Nov 29, 2019
Merged

Do not extends extension marked as final #352

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion DependencyInjection/TranslationExtension.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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);
}

/**
Expand Down
6 changes: 3 additions & 3 deletions Resources/config/edit_in_place.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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' }

33 changes: 13 additions & 20 deletions Twig/EditInPlaceExtension.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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;

/**
Expand All @@ -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']]),
];
}

Expand All @@ -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}
*/
Expand Down