diff -u b/core/modules/config_translation/tests/src/Unit/ConfigEntityMapperTest.php b/core/modules/config_translation/tests/src/Unit/ConfigEntityMapperTest.php --- b/core/modules/config_translation/tests/src/Unit/ConfigEntityMapperTest.php +++ b/core/modules/config_translation/tests/src/Unit/ConfigEntityMapperTest.php @@ -50,7 +50,7 @@ /** * The mocked language manager. * - * @var \Drupal\config_translation\ConfigMapperInterface|\PHPUnit_Framework_MockObject_MockObject + * @var \Drupal\Core\Language\LanguageManagerInterface $language_manager|\PHPUnit_Framework_MockObject_MockObject */ protected $languageManager; @@ -82,7 +82,7 @@ ->disableOriginalConstructor() ->getMock(); - $this->languageManager = $this->getMock('Drupal\config_translation\ConfigMapperInterface'); + $this->languageManager = $this->getMock('Drupal\Core\Language\LanguageManagerInterface'); $this->configEntityMapper = new ConfigEntityMapper( 'configurable_language', diff -u b/core/modules/config_translation/tests/src/Unit/ConfigNamesMapperTest.php b/core/modules/config_translation/tests/src/Unit/ConfigNamesMapperTest.php --- b/core/modules/config_translation/tests/src/Unit/ConfigNamesMapperTest.php +++ b/core/modules/config_translation/tests/src/Unit/ConfigNamesMapperTest.php @@ -84,7 +84,7 @@ /** * The mocked language manager. * - * @var \Drupal\config_translation\ConfigMapperInterface|\PHPUnit_Framework_MockObject_MockObject + * @var \Drupal\Core\Language\LanguageManagerInterface $language_manager|\PHPUnit_Framework_MockObject_MockObject */ protected $languageManager; @@ -120,7 +120,7 @@ ->with('system.site_information_settings') ->will($this->returnValue($this->baseRoute)); - $this->languageManager = $this->getMock('Drupal\config_translation\ConfigMapperInterface'); + $this->languageManager = $this->getMock('Drupal\Core\Language\LanguageManagerInterface'); $this->configNamesMapper = new TestConfigNamesMapper( 'system.site_information_settings', diff -u b/core/modules/language/src/LanguageListBuilder.php b/core/modules/language/src/LanguageListBuilder.php --- b/core/modules/language/src/LanguageListBuilder.php +++ b/core/modules/language/src/LanguageListBuilder.php @@ -60,7 +60,6 @@ $this->languageManager = $language_manager; } - /** * {@inheritdoc} */