Merge branch '4.4' into 5.1

nicolas-grekas · nicolas-grekas · commit fd17a6fed826 · 2020-12-08T17:43:25.000+01:00
* 4.4: minor cs fix [Config][TwigBundle] Fixed syntax error in config [DI] Fix Xdebug 3.0 detection Use php8 stable [Cache] fix checking for redis_sentinel support [Intl] Update the ICU data to 68.1 Remove unused @throws tags and handling of never thrown exceptions [PhpUnitBridge] Fix disabling DeprecationErrorHandler from phpunit configuration file
diff --git a/Tests/Extension/Core/Type/LocaleTypeTest.php b/Tests/Extension/Core/Type/LocaleTypeTest.php
@@ -49,7 +49,7 @@ public function testChoiceTranslationLocaleOption()
         // Don't check objects for identity
         $this->assertContainsEquals(new ChoiceView('en', 'en', 'англійська'), $choices);
         $this->assertContainsEquals(new ChoiceView('en_GB', 'en_GB', 'англійська (Велика Британія)'), $choices);
-        $this->assertContainsEquals(new ChoiceView('zh_Hant_MO', 'zh_Hant_MO', 'китайська (традиційна, Макао, О.А.Р Китаю)'), $choices);
+        $this->assertContainsEquals(new ChoiceView('zh_Hant_TW', 'zh_Hant_TW', 'китайська (традиційна, Тайвань)'), $choices);
     }
 
     public function testSubmitNull($expected = null, $norm = null, $view = null)

Original file line number	Diff line number	Diff line change
`@@ -49,7 +49,7 @@ public function testChoiceTranslationLocaleOption()`
`49`	`49`	`// Don't check objects for identity`
`50`	`50`	`$this->assertContainsEquals(new ChoiceView('en', 'en', 'англійська'), $choices);`
`51`	`51`	`$this->assertContainsEquals(new ChoiceView('en_GB', 'en_GB', 'англійська (Велика Британія)'), $choices);`
`52`		`- $this->assertContainsEquals(new ChoiceView('zh_Hant_MO', 'zh_Hant_MO', 'китайська (традиційна, Макао, О.А.Р Китаю)'), $choices);`
	`52`	`+ $this->assertContainsEquals(new ChoiceView('zh_Hant_TW', 'zh_Hant_TW', 'китайська (традиційна, Тайвань)'), $choices);`
`53`	`53`	`}`
`54`	`54`
`55`	`55`	`public function testSubmitNull($expected = null, $norm = null, $view = null)`