Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion composer.json
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@
"require": {
"php": ">=5.3.3",
"doctrine/common": "~2.4",
"twig/twig": "~1.20|~2.0",
"twig/twig": "~1.23|~2.0",
"psr/log": "~1.0"
},
"replace": {
Expand Down
2 changes: 1 addition & 1 deletion src/Symfony/Bridge/Twig/Extension/FormExtension.php
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,7 @@
* @author Fabien Potencier <fabien@symfony.com>
* @author Bernhard Schussek <bschussek@gmail.com>
*/
class FormExtension extends \Twig_Extension
class FormExtension extends \Twig_Extension implements \Twig_Extension_InitRuntimeInterface
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Where is this interface defined? Travis fails when trying to load it.

Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Ah sorry, I missed the link to twigphp/Twig#1886.

{
/**
* This property is public so that it can be accessed directly from compiled
Expand Down
2 changes: 1 addition & 1 deletion src/Symfony/Bridge/Twig/composer.json
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@
],
"require": {
"php": ">=5.3.3",
"twig/twig": "~1.20|~2.0"
"twig/twig": "~1.23|~2.0"
},
"require-dev": {
"symfony/finder": "~2.3",
Expand Down
2 changes: 1 addition & 1 deletion src/Symfony/Bundle/SecurityBundle/composer.json
Original file line number Diff line number Diff line change
Expand Up @@ -34,7 +34,7 @@
"symfony/process": "~2.0,>=2.0.5",
"symfony/validator": "~2.2",
"symfony/yaml": "~2.0,>=2.0.5",
"twig/twig": "~1.20|~2.0"
"twig/twig": "~1.23|~2.0"
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Is this really needed? The LogoutUrlExtension does not make use of the setEnvironment() method.

},
"autoload": {
"psr-0": { "Symfony\\Bundle\\SecurityBundle\\": "" }
Expand Down