8000 fixed Twig deprecations notive · symfony/symfony@9dd07b0 · GitHub
[go: up one dir, main page]
Skip to content

Commit 9dd07b0

Browse files
fabpotfabpot
committed
fixed Twig deprecations notive
1 parent 297a017 commit 9dd07b0

File tree

8 files changed

+38
-30
lines changed

8 files changed

+38
-30
lines changed

‎src/Symfony/Bridge/Twig/Extension/FormExtension.php

Lines changed: 5 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@
1212
namespace Symfony\Bridge\Twig\Extension;
1313

1414
use Symfony\Bridge\Twig\TokenParser\FormThemeTokenParser;
15-
use Symfony\Bridge\Twig\Form\TwigRendererInterface;
15+
use Symfony\Bridge\Twig\Form\TwigRenderer;
1616
use Symfony\Component\Form\Extension\Core\View\ChoiceView;
1717

1818
/**
@@ -27,21 +27,22 @@ class FormExtension extends \Twig_Extension
2727
* This property is public so that it can be accessed directly from compiled
2828
* templates without having to call a getter, which slightly decreases performance.
2929
*
30-
* @var TwigRendererInterface
30+
* @var TwigRenderer
3131
*/
3232
public $renderer;
3333

34-
public function __construct(TwigRendererInterface $renderer)
34+
public function __construct(TwigRenderer $renderer)
3535
{
3636
$this->renderer = $renderer;
3737
}
3838

3939
/**
4040
* {@inheritdoc}
41+
*
42+
* @deprecated Deprecated in 2.8, to be removed in 3.0.
4143
*/
4244
public function initRuntime(\Twig_Environment $environment)
4345
{
44-
$this->renderer->setEnvironment($environment);
4546
}
4647

4748
/**

‎src/Symfony/Bridge/Twig/Form/TwigRenderer.php

Lines changed: 3 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -19,23 +19,17 @@
1919
*/
2020
class TwigRenderer extends FormRenderer implements TwigRendererInterface
2121
{
22-
/**
23-
* @var TwigRendererEngineInterface
24-
*/
25-
private $engine;
26-
27-
public function __construct(TwigRendererEngineInterface $engine, CsrfProviderInterface $csrfProvider = null)
22+
public function __construct(TwigRendererEngine $engine, CsrfProviderInterface $csrfProvider = null)
2823
{
2924
parent::__construct($engine, $csrfProvider);
30-
31-
$this->engine = $engine;
3225
}
3326

3427
/**
3528
* {@inheritdoc}
29+
*
30+
* @deprecated Deprecated in 2.8, to be removed in 3.0.
3631
*/
3732
public function setEnvironment(\Twig_Environment $environment)
3833
{
39-
$this->engine->setEnvironment($environment);
4034
}
4135
}

‎src/Symfony/Bridge/Twig/Form/TwigRendererEngine.php

Lines changed: 7 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -29,12 +29,18 @@ class TwigRendererEngine extends AbstractRendererEngine implements TwigRendererE
2929
*/
3030
private $template;
3131

32+
public function __construct(array $defaultThemes = array(), \Twig_Environment $environment)
33+
{
34+
parent::__construct($defaultThemes);
35+
36+
$this->environment = $environment;
37+
}
38+
3239
/**
3340
* {@inheritdoc}
3441
*/
3542
public function setEnvironment(\Twig_Environment $environment)
3643
{
37-
$this->environment = $environment;
3844
}
3945

