Thanks to visit codestin.com
Credit goes to github.com

Skip to content

Commit 584c4d5

Browse files
fabpotfabpot
committed
feature #31800 Removed support for PHP templating everywhere (yceruto)
This PR was merged into the 5.0-dev branch. Discussion ---------- Removed support for PHP templating everywhere | Q | A | ------------- | --- | Branch? | master | Bug fix? | no | New feature? | no | BC breaks? | no | Deprecations? | no | Tests pass? | yes | Fixed tickets | - | License | MIT | Doc PR | - Ref: #21035 and 7169f4d **TODO:** Missing deprecations in 4.4 (#31800): - [x] `Symfony\Bundle\FrameworkBundle\Controller\TemplateController` 2nd argument. - [x] `Symfony\Bundle\TwigBundle\CacheWarmer\TemplateCacheCacheWarmer` class and service. **Labels:** `FrameworkBundle`, `TwigBundle`, `TwigBridge`, `SecurityBundle`, `Form`, `HttpKernel` Friendly ping @fabpot and @dunglas Commits ------- d5be373 Removed support for PHP templating everywhere
2 parents 5e293d9 + d5be373 commit 584c4d5

File tree

128 files changed

+80
-5873
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

128 files changed

+80
-5873
lines changed

‎src/Symfony/Bridge/Twig/CHANGELOG.md

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,11 @@
11
CHANGELOG
22
=========
33

4+
5.0.0
5+
-----
6+
7+
* removed `TwigEngine` class, use `\Twig\Environment` instead.
8+
49
4.4.0
510
-----
611

‎src/Symfony/Bridge/Twig/Tests/Extension/Fixtures/StubFilesystemLoader.php

Lines changed: 0 additions & 25 deletions
This file was deleted.

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

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -14,11 +14,11 @@
1414
use Symfony\Bridge\Twig\Extension\FormExtension;
1515
use Symfony\Bridge\Twig\Extension\TranslationExtension;
1616
use Symfony\Bridge\Twig\Form\TwigRendererEngine;
17-
use Symfony\Bridge\Twig\Tests\Extension\Fixtures\StubFilesystemLoader;
1817
use Symfony\Bridge\Twig\Tests\Extension\Fixtures\StubTranslator;
1918
use Symfony\Component\Form\FormRenderer;
2019
use Symfony\Component\Form\FormView;
2120
use Twig\Environment;
21+
use Twig\Loader\FilesystemLoader;
2222

