Skip to content

Commit f30edca

Browse files
committed
Support for Twig 3.
1 parent 117acc3 commit f30edca

40 files changed

+85
-115
lines changed

composer.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,7 @@
2020
"ext-xml": "*",
2121
"doctrine/event-manager": "~1.0",
2222
"doctrine/persistence": "~1.0",
23-
"twig/twig": "^2.10",
23+
"twig/twig": "^2.10|^3",
2424
"psr/cache": "~1.0",
2525
"psr/container": "^1.0",
2626
"psr/link": "^1.0",

src/Symfony/Bridge/Twig/Extension/AssetExtension.php

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,7 @@
2020
*
2121
* @author Fabien Potencier <fabien@symfony.com>
2222
*
23-
* @final since Symfony 4.4
23+
* @final
2424
*/
2525
class AssetExtension extends AbstractExtension
2626
{
@@ -36,7 +36,7 @@ public function __construct(Packages $packages)
3636
*
3737
* @return TwigFunction[]
3838
*/
39-
public function getFunctions()
39+
public function getFunctions(): array
4040
{
4141
return [
4242
new TwigFunction('asset', [$this, 'getAssetUrl']),

src/Symfony/Bridge/Twig/Extension/CodeExtension.php

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,7 @@
2020
*
2121
* @author Fabien Potencier <fabien@symfony.com>
2222
*
23-
* @final since Symfony 4.4
23+
* @final
2424
*/
2525
class CodeExtension extends AbstractExtension
2626
{
@@ -45,7 +45,7 @@ public function __construct($fileLinkFormat, string $projectDir, string $charset
4545
*
4646
* @return TwigFilter[]
4747
*/
48-
public function getFilters()
48+
public function getFilters(): array
4949
{
5050
return [
5151
new TwigFilter('abbr_class', [$this, 'abbrClass'], ['is_safe' => ['html']]),

src/Symfony/Bridge/Twig/Extension/CsrfExtension.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,7 @@
1818
* @author Christian Flothmann <christian.flothmann@sensiolabs.de>
1919
* @author Titouan Galopin <galopintitouan@gmail.com>
2020
*
21-
* @final since Symfony 4.4
21+
* @final
2222
*/
2323
class CsrfExtension extends AbstractExtension
2424
{

src/Symfony/Bridge/Twig/Extension/CsrfRuntime.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@
1717
* @author Christian Flothmann <christian.flothmann@sensiolabs.de>
1818
* @author Titouan Galopin <galopintitouan@gmail.com>
1919
*
20-
* @final since Symfony 4.4
20+
* @final
2121
*/
2222
class CsrfRuntime
2323
{

src/Symfony/Bridge/Twig/Extension/DumpExtension.php

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -25,7 +25,7 @@
2525
*
2626
* @author Nicolas Grekas <p@tchwork.com>
2727
*
28-
* @final since Symfony 4.4
28+
* @final
2929
*/
3030
class DumpExtension extends AbstractExtension
3131
{
@@ -41,7 +41,7 @@ public function __construct(ClonerInterface $cloner, HtmlDumper $dumper = null)
4141
/**
4242
* @return TwigFunction[]
4343
*/
44-
public function getFunctions()
44+
public function getFunctions(): array
4545
{
4646
return [
4747
new TwigFunction('dump', [$this, 'dump'], ['is_safe' => ['html'], 'needs_context' => true, 'needs_environment' => true]),
@@ -51,7 +51,7 @@ public function getFunctions()
5151
/**
5252
* @return TokenParserInterface[]
5353
*/
54-
public function getTokenParsers()
54+
public function getTokenParsers(): array
5555
{
5656
return [new DumpTokenParser()];
5757
}

src/Symfony/Bridge/Twig/Extension/ExpressionExtension.php

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,7 @@
2020
*
2121
* @author Fabien Potencier <fabien@symfony.com>
2222
*
23-
* @final since Symfony 4.4
23+
* @final
2424
*/
2525
class ExpressionExtension extends AbstractExtension
2626
{
@@ -29,7 +29,7 @@ class ExpressionExtension extends AbstractExtension
2929
*
3030
* @return TwigFunction[]
3131
*/
32-
public function getFunctions()
32+
public function getFunctions(): array
3333
{
3434
return [
3535
new TwigFunction('expression', [$this, 'createExpression']),

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

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -26,7 +26,7 @@
2626
* @author Fabien Potencier <fabien@symfony.com>
2727
* @author Bernhard Schussek <bschussek@gmail.com>
2828
*
29-
* @final since Symfony 4.4
29+
* @final
3030
*/
3131
class FormExtension extends AbstractExtension
3232
{
@@ -35,7 +35,7 @@ class FormExtension extends AbstractExtension
3535
*
3636
* @return TokenParserInterface[]
3737
*/
38-
public function getTokenParsers()
38+
public function getTokenParsers(): array
3939
{
4040
return [
4141
// {% form_theme form "SomeBundle::widgets.twig" %}
@@ -48,7 +48,7 @@ public function getTokenParsers()
4848
*
4949
* @return TwigFunction[]
5050
*/
51-
public function getFunctions()
51+
public function getFunctions(): array
5252
{
5353
return [
5454
new TwigFunction('form_widget', null, ['node_class' => 'Symfony\Bridge\Twig\Node\SearchAndRenderBlockNode', 'is_safe' => ['html']]),
@@ -70,7 +70,7 @@ public function getFunctions()
7070
*
7171
* @return TwigFilter[]
7272
*/
73-
public function getFilters()
73+
public function getFilters(): array
7474
{
7575
return [
7676
new TwigFilter('humanize', ['Symfony\Component\Form\FormRenderer', 'humanize']),
@@ -83,7 +83,7 @@ public function getFilters()
8383
*
8484
* @return TwigTest[]
8585
*/
86-
public function getTests()
86+
public function getTests(): array
8787
{
8888
return [
8989
new TwigTest('selectedchoice', 'Symfony\Bridge\Twig\Extension\twig_is_selected_choice'),

src/Symfony/Bridge/Twig/Extension/HttpFoundationExtension.php

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,7 @@
2121
*
2222
* @author Fabien Potencier <fabien@symfony.com>
2323
*
24-
* @final since Symfony 4.4
24+
* @final
2525
*/
2626
class HttpFoundationExtension extends AbstractExtension
2727
{
@@ -37,7 +37,7 @@ public function __construct(UrlHelper $urlHelper)
3737
*
3838
* @return TwigFunction[]
3939
*/
40-
public function getFunctions()
40+
public function getFunctions(): array
4141
{
4242
return [
4343
new TwigFunction('absolute_url', [$this, 'generateAbsoluteUrl']),

src/Symfony/Bridge/Twig/Extension/HttpKernelExtension.php

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -20,14 +20,14 @@
2020
*
2121
* @author Fabien Potencier <fabien@symfony.com>
2222
*
23-
* @final since Symfony 4.4
23+
* @final
2424
*/
2525
class HttpKernelExtension extends AbstractExtension
2626
{
2727
/**
2828
* @return TwigFunction[]
2929
*/
30-
public function getFunctions()
30+
public function getFunctions(): array
3131
{
3232
return [
3333
new TwigFunction('render', [HttpKernelRuntime::class, 'renderFragment'], ['is_safe' => ['html']]),

0 commit comments

Comments
 (0)
pFad - Phonifier reborn

Pfad - The Proxy pFad of © 2024 Garber Painting. All rights reserved.

Note: This service is not intended for secure transactions such as banking, social media, email, or purchasing. Use at your own risk. We assume no liability whatsoever for broken pages.


Alternative Proxies:

Alternative Proxy

pFad Proxy

pFad v3 Proxy

pFad v4 Proxy