8000 [FrameworkBundle] Fix translation dep constraint · symfony/symfony@e1caf7d · GitHub
[go: up one dir, main page]

Skip to content

Commit e1caf7d

Browse files
committed
[FrameworkBundle] Fix translation dep constraint
1 parent 067ce70 commit e1caf7d

File tree

2 files changed

+14
-2
lines changed

2 files changed

+14
-2
lines changed

src/Symfony/Bundle/FrameworkBundle/Tests/Translation/TranslatorTest.php

Lines changed: 11 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -136,6 +136,17 @@ public function testGetDefaultLocale()
136136
$this->assertSame('en', $translator->getLocale());
137137
}
138138

139+
/**
140+
* @expectedException \Symfony\Component\Translation\Exception\InvalidArgumentException
141+
* @expectedExceptionMessage The Translator does not support the following options: 'foo'
142+
*/
143+
public function testInvalidOptions()
144+
{
145+
$container = $this->getMockBuilder('Symfony\Component\DependencyInjection\ContainerInterface')->getMock();
146+
147+
(new Translator($container, new MessageSelector(), array(), array('foo' => 'bar')));
148+
}
149+
139150
protected function getCatalogue($locale, $messages, $resources = array())
140151
{
141152
$catalogue = new MessageCatalogue($locale);

src/Symfony/Bundle/FrameworkBundle/composer.json

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -47,7 +47,7 @@
4747
"symfony/security-core": "~3.2",
4848
"symfony/security-csrf": "~2.8|~3.0",
4949
"symfony/serializer": "~2.8|~3.0",
50-
"symfony/translation": "~2.8|~3.0",
50+
"symfony/translation": "~3.2",
5151
"symfony/templating": "~2.8|~3.0",
5252
"symfony/validator": "~3.2",
5353
"symfony/yaml": "~3.2",
@@ -60,7 +60,8 @@
6060
"conflict": {
6161
"phpdocumentor/reflection-docblock": "<3.0",
6262
"phpdocumentor/type-resolver": "<0.2.0",
63-
"phpunit/phpunit": "<4.8.35|<5.4.3,>=5.0"
63+
"phpunit/phpunit": "<4.8.35|<5.4.3,>=5.0",
64+
"symfony/translations": "<3.2"
6465
},
6566
"suggest": {
6667
"ext-apcu": "For best performance of the system caches",

0 commit comments

Comments
 (0)
0