From 76cf704af234591a8ee8b4a4c40002e0b9d10e67 Mon Sep 17 00:00:00 2001
From: Nathaniel Catchpole <catch@35733.no-reply.drupal.org>
Date: Thu, 8 Jan 2015 10:48:32 +0000
Subject: [PATCH] Issue #2403169 by alexpott: Static menu link override
configuration is incorrectly named
---
...rides.yml => core.menu.static_menu_link_overrides.yml} | 0
core/config/schema/core.menu.schema.yml | 5 ++---
core/lib/Drupal/Core/Menu/StaticMenuLinkOverrides.php | 2 +-
.../Tests/Core/Menu/StaticMenuLinkOverridesTest.php | 8 ++++----
4 files changed, 7 insertions(+), 8 deletions(-)
rename core/config/install/{menu_link.static.overrides.yml => core.menu.static_menu_link_overrides.yml} (100%)
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 a1fc321dfc7d..ac11b46865c6 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 ebde90630344..86d8f85b683d 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 c436d6f391c1..ea37f39b77c0 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')));
--
GitLab