Skip to content

Commit 0aba0fe

Browse files
Merge branch '3.2'
* 3.2: [Cache] cache/integration-tests is now compatible with phpunit namespaces [FrameworkBundle] Fix translation dep constraint [Workflow] Added more tests [Cache] Enhance error reporting for FilesystemAdapter
2 parents 5912c44 + bbaef6a commit 0aba0fe

File tree

2 files changed

+14
-2
lines changed

2 files changed

+14
-2
lines changed

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);

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": "~3.3",
50-
"symfony/translation": "~2.8|~3.0",
50+
"symfony/translation": "~3.2",
5151
"symfony/templating": "~2.8|~3.0",
5252
"symfony/validator": "~3.3",
5353
"symfony/yaml": "~3.2",
@@ -63,9 +63,10 @@
6363
"phpunit/phpunit": "<4.8.35|<5.4.3,>=5.0",
6464
"symfony/asset": "<3.3",
6565
"symfony/console": "<3.3",
66-
"symfony/serializer": "<3.3",
6766
"symfony/form": "<3.3",
6867
"symfony/property-info": "<3.3",
68+
"symfony/serializer": "<3.3",
69+
"symfony/translations": "<3.2",
6970
"symfony/validator": "<3.3"
7071
},
7172
"suggest": {

0 commit comments

Comments
 (0)