2323
class FormExtensionBootstrap3HorizontalLayoutTest extends AbstractBootstrap3HorizontalLayoutTest
2424
{
@@ -37,7 +37,7 @@ protected function setUp()
3737
{
3838
parent::setUp();
3939

40-
$loader = new StubFilesystemLoader([
40+
$loader = new FilesystemLoader([
4141
__DIR__.'/../../Resources/views/Form',
4242
__DIR__.'/Fixtures/templates/form',
4343
]);

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

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -14,11 +14,11 @@
1414
use Symfony\Bridge\Twig\Extension\FormExtension;
1515
use Symfony\Bridge\Twig\Extension\TranslationExtension;
1616
use Symfony\Bridge\Twig\Form\TwigRendererEngine;
17-
use Symfony\Bridge\Twig\Tests\Extension\Fixtures\StubFilesystemLoader;
1817
use Symfony\Bridge\Twig\Tests\Extension\Fixtures\StubTranslator;
1918
use Symfony\Component\Form\FormRenderer;
2019
use Symfony\Component\Form\FormView;
2120
use Twig\Environment;
21+
use Twig\Loader\FilesystemLoader;
2222

2323
class FormExtensionBootstrap3LayoutTest extends AbstractBootstrap3LayoutTest
2424
{
@@ -33,7 +33,7 @@ protected function setUp()
3333
{
3434
parent::setUp();
3535

36-
$loader = new StubFilesystemLoader([
36+
$loader = new FilesystemLoader([
3737
__DIR__.'/../../Resources/views/Form',
3838
__DIR__.'/Fixtures/templates/form',
3939
]);
@@ -76,7 +76,7 @@ public function testStartTagHasActionAttributeWhenActionIsZero()
7676

7777
public function testMoneyWidgetInIso()
7878
{
79-
$environment = new Environment(new StubFilesystemLoader([
79+
$environment = new Environment(new FilesystemLoader([
8080
__DIR__.'/../../Resources/views/Form',
8181
__DIR__.'/Fixtures/templates/form',
8282
]), ['strict_variables' => true]);

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

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -14,11 +14,11 @@
1414
use Symfony\Bridge\Twig\Extension\FormExtension;
1515
use Symfony\Bridge\Twig\Extension\TranslationExtension;
1616
use Symfony\Bridge\Twig\Form\TwigRendererEngine;
17-
use Symfony\Bridge\Twig\Tests\Extension\Fixtures\StubFilesystemLoader;
1817
use Symfony\Bridge\Twig\Tests\Extension\Fixtures\StubTranslator;
1918
use Symfony\Component\Form\FormRenderer;
2019
use Symfony\Component\Form\FormView;
2120
use Twig\Environment;
21+
use Twig\Loader\FilesystemLoader;
2222

2323
/**
2424
* Class providing test cases for the Bootstrap 4 Twig form theme.
@@ -39,7 +39,7 @@ protected function setUp()
3939
{
4040
parent::setUp();
4141

42-
$loader = new StubFilesystemLoader([
42+
$loader = new FilesystemLoader([
4343
__DIR__.'/../../Resources/views/Form',
4444
__DIR__.'/Fixtures/templates/form',
4545
]);

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

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -14,11 +14,11 @@
1414
use Symfony\Bridge\Twig\Extension\FormExtension;
1515
use Symfony\Bridge\Twig\Extension\TranslationExtension;
1616
use Symfony\Bridge\Twig\Form\TwigRendererEngine;
17-
use Symfony\Bridge\Twig\Tests\Extension\Fixtures\StubFilesystemLoader;
1817
use Symfony\Bridge\Twig\Tests\Extension\Fixtures\StubTranslator;
1918
use Symfony\Component\Form\FormRenderer;
2019
use Symfony\Component\Form\FormView;
2120
use Twig\Environment;
21+
use Twig\Loader\FilesystemLoader;
2222

2323
/**
2424
* Class providing test cases for the Bootstrap 4 horizontal Twig form theme.
@@ -37,7 +37,7 @@ protected function setUp()
3737
{
3838
parent::setUp();
3939

40-
$loader = new StubFilesystemLoader([
40+
$loader = new FilesystemLoader([
4141
__DIR__.'/../../Resources/views/Form',
4242
__DIR__.'/Fixtures/templates/form',
4343
]);
@@ -80,7 +80,7 @@ public function testStartTagHasActionAttributeWhenActionIsZero()
8080

8181
public function testMoneyWidgetInIso()
8282
{
83-
$environment = new Environment(new StubFilesystemLoader([
83+
$environment = new Environment(new FilesystemLoader([
8484
__DIR__.'/../../Resources/views/Form',
8585
__DIR__.'/Fixtures/templates/form',
8686
]), ['strict_variables' => true]);

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

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -14,13 +14,13 @@
1414
use Symfony\Bridge\Twig\Extension\FormExtension;
1515
use Symfony\Bridge\Twig\Extension\TranslationExtension;
1616
use Symfony\Bridge\Twig\Form\TwigRendererEngine;
17-
use Symfony\Bridge\Twig\Tests\Extension\Fixtures\StubFilesystemLoader;
1817
use Symfony\Bridge\Twig\Tests\Extension\Fixtures\StubTranslator;
1918
use Symfony\Component\Form\ChoiceList\View\ChoiceView;
2019
use Symfony\Component\Form\FormRenderer;
2120
use Symfony\Component\Form\FormView;
2221
use Symfony\Component\Form\Tests\AbstractDivLayoutTest;
2322
use Twig\Environment;
23+
use Twig\Loader\FilesystemLoader;
2424

2525
class FormExtensionDivLayoutTest extends AbstractDivLayoutTest
2626
{
@@ -37,7 +37,7 @@ protected function setUp()
3737
{
3838
parent::setUp();
3939

40-
$loader = new StubFilesystemLoader([
40+
$loader = new FilesystemLoader([
4141
__DIR__.'/../../Resources/views/Form',
4242
__DIR__.'/Fixtures/templates/form',
4343
]);
@@ -169,7 +169,7 @@ public function testIsRootForm($expected, FormView $formView)
169169

170170
public function testMoneyWidgetInIso()
171171
{
172-
$environment = new Environment(new StubFilesystemLoader([
172+
$environment = new Environment(new FilesystemLoader([
173173
__DIR__.'/../../Resources/views/Form',
174174
__DIR__.'/Fixtures/templates/form',
175175
]), ['strict_variables' => true]);

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

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -14,12 +14,12 @@
1414
use Symfony\Bridge\Twig\Extension\FormExtension;
1515
use Symfony\Bridge\Twig\Extension\TranslationExtension;
1616
use Symfony\Bridge\Twig\Form\TwigRendererEngine;
17-
use Symfony\Bridge\Twig\Tests\Extension\Fixtures\StubFilesystemLoader;
1817
use Symfony\Bridge\Twig\Tests\Extension\Fixtures\StubTranslator;
1918
use Symfony\Component\Form\FormRenderer;
2019
use Symfony\Component\Form\FormView;
2120
use Symfony\Component\Form\Tests\AbstractTableLayoutTest;
2221
use Twig\Environment;
22+
use Twig\Loader\FilesystemLoader;
2323

2424
class FormExtensionTableLayoutTest extends AbstractTableLayoutTest
2525
{
@@ -36,7 +36,7 @@ protected function setUp()
3636
{
3737
parent::setUp();
3838

39-
$loader = new StubFilesystemLoader([
39+
$loader = new FilesystemLoader([
4040
__DIR__.'/../../Resources/views/Form',
4141
__DIR__.'/Fixtures/templates/form',
4242
]);

‎src/Symfony/Bridge/Twig/Tests/TwigEngineTest.php

Lines changed: 0 additions & 84 deletions
This file was deleted.

0 commit comments

Comments
 (0)