Skip to content

Commit 7afda1d

Browse files
Merge pull request #7 from joesenova/upgrade/twig_v3
Upgraded bundle to work with Twig3
2 parents d8d6520 + 4bddc76 commit 7afda1d

File tree

2 files changed

+9
-7
lines changed

2 files changed

+9
-7
lines changed

DependencyInjection/Configuration.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@ class Configuration implements ConfigurationInterface
1414
/**
1515
* {@inheritDoc}
1616
*/
17-
public function getConfigTreeBuilder()
17+
public function getConfigTreeBuilder(): TreeBuilder
1818
{
1919
$treeBuilder = new TreeBuilder('stephane_collot_datetimepicker');
2020
// Symfony/config > 4.1||5.*

Twig/Extension/FormExtension.php

Lines changed: 8 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -13,13 +13,15 @@
1313

1414
use Symfony\Component\Form\FormView;
1515
use Symfony\Component\Form\FormRenderer;
16+
use Twig\Extension\AbstractExtension;
17+
use Twig\TwigFunction;
1618

1719
/**
1820
* FormExtension extends Twig with form capabilities.
1921
*
2022
* @author Olivier Chauvel <olivier@generation-multiple.com>
2123
*/
22-
class FormExtension extends \Twig_Extension
24+
class FormExtension extends AbstractExtension
2325
{
2426
/**
2527
* This property is public so that it can be accessed directly from compiled
@@ -37,11 +39,11 @@ public function __construct(FormRenderer $renderer)
3739
/**
3840
* {@inheritdoc}
3941
*/
40-
public function getFunctions()
42+
public function getFunctions(): array
4143
{
4244
return array(
43-
new \Twig_SimpleFunction('form_javascript', array($this, 'renderJavascript'), array('is_safe' => array('html'))),
44-
new \Twig_SimpleFunction('form_stylesheet', null, array('node_class' => 'Symfony\Bridge\Twig\Node\SearchAndRenderBlockNode', 'is_safe' => array('html'))),
45+
new TwigFunction('form_javascript', array($this, 'renderJavascript'), array('is_safe' => array('html'))),
46+
new TwigFunction('form_stylesheet', null, array('node_class' => 'Symfony\Bridge\Twig\Node\SearchAndRenderBlockNode', 'is_safe' => array('html'))),
4547
);
4648
}
4749

@@ -53,7 +55,7 @@ public function getFunctions()
5355
*
5456
* @return string
5557
*/
56-
public function renderJavascript(FormView $view, $prototype = false)
58+
public function renderJavascript(FormView $view, $prototype = false): string
5759
{
5860
$block = $prototype ? 'javascript_prototype' : 'javascript';
5961

@@ -63,7 +65,7 @@ public function renderJavascript(FormView $view, $prototype = false)
6365
/**
6466
* {@inheritdoc}
6567
*/
66-
public function getName()
68+
public function getName(): string
6769
{
6870
return 'collot.twig.extension.form';
6971
}

0 commit comments

Comments
 (0)