Commite1caf7d

committed

[FrameworkBundle] Fix translation dep constraint

1 parent067ce70 commite1caf7dCopy full SHA for e1caf7d

File tree

+14

-2

lines changed

src/Symfony/Bundle/FrameworkBundle
- Tests/Translation
  - TranslatorTest.php
- composer.json

+14

-2

lines changed

Lines changed: 11 additions & 0 deletions

Original file line number	Diff line number	Diff line change
`@@ -136,6 +136,17 @@ public function testGetDefaultLocale()`
`136`	`136`	`$this->assertSame('en',$translator->getLocale());`
`137`	`137`	`}`
`138`	`138`
	`139`	`+/**`
	`140`	`+ * @expectedException \Symfony\Component\Translation\Exception\InvalidArgumentException`
	`141`	`+ * @expectedExceptionMessage The Translator does not support the following options: 'foo'`
	`142`	`+ */`
	`143`	`+publicfunctiontestInvalidOptions()`
	`144`	`+ {`
	`145`	`+$container =$this->getMockBuilder('Symfony\Component\DependencyInjection\ContainerInterface')->getMock();`
	`146`	`+`
	`147`	`+ (newTranslator($container,newMessageSelector(),array(),array('foo' =>'bar')));`
	`148`	`+ }`
	`149`	`+`
`139`	`150`	`protectedfunctiongetCatalogue($locale,$messages,$resources =array())`
`140`	`151`	`{`
`141`	`152`	`$catalogue =newMessageCatalogue($locale);`

Lines changed: 3 additions & 2 deletions

Original file line number	Diff line number	Diff line change
`@@ -47,7 +47,7 @@`
`47`	`47`	`"symfony/security-core":"~3.2",`
`48`	`48`	`"symfony/security-csrf":"~2.8\|~3.0",`
`49`	`49`	`"symfony/serializer":"~2.8\|~3.0",`
`50`		`-"symfony/translation":"~2.8\|~3.0",`
	`50`	`+"symfony/translation":"~3.2",`
`51`	`51`	`"symfony/templating":"~2.8\|~3.0",`
`52`	`52`	`"symfony/validator":"~3.2",`
`53`	`53`	`"symfony/yaml":"~3.2",`
`@@ -60,7 +60,8 @@`
`60`	`60`	`"conflict": {`
`61`	`61`	`"phpdocumentor/reflection-docblock":"<3.0",`
`62`	`62`	`"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"`
`64`	`65`	`},`
`65`	`66`	`"suggest": {`
`66`	`67`	`"ext-apcu":"For best performance of the system caches",`

Comments

(0)