Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
Original file line number Diff line number Diff line change
Expand Up @@ -15,12 +15,31 @@
use Symfony\Component\DependencyInjection\ContainerBuilder;
use Symfony\Component\DependencyInjection\Reference;

class MissingExtensionSuggestorPass implements CompilerPassInterface
{
/** @return void */
public function process(ContainerBuilder $container)
if (!method_exists(ContainerBuilder::class, 'getAutoconfiguredAttributes')) {
class MissingExtensionSuggestorPass implements CompilerPassInterface
{
if ($container->getParameter('kernel.debug')) {
public function process(ContainerBuilder $container): void
{
if (!$container->getParameter('kernel.debug')) {
return;
}
$twigDefinition = $container->getDefinition('twig');
$twigDefinition
->addMethodCall('registerUndefinedFilterCallback', [[new Reference('twig.missing_extension_suggestor'), 'suggestFilter']])
->addMethodCall('registerUndefinedFunctionCallback', [[new Reference('twig.missing_extension_suggestor'), 'suggestFunction']])
->addMethodCall('registerUndefinedTokenParserCallback', [[new Reference('twig.missing_extension_suggestor'), 'suggestTag']])
;
}
}
} else {
class MissingExtensionSuggestorPass implements CompilerPassInterface
{
/** @return void */
public function process(ContainerBuilder $container)
{
if (!$container->getParameter('kernel.debug')) {
return;
}
$twigDefinition = $container->getDefinition('twig');
$twigDefinition
->addMethodCall('registerUndefinedFilterCallback', [[new Reference('twig.missing_extension_suggestor'), 'suggestFilter']])
Expand Down
27 changes: 25 additions & 2 deletions extra/twig-extra-bundle/DependencyInjection/TwigExtraExtension.php
Original file line number Diff line number Diff line change
Expand Up @@ -18,13 +18,36 @@
use Symfony\Component\DependencyInjection\Loader\PhpFileLoader;
use Twig\Extra\TwigExtraBundle\Extensions;

if (!method_exists(ContainerBuilder::class, 'getAutoconfiguredAttributes')) {
/** @internal */
trait TwigExtraExtensionTrait
{
public function load(array $configs, ContainerBuilder $container): void
Comment thread
fabpot marked this conversation as resolved.
{
$this->doLoad($configs, $container);
}
}
} else {
/** @internal */
trait TwigExtraExtensionTrait
{
/** @return void */
public function load(array $configs, ContainerBuilder $container)
{
$this->doLoad($configs, $container);
}
}

}

/**
* @author Fabien Potencier <fabien@symfony.com>
*/
class TwigExtraExtension extends Extension
{
/** @return void */
public function load(array $configs, ContainerBuilder $container)
use TwigExtraExtensionTrait;

private function doLoad(array $configs, ContainerBuilder $container): void
{
$loader = new PhpFileLoader($container, new FileLocator(\dirname(__DIR__).'/Resources/config'));
$configuration = $this->getConfiguration($configs, $container);
Expand Down
24 changes: 18 additions & 6 deletions extra/twig-extra-bundle/TwigExtraBundle.php
Original file line number Diff line number Diff line change
Expand Up @@ -15,13 +15,25 @@
use Symfony\Component\HttpKernel\Bundle\Bundle;
use Twig\Extra\TwigExtraBundle\DependencyInjection\Compiler\MissingExtensionSuggestorPass;

class TwigExtraBundle extends Bundle
{
/** @return void */
public function build(ContainerBuilder $container)
if (!method_exists(ContainerBuilder::class, 'getAutoconfiguredAttributes')) {
class TwigExtraBundle extends Bundle
{
parent::build($container);
public function build(ContainerBuilder $container): void
{
parent::build($container);

$container->addCompilerPass(new MissingExtensionSuggestorPass());
$container->addCompilerPass(new MissingExtensionSuggestorPass());
}
}
} else {
class TwigExtraBundle extends Bundle
{
/** @return void */
public function build(ContainerBuilder $container)
{
parent::build($container);

$container->addCompilerPass(new MissingExtensionSuggestorPass());
}
}
}