Skip to content

Commit 8f68e66

Browse files
authored
Allow twig/twig 2.0 (#74)
Twig 2.0 is out, let's allow it!
1 parent a7aee95 commit 8f68e66

File tree

2 files changed

+9
-3
lines changed

2 files changed

+9
-3
lines changed

composer.json

+1-1
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,7 @@
2222
"symfony/framework-bundle": "^2.7 || ^3.0",
2323
"symfony/twig-bundle": "^2.7 || ^3.0",
2424
"symfony/validator": "^2.7 || ^3.0",
25-
"twig/twig": "^1.24"
25+
"twig/twig": "^1.24 || ^2.0"
2626
},
2727
"suggest": {
2828
"symfony/form": "To use enum form type",

test/Bridge/Twig/Extension/EnumExtensionTest.php

+8-2
Original file line numberDiff line numberDiff line change
@@ -33,11 +33,17 @@ protected function setUp()
3333

3434
public function testEnvironment()
3535
{
36-
$twig = new \Twig_Environment();
36+
$twig = new \Twig_Environment($this->createMock(\Twig_LoaderInterface::class));
3737
$twig->addExtension($this->extension);
3838

39-
$this->assertTrue($twig->hasExtension('greg0ire_enum'));
4039
$this->assertInstanceOf(\Twig_SimpleFilter::class, $twig->getFilter('enum_label'));
40+
41+
if (version_compare(\Twig_Environment::VERSION, '1.26.0') === -1) {
42+
$this->assertTrue($twig->hasExtension('greg0ire_enum'));
43+
44+
return;
45+
}
46+
$this->assertTrue($twig->hasExtension(EnumExtension::class));
4147
}
4248

4349
/**

0 commit comments

Comments
 (0)