8000 deprecated some obsolete interfaces · symfony/symfony@e6a18b3 · GitHub
[go: up one dir, main page]
Skip to content

Commit e6a18b3

Browse files
fabpotfabpot
committed
deprecated some obsolete interfaces
1 parent 0be0277 commit e6a18b3

9 files changed

+47
-45
lines changed

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

Lines changed: 4 additions & 12 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
/**
@@ -21,29 +21,21 @@
2121
* @author Fabien Potencier <fabien@symfony.com>
2222
* @author Bernhard Schussek <bschussek@gmail.com>
2323
*/
24-
class FormExtension extends \Twig_Extension implements \Twig_Extension_InitRuntimeInterface
24+
class FormExtension extends \Twig_Extension
2525
{
2626
/**
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

39-
/**
40-
* {@inheritdoc}
41-
*/
42-
public function initRuntime(\Twig_Environment $environment)
43-
{
44-
$this->renderer->setEnvironment($environment);
45-
}
46-
4739
/**
4840
* {@inheritdoc}
4941
*/

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

Lines changed: 2 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -18,23 +18,17 @@
1818
*/
1919
class TwigRenderer extends FormRenderer implements TwigRendererInterface
2020
{
21-
/**
22-
* @var TwigRendererEngineInterface
23-
*/
24-
private $engine;
25-
2621
public function __construct(TwigRendererEngineInterface $engine, $csrfTokenManager = null)
2722
{
2823
parent::__construct($engine, $csrfTokenManager);
29-
30-
$this->engine = $engine;
3124
}
3225

3326
/**
3427
* {@inheritdoc}
28+
*
29+
* @deprecated Deprecated in 2.8, to be removed in 3.0.
3530
*/
3631
public function setEnvironment(\Twig_Environment $environment)
3732
{
38-
$this->engine->setEnvironment($environment);
3933
}
4034
}

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

Lines changed: 9 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -29,12 +29,20 @@ 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}
41+
*
42+
* @deprecated Deprecated in 2.8, to be removed in 3.0.
3443
*/
3544
public function setEnvironment(\Twig_Environment $environment)
3645
{
37-
$this->environment = $environment;
3846
}
3947

4048
/**

‎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/FormExtensionBootstrap3LayoutTest.php

Lines changed: 9 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -35,21 +35,22 @@ protected function setUp()
3535
{
3636
parent::setUp();
3737

38-
$rendererEngine = new TwigRendererEngine(array(
39-
'bootstrap_3_layout.html.twig',
40-
'custom_widgets.html.twig',
41-
));
42-
$renderer = new TwigRenderer($rendererEngine, $this->getMock('Symfony\Component\Security\Csrf\CsrfTokenManagerInterface'));
43-
44-
$this->extension = new FormExtension($renderer);
45-
4638
$loader = new StubFilesystemLoader(array(
4739
__DIR__.'/../../Resources/views/Form',
4840
__DIR__.'/Fixtures/templates/form',
4941
));
5042

5143
$environment = new \Twig_Environment($loader, array('strict_variables' => true));
5244
$environment->addExtension(new TranslationExtension(new StubTranslator()));
45+
46+
$rendererEngine = new TwigRendererEngine(array(
47+
'bootstrap_3_layout.html.twig',
48+
'custom_widgets.html.twig',
49+
), $environment);
50+
$renderer = new TwigRenderer($rendererEngine, $this->getMock('Symfony\Component\Security\Csrf\CsrfTokenManagerInterface'));
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/FormExtensionDivLayoutTest.php

Lines changed: 9 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -36,14 +36,6 @@ protected function setUp()
3636
{
3737
parent::setUp();
3838

39-
$rendererEngine = new TwigRendererEngine(array(
40-
'form_div_layout.html.twig',
41-
'custom_widgets.html.twig',
42-
));
43-
$renderer = new TwigRenderer($rendererEngine, $this->getMock('Symfony\Component\Security\Csrf\CsrfTokenManagerInterface'));
44-
45-
$this->extension = new FormExtension($renderer);
46-
4739
$loader = new StubFilesystemLoader(array(
4840
__DIR__.'/../../Resources/views/Form',
4941
__DIR__.'/Fixtures/templates/form',
@@ -54,6 +46,15 @@ protected function setUp()
5446
$environment->addGlobal('global', '');
5547
// the value can be any template that exists
5648
$environment->addGlobal('dynamic_template_name', 'child_label');
49+
50+
$rendererEngine = new TwigRendererEngine(array(
51+
'form_div_layout.html.twig',
52+
'custom_widgets.html.twig',
53+
), $environment);
54+
$renderer = new TwigRenderer($rendererEngine, $this->getMock('Symfony\Component\Security\Csrf\CsrfTokenManagerInterface'));
55+
56+
$this->extension = new FormExtension($renderer);
57+
5758
$environment->addExtension($this->extension);
5859

5960
$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
@@ -35,14 +35,6 @@ protected function setUp()
3535
{
3636
parent::setUp();
3737

38-
$rendererEngine = new TwigRendererEngine(array(
39-
'form_table_layout.html.twig',
40-
'custom_widgets.html.twig',
41-
));
42-
$renderer = new TwigRenderer($rendererEngine, $this->getMock('Symfony\Component\Security\Csrf\CsrfTokenManagerInterface'));
43-
44-
$this->extension = new FormExtension($renderer);
45-
4638
$loader = new StubFilesystemLoader(array(
4739
__DIR__.'/../../Resources/views/Form',
4840
__DIR__.'/Fixtures/templates/form',
@@ -51,6 +43,15 @@ protected function setUp()
5143
$environment = new \Twig_Environment($loader, array('strict_variables' => true));
5244
$environment->addExtension(new TranslationExtension(new StubTranslator()));
5345
$environment->addGlobal('global', '');
46+
47+
$rendererEngine = new TwigRendererEngine(array(
48+
'form_table_layout.html.twig',
49+
'custom_widgets.html.twig',
50+
), $environment);
51+
$renderer = new TwigRenderer($rendererEngine, $this->getMock('Symfony\Component\Security\Csrf\CsrfTokenManagerInterface'));
52+
53+
$this->extension = new FormExtension($renderer);
54+
5455
$environment->addExtension($this->extension);
5556

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

‎src/Symfony/Bundle/TwigBundle/Resources/config/twig.xml

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

151151
<service id="twig.form.engine" class="%twig.form.engine.class%" public="false">
152152
<argument>%twig.form.resources%</argument>
153+
<argument type="service" id="twig" />
153154
</service>
154155

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

0 commit comments

Comments
 (0)
0