4046
/**

‎src/Symfony/Bridge/Twig/Form/TwigRendererEngineInterface.php

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -15,6 +15,8 @@
1515

1616
/**
1717
* @author Bernhard Schussek <bschussek@gmail.com>
18+
*
19+
* @deprecated Deprecated in 2.8, to be removed in 3.0.
1820
*/
1921
interface TwigRendererEngineInterface extends FormRendererEngineInterface
2022
{

‎src/Symfony/Bridge/Twig/Form/TwigRendererInterface.php

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -15,6 +15,8 @@
1515

1616
/**
1717
* @author Bernhard Schussek <bschussek@gmail.com>
18+
*
19+
* @deprecated Deprecated in 2.8, to be removed in 3.0.
1820
*/
1921
interface TwigRendererInterface extends FormRendererInterface
2022
{

‎src/Symfony/Bridge/Twig/Tests/Extension/FormExtensionDivLayoutTest.php

Lines changed: 9 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -32,14 +32,6 @@ protected function setUp()
3232
{
3333
parent::setUp();
3434

35-
$rendererEngine = new TwigRendererEngine(array(
36-
'form_div_layout.html.twig',
37-
'custom_widgets.html.twig',
38-
));
39-
$renderer = new TwigRenderer($rendererEngine, $this->getMock('Symfony\Component\Form\Extension\Csrf\CsrfProvider\CsrfProviderInterface'));
40-
41-
$this->extension = new FormExtension($renderer);
42-
4335
$loader = new StubFilesystemLoader(array(
4436
__DIR__.'/../../Resources/views/Form',
4537
__DIR__.'/Fixtures/templates/form',
@@ -50,6 +42,15 @@ protected function setUp()
5042
$environment->addGlobal('global', '');
5143
// the value can be any template that exists
5244
$environment->addGlobal('dynamic_template_name', 'child_label');
45+
46+
$rendererEngine = new TwigRendererEngine(array(
47+
'form_div_layout.html.twig',
48+
'custom_widgets.html.twig',
49+
), $environment);
50+
$renderer = new TwigRenderer($rendererEngine, $this->getMock('Symfony\Component\Form\Extension\Csrf\CsrfProvider\CsrfProviderInterface'));
51+
52+
$this->extension = new FormExtension($renderer);
53+
5354
$environment->addExtension($this->extension);
5455

5556
$this->extension->initRuntime($environment);

‎src/Symfony/Bridge/Twig/Tests/Extension/FormExtensionTableLayoutTest.php

Lines changed: 9 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -31,14 +31,6 @@ protected function setUp()
3131
{
3232
parent::setUp();
3333

34-
$rendererEngine = new TwigRendererEngine(array(
35-
'form_table_layout.html.twig',
36-
'custom_widgets.html.twig',
37-
));
38-
$renderer = new TwigRenderer($rendererEngine, $this->getMock('Symfony\Component\Form\Extension\Csrf\CsrfProvider\CsrfProviderInterface'));
39-
40-
$this->extension = new FormExtension($renderer);
41-
4234
$loader = new StubFilesystemLoader(array(
4335
__DIR__.'/../../Resources/views/Form',
4436
__DIR__.'/Fixtures/templates/form',
@@ -47,6 +39,15 @@ protected function setUp()
4739
$environment = new \Twig_Environment($loader, array('strict_variables' => true));
4840
$environment->addExtension(new TranslationExtension(new StubTranslator()));
4941
$environment->addGlobal('global', '');
42+
43+
$rendererEngine = new TwigRendererEngine(array(
44+
'form_table_layout.html.twig',
45+
'custom_widgets.html.twig',
46+
), $environment);
47+
$renderer = new TwigRenderer($rendererEngine, $this->getMock('Symfony\Component\Form\Extension\Csrf\CsrfProvider\CsrfProviderInterface'));
48+
49+
$this->extension = new FormExtension($renderer);
50+
5051
$environment->addExtension($this->extension);
5152

5253
$this->extension->initRuntime($environment);

‎src/Symfony/Bundle/TwigBundle/Resources/config/twig.xml< 78F0 /a>

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -97,6 +97,7 @@
9797

9898
<service id="twig.form.engine" class="%twig.form.engine.class%" public="false">
9999
<argument>%twig.form.resources%</argument>
100+
<argument type="service" id="twig" />
100101
</service>
101102

102103
<service id="twig.form.renderer" class="%twig.form.renderer.class%" public="false">

0 commit comments

Comments
 (0)
0