diff --git a/core/modules/config/src/Tests/ConfigLanguageOverrideTest.php b/core/modules/config/src/Tests/ConfigLanguageOverrideTest.php index 1a95b3f..b70822a 100644 --- a/core/modules/config/src/Tests/ConfigLanguageOverrideTest.php +++ b/core/modules/config/src/Tests/ConfigLanguageOverrideTest.php @@ -24,9 +24,19 @@ class ConfigLanguageOverrideTest extends DrupalUnitTestBase { */ public static $modules = array('user', 'language', 'config_test', 'system', 'field'); + /** + * Language Manager. + * + * @var \Drupal\language\ConfigurableLanguageManager + */ + protected $languageManager; + protected function setUp() { parent::setUp(); $this->installConfig(array('config_test')); + /* @var \Drupal\language\ConfigurableLanguageManager $language_manager */ + $language_manager = $this->container->get('language_manager'); + $this->languageManager = $language_manager; } /** @@ -58,8 +68,7 @@ function testConfigLanguageOverride() { // Test overrides of completely new configuration objects. In normal runtime // this should only happen for configuration entities as we should not be // creating simple configuration objects on the fly. - \Drupal::languageManager() - ->getLanguageConfigOverride('de', 'config_test.new') + $this->languageManager->getLanguageConfigOverride('de', 'config_test.new') ->set('language', 'override') ->save(); $config = \Drupal::config('config_test.new'); @@ -77,13 +86,11 @@ function testConfigLanguageOverride() { ->set('value', array('key' => 'original')) ->set('label', 'Original') ->save(); - \Drupal::languageManager() - ->getLanguageConfigOverride('de', 'config_test.foo') + $this->languageManager->getLanguageConfigOverride('de', 'config_test.foo') ->set('value', array('key' => 'override')) ->set('label', 'Override') ->save(); - \Drupal::languageManager() - ->getLanguageConfigOverride('fr', 'config_test.foo') + $this->languageManager->getLanguageConfigOverride('fr', 'config_test.foo') ->set('value', array('key' => 'override')) ->save(); \Drupal::configFactory()->clearStaticCache(); @@ -94,30 +101,30 @@ function testConfigLanguageOverride() { \Drupal::configFactory()->rename('config_test.foo', 'config_test.bar'); $config = \Drupal::config('config_test.bar'); $this->assertEqual($config->get('value'), array('key' => 'original')); - $override = \Drupal::languageManager()->getLanguageConfigOverride('de', 'config_test.foo'); + $override = $this->languageManager->getLanguageConfigOverride('de', 'config_test.foo'); $this->assertTrue($override->isNew()); $this->assertEqual($override->get('value'), NULL); - $override = \Drupal::languageManager()->getLanguageConfigOverride('de', 'config_test.bar'); + $override = $this->languageManager->getLanguageConfigOverride('de', 'config_test.bar'); $this->assertFalse($override->isNew()); $this->assertEqual($override->get('value'), array('key' => 'override')); - $override = \Drupal::languageManager()->getLanguageConfigOverride('fr', 'config_test.bar'); + $override = $this->languageManager->getLanguageConfigOverride('fr', 'config_test.bar'); $this->assertFalse($override->isNew()); $this->assertEqual($override->get('value'), array('key' => 'override')); // Ensure changing data in the config will update the overrides. $config = \Drupal::config('config_test.bar')->clear('value.key')->save(); $this->assertEqual($config->get('value'), array()); - $override = \Drupal::languageManager()->getLanguageConfigOverride('de', 'config_test.bar'); + $override = $this->languageManager->getLanguageConfigOverride('de', 'config_test.bar'); $this->assertFalse($override->isNew()); $this->assertEqual($override->get('value'), NULL); // The French override will become empty and therefore removed. - $override = \Drupal::languageManager()->getLanguageConfigOverride('fr', 'config_test.bar'); + $override = $this->languageManager->getLanguageConfigOverride('fr', 'config_test.bar'); $this->assertTrue($override->isNew()); $this->assertEqual($override->get('value'), NULL); // Ensure deleting the config will delete the override. \Drupal::configFactory()->get('config_test.bar')->delete(); - $override = \Drupal::languageManager()->getLanguageConfigOverride('de', 'config_test.bar'); + $override = $this->languageManager->getLanguageConfigOverride('de', 'config_test.bar'); $this->assertTrue($override->isNew()); $this->assertEqual($override->get('value'), NULL); } diff --git a/core/modules/config/src/Tests/ConfigLanguageOverrideWebTest.php b/core/modules/config/src/Tests/ConfigLanguageOverrideWebTest.php index be24fb9..5ecf2cf 100644 --- a/core/modules/config/src/Tests/ConfigLanguageOverrideWebTest.php +++ b/core/modules/config/src/Tests/ConfigLanguageOverrideWebTest.php @@ -41,7 +41,7 @@ function testSiteNameTranslation() { 'direction' => LanguageInterface::DIRECTION_LTR, ); $this->drupalPostForm('admin/config/regional/language/add', $edit, t('Add custom language')); - \Drupal::languageManager() + $this->container->get('language_manager') ->getLanguageConfigOverride($langcode, 'system.site') ->set('name', 'XX site name') ->save(); diff --git a/core/modules/config/src/Tests/ConfigOverridesPriorityTest.php b/core/modules/config/src/Tests/ConfigOverridesPriorityTest.php index 3e6e288..e8b26da 100644 --- a/core/modules/config/src/Tests/ConfigOverridesPriorityTest.php +++ b/core/modules/config/src/Tests/ConfigOverridesPriorityTest.php @@ -55,7 +55,7 @@ public function testOverridePriorities() { 'id' => 'fr', )); \Drupal::languageManager()->setConfigOverrideLanguage($language); - \Drupal::languageManager() + $this->container->get('language_manager') ->getLanguageConfigOverride($language->getId(), 'system.site') ->set('name', $language_overridden_name) ->set('mail', $language_overridden_mail) diff --git a/core/modules/config_translation/src/Tests/ConfigTranslationUiTest.php b/core/modules/config_translation/src/Tests/ConfigTranslationUiTest.php index 690beee..de069c1 100644 --- a/core/modules/config_translation/src/Tests/ConfigTranslationUiTest.php +++ b/core/modules/config_translation/src/Tests/ConfigTranslationUiTest.php @@ -57,6 +57,13 @@ class ConfigTranslationUiTest extends WebTestBase { */ protected $localeStorage; + /** + * Language Manager. + * + * @var \Drupal\language\ConfigurableLanguageManager + */ + protected $languageManager; + protected function setUp() { parent::setUp(); $translator_permissions = array( @@ -82,6 +89,9 @@ protected function setUp() { ConfigurableLanguage::createFromLangcode($langcode)->save(); } $this->localeStorage = $this->container->get('locale.storage'); + /* @var \Drupal\language\ConfigurableLanguageManager $language_manager */ + $language_manager = $this->container->get('language_manager'); + $this->languageManager = $language_manager; } /** @@ -172,7 +182,7 @@ public function testSourceValueDuplicateSave() { $this->drupalPostForm("$translation_base_url/fr/add", $edit, t('Save translation')); // Read overridden file from active config. - $override = \Drupal::languageManager()->getLanguageConfigOverride('fr', 'system.site'); + $override = $this->languageManager->getLanguageConfigOverride('fr', 'system.site'); // Expect both name and slogan in language specific file. $expected = array( @@ -193,7 +203,7 @@ public function testSourceValueDuplicateSave() { ); $this->drupalPostForm(NULL, $edit, t('Save translation')); $this->assertRaw(t('Successfully updated @language translation.', array('@language' => 'French'))); - $override = \Drupal::languageManager()->getLanguageConfigOverride('fr', 'system.site'); + $override = $this->languageManager->getLanguageConfigOverride('fr', 'system.site'); // Expect only slogan in language specific file. $expected = 'FR ' . $site_slogan; @@ -207,7 +217,7 @@ public function testSourceValueDuplicateSave() { 'config_names[system.site][slogan][translation]' => $site_slogan, ); $this->drupalPostForm(NULL, $edit, t('Save translation')); - $override = \Drupal::languageManager()->getLanguageConfigOverride('fr', 'system.site'); + $override = $this->languageManager->getLanguageConfigOverride('fr', 'system.site'); // Expect no language specific file. $this->assertTrue($override->isNew()); @@ -276,7 +286,7 @@ public function testContactConfigEntityTranslation() { $this->drupalPostForm($translation_page_url, $edit, t('Save translation')); // Expect translated values in language specific file. - $override = \Drupal::languageManager()->getLanguageConfigOverride($langcode, 'contact.form.feedback'); + $override = $this->languageManager->getLanguageConfigOverride($langcode, 'contact.form.feedback'); $expected = array( 'label' => 'Website feedback - ' . $langcode, 'reply' => 'Thank you for your mail - ' . $langcode, @@ -339,7 +349,7 @@ public function testContactConfigEntityTranslation() { $this->assertNoLinkByHref("$translation_base_url/$langcode/delete"); // Expect no language specific file present anymore. - $override = \Drupal::languageManager()->getLanguageConfigOverride($langcode, 'contact.form.feedback'); + $override = $this->languageManager->getLanguageConfigOverride($langcode, 'contact.form.feedback'); $this->assertTrue($override->isNew()); } @@ -405,7 +415,7 @@ public function testDateFormatTranslation() { $this->drupalPostForm($translation_page_url, $edit, t('Save translation')); // Get translation and check we've got the right value. - $override = \Drupal::languageManager()->getLanguageConfigOverride('fr', 'core.date_format.' . $id); + $override = $this->languageManager->getLanguageConfigOverride('fr', 'core.date_format.' . $id); $expected = array( 'label' => $id . ' - FR', 'pattern' => 'D', diff --git a/core/modules/language/src/Tests/LanguageConfigOverrideImportTest.php b/core/modules/language/src/Tests/LanguageConfigOverrideImportTest.php index 8e2f00e..a97d355 100644 --- a/core/modules/language/src/Tests/LanguageConfigOverrideImportTest.php +++ b/core/modules/language/src/Tests/LanguageConfigOverrideImportTest.php @@ -51,7 +51,7 @@ public function testConfigOverrideImport() { $this->rebuildContainer(); \Drupal::service('router.builder')->rebuild(); - $override = \Drupal::languageManager()->getLanguageConfigOverride('fr', 'system.site'); + $override = $this->container->get('language_manager')->getLanguageConfigOverride('fr', 'system.site'); $this->assertEqual('FR default site name', $override->get('name')); $this->drupalGet('fr'); $this->assertText('FR default site name'); diff --git a/core/modules/locale/src/Tests/LocaleConfigTranslationTest.php b/core/modules/locale/src/Tests/LocaleConfigTranslationTest.php index 30ab0a0..32238c5 100644 --- a/core/modules/locale/src/Tests/LocaleConfigTranslationTest.php +++ b/core/modules/locale/src/Tests/LocaleConfigTranslationTest.php @@ -167,7 +167,7 @@ public function testConfigTranslation() { $this->assertEqual($property->getValue(), $image_style_label, 'Got the right translation for image style name after translation'); // Quick test to ensure translation file exists. - $override = \Drupal::languageManager()->getLanguageConfigOverride('xx', 'image.style.medium'); + $override = $this->container->get('language_manager')->getLanguageConfigOverride('xx', 'image.style.medium'); $this->assertEqual($override->get('label'), $image_style_label); // Uninstall the module. @@ -175,7 +175,7 @@ public function testConfigTranslation() { $this->drupalPostForm(NULL, array(), t('Uninstall')); // Ensure that the translated configuration has been removed. - $override = \Drupal::languageManager()->getLanguageConfigOverride('xx', 'image.style.medium'); + $override = $this->container->get('language_manager')->getLanguageConfigOverride('xx', 'image.style.medium'); $this->assertTrue($override->isNew(), 'Translated configuration for image module removed.'); // Translate default category using the UI so configuration is refreshed.