diff --git a/core/modules/config_translation/tests/src/ConfigEntityMapperTest.php b/core/modules/config_translation/tests/src/ConfigEntityMapperTest.php index bdc04f8..4a27390 100644 --- a/core/modules/config_translation/tests/src/ConfigEntityMapperTest.php +++ b/core/modules/config_translation/tests/src/ConfigEntityMapperTest.php @@ -79,6 +79,9 @@ public function setUp() { 'entity_type' => 'language_entity', 'route_name' => 'config_translation.item.overview.language.edit', ); + + $typed_config_manager = $this->getMock('Drupal\Core\Config\TypedConfigManagerInterface'); + $locale_config_manager = $this->getMockBuilder('Drupal\locale\LocaleConfigManager') ->disableOriginalConstructor() ->getMock(); @@ -87,6 +90,7 @@ public function setUp() { 'language_entity', $definition, $this->getConfigFactoryStub(), + $typed_config_manager, $locale_config_manager, $this->getMock('Drupal\config_translation\ConfigMapperManagerInterface'), $this->routeProvider, diff --git a/core/modules/config_translation/tests/src/ConfigNamesMapperTest.php b/core/modules/config_translation/tests/src/ConfigNamesMapperTest.php index 41a6b1a..70b82de 100644 --- a/core/modules/config_translation/tests/src/ConfigNamesMapperTest.php +++ b/core/modules/config_translation/tests/src/ConfigNamesMapperTest.php @@ -46,6 +46,13 @@ class ConfigNamesMapperTest extends UnitTestCase { protected $localeConfigManager; /** + * The locale configuration manager. + * + * @var \Drupal\locale\LocaleConfigManager|\PHPUnit_Framework_MockObject_MockObject + */ + protected $typedConfigManager; + + /** * The configuration mapper manager. * * @var \Drupal\config_translation\ConfigMapperManagerInterface|\PHPUnit_Framework_MockObject_MockObject @@ -88,6 +95,8 @@ public function setUp() { 'weight' => 42, ); + $this->typedConfigManager = $this->getMock('Drupal\Core\Config\TypedConfigManagerInterface'); + $this->localeConfigManager = $this->getMockBuilder('Drupal\locale\LocaleConfigManager') ->disableOriginalConstructor() ->getMock(); @@ -106,6 +115,7 @@ public function setUp() { 'system.site_information_settings', $this->pluginDefinition, $this->getConfigFactoryStub(), + $this->typedConfigManager, $this->localeConfigManager, $this->configMapperManager, $this->routeProvider, @@ -468,7 +478,7 @@ public function testHasSchema(array $mock_return_values, $expected) { foreach ($config_names as $i => $config_name) { $map[] = array($config_name, $mock_return_values[$i]); } - $this->localeConfigManager + $this->typedConfigManager ->expects($this->any()) ->method('hasConfigSchema') ->will($this->returnValueMap($map));