Skip to content

Commit f17a412

Browse files
committed
Breaking: Rename NavItem method getGroup to getGroupIdentifier
Renames `getGroup()` to `getGroupIdentifier()` to clarify the purpose of the method.
1 parent 64c3e0e commit f17a412

File tree

5 files changed

+14
-14
lines changed

5 files changed

+14
-14
lines changed

packages/framework/src/Framework/Features/Navigation/NavItem.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -156,7 +156,7 @@ public function getPriority(): int
156156
*
157157
* For sidebars this is the category key, for navigation menus this is the dropdown key.
158158
*/
159-
public function getGroup(): ?string
159+
public function getGroupIdentifier(): ?string
160160
{
161161
return $this->group;
162162
}

packages/framework/src/Framework/Features/Navigation/NavigationMenuGenerator.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -135,7 +135,7 @@ protected function addRouteToGroup(Route $route): void
135135
{
136136
$item = NavItem::forRoute($route);
137137

138-
$groupName = $this->generatesSidebar ? ($item->getGroup() ?? 'Other') : $item->getGroup();
138+
$groupName = $this->generatesSidebar ? ($item->getGroupIdentifier() ?? 'Other') : $item->getGroupIdentifier();
139139

140140
$groupItem = $this->getOrCreateGroupItem($groupName);
141141

packages/framework/tests/Feature/AutomaticNavigationConfigurationsTest.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1317,7 +1317,7 @@ public function __construct(TestCase $test, $sidebar = false)
13171317
public function state(): array
13181318
{
13191319
return $this->items->map(function (NavItem $item): TestNavItem {
1320-
return new TestNavItem($item->getLabel(), $item->getGroup(), $item->getPriority(), $item->getChildren());
1320+
return new TestNavItem($item->getLabel(), $item->getGroupIdentifier(), $item->getPriority(), $item->getChildren());
13211321
})->toArray();
13221322
}
13231323

packages/framework/tests/Feature/Services/DocumentationSidebarTest.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -157,7 +157,7 @@ public function testSidebarPrioritiesCanBeSetInBothFrontMatterAndConfig()
157157
public function testGroupCanBeSetInFrontMatter()
158158
{
159159
$this->makePage('foo', ['navigation.group' => 'bar']);
160-
$this->assertEquals('bar', collect(NavigationMenuGenerator::handle(DocumentationSidebar::class)->getItems()->first()->getChildren())->first()->getGroup());
160+
$this->assertEquals('bar', collect(NavigationMenuGenerator::handle(DocumentationSidebar::class)->getItems()->first()->getChildren())->first()->getGroupIdentifier());
161161
}
162162

163163
public function testHasGroupsReturnsFalseWhenThereAreNoGroups()

packages/framework/tests/Unit/NavItemTest.php

Lines changed: 10 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -146,7 +146,7 @@ public function testGetPriority()
146146
public function testGetGroup()
147147
{
148148
$navItem = new NavItem(new Route(new InMemoryPage('foo')), 'Page', 500);
149-
$this->assertNull($navItem->getGroup());
149+
$this->assertNull($navItem->getGroupIdentifier());
150150
}
151151

152152
public function testGetChildren()
@@ -325,28 +325,28 @@ public function testIsCurrentWithExternalRoute()
325325

326326
public function testGetGroupWithNoGroup()
327327
{
328-
$this->assertNull((new NavItem(new Route(new MarkdownPage()), 'Test', 500))->getGroup());
328+
$this->assertNull((new NavItem(new Route(new MarkdownPage()), 'Test', 500))->getGroupIdentifier());
329329
}
330330

331331
public function testGetGroupWithGroup()
332332
{
333-
$this->assertSame('foo', (new NavItem(new Route(new MarkdownPage()), 'Test', 500, 'foo'))->getGroup());
333+
$this->assertSame('foo', (new NavItem(new Route(new MarkdownPage()), 'Test', 500, 'foo'))->getGroupIdentifier());
334334
}
335335

336336
public function testGetGroupFromRouteWithGroup()
337337
{
338-
$this->assertSame('foo', NavItem::forRoute(new Route(new MarkdownPage(matter: ['navigation.group' => 'foo'])))->getGroup());
338+
$this->assertSame('foo', NavItem::forRoute(new Route(new MarkdownPage(matter: ['navigation.group' => 'foo'])))->getGroupIdentifier());
339339
}
340340

341341
public function testGetGroupForRouteWithGroup()
342342
{
343-
$this->assertSame('foo', NavItem::forRoute(new Route(new MarkdownPage(matter: ['navigation.group' => 'foo'])), 'foo')->getGroup());
343+
$this->assertSame('foo', NavItem::forRoute(new Route(new MarkdownPage(matter: ['navigation.group' => 'foo'])), 'foo')->getGroupIdentifier());
344344
}
345345

346346
public function testGroupKeysAreNormalized()
347347
{
348348
$item = new NavItem(new Route(new MarkdownPage()), 'Test', 500, 'Foo Bar');
349-
$this->assertSame('foo-bar', $item->getGroup());
349+
$this->assertSame('foo-bar', $item->getGroupIdentifier());
350350
}
351351

352352
public function testIdentifier()
@@ -434,8 +434,8 @@ public function testAddingAnItemWithAGroupKeyKeepsTheSetGroupKey()
434434

435435
$parent->addChild($child);
436436

437-
$this->assertSame('foo', $parent->getGroup());
438-
$this->assertSame('bar', $child->getGroup());
437+
$this->assertSame('foo', $parent->getGroupIdentifier());
438+
$this->assertSame('bar', $child->getGroupIdentifier());
439439
}
440440

441441
public function testAddingAnItemWithNoGroupKeyUsesParentIdentifier()
@@ -445,7 +445,7 @@ public function testAddingAnItemWithNoGroupKeyUsesParentIdentifier()
445445

446446
$parent->addChild($child);
447447

448-
$this->assertSame('foo', $parent->getGroup());
449-
$this->assertSame('foo', $child->getGroup());
448+
$this->assertSame('foo', $parent->getGroupIdentifier());
449+
$this->assertSame('foo', $child->getGroupIdentifier());
450450
}
451451
}

0 commit comments

Comments
 (0)