diff --git a/core/config/install/menu_link.static.overrides.yml b/core/config/install/core.menu.static_menu_link_overrides.yml similarity index 100% rename from core/config/install/menu_link.static.overrides.yml rename to core/config/install/core.menu.static_menu_link_overrides.yml diff --git a/core/config/schema/core.menu.schema.yml b/core/config/schema/core.menu.schema.yml index a1fc321dfc7d32ebcfad1160945b3e2dc20a57e8..ac11b46865c6d15f1fdbd5ec273c6a9ff2efc620 100644 --- a/core/config/schema/core.menu.schema.yml +++ b/core/config/schema/core.menu.schema.yml @@ -1,7 +1,6 @@ - -menu_link.static.overrides: +core.menu.static_menu_link_overrides: type: mapping - label: 'Menu link overrides' + label: 'Static menu link overrides' mapping: definitions: type: sequence diff --git a/core/lib/Drupal/Core/Menu/StaticMenuLinkOverrides.php b/core/lib/Drupal/Core/Menu/StaticMenuLinkOverrides.php index ebde906303446468c11897ea75b823684f01c94b..86d8f85b683da94518144405daf9c0107b459998 100644 --- a/core/lib/Drupal/Core/Menu/StaticMenuLinkOverrides.php +++ b/core/lib/Drupal/Core/Menu/StaticMenuLinkOverrides.php @@ -19,7 +19,7 @@ class StaticMenuLinkOverrides implements StaticMenuLinkOverridesInterface { * * @var string */ - protected $configName = 'menu_link.static.overrides'; + protected $configName = 'core.menu.static_menu_link_overrides'; /** * The menu link overrides config object. diff --git a/core/tests/Drupal/Tests/Core/Menu/StaticMenuLinkOverridesTest.php b/core/tests/Drupal/Tests/Core/Menu/StaticMenuLinkOverridesTest.php index c436d6f391c1611a1e8f3f0853eec6f94d567bf8..ea37f39b77c065918ad4ca31aee50f5bf04713b4 100644 --- a/core/tests/Drupal/Tests/Core/Menu/StaticMenuLinkOverridesTest.php +++ b/core/tests/Drupal/Tests/Core/Menu/StaticMenuLinkOverridesTest.php @@ -22,7 +22,7 @@ class StaticMenuLinkOverridesTest extends UnitTestCase { * @covers ::__construct */ public function testConstruct() { - $config_factory = $this->getConfigFactoryStub(array('menu_link.static.overrides' => array())); + $config_factory = $this->getConfigFactoryStub(array('core.menu.static_menu_link_overrides' => array())); $static_override = new StaticMenuLinkOverrides($config_factory); $this->assertAttributeEquals($config_factory, 'configFactory', $static_override); @@ -37,7 +37,7 @@ public function testReload() { $config_factory = $this->getMock('Drupal\Core\Config\ConfigFactoryInterface'); $config_factory->expects($this->at(0)) ->method('reset') - ->with('menu_link.static.overrides'); + ->with('core.menu.static_menu_link_overrides'); $static_override = new StaticMenuLinkOverrides($config_factory); @@ -53,7 +53,7 @@ public function testReload() { * @covers ::getConfig */ public function testLoadOverride($overrides, $id, $expected) { - $config_factory = $this->getConfigFactoryStub(array('menu_link.static.overrides' => array('definitions' => $overrides))); + $config_factory = $this->getConfigFactoryStub(array('core.menu.static_menu_link_overrides' => array('definitions' => $overrides))); $static_override = new StaticMenuLinkOverrides($config_factory); $this->assertEquals($expected, $static_override->loadOverride($id)); @@ -88,7 +88,7 @@ public function testLoadMultipleOverrides() { $overrides['test2'] = array('parent' => 'test1'); $overrides['test1__la___ma'] = array('parent' => 'test2'); - $config_factory = $this->getConfigFactoryStub(array('menu_link.static.overrides' => array('definitions' => $overrides))); + $config_factory = $this->getConfigFactoryStub(array('core.menu.static_menu_link_overrides' => array('definitions' => $overrides))); $static_override = new StaticMenuLinkOverrides($config_factory); $this->assertEquals(array('test1' => array('parent' => 'test0'), 'test1.la__ma' => array('parent' => 'test2')), $static_override->loadMultipleOverrides(array('test1', 'test1.la__ma')));