From 9b1a1d0d5fc6a82c11bdaffd88c7c30a9590e9d5 Mon Sep 17 00:00:00 2001 From: Caen De Silva Date: Mon, 25 Mar 2024 10:13:40 +0100 Subject: [PATCH] No longer implement navigation element contract --- .../src/Framework/Features/Navigation/NavigationGroup.php | 2 +- .../src/Framework/Features/Navigation/NavigationItem.php | 2 +- packages/framework/tests/Unit/NavigationGroupTest.php | 6 +----- packages/framework/tests/Unit/NavigationItemTest.php | 6 ------ 4 files changed, 3 insertions(+), 13 deletions(-) diff --git a/packages/framework/src/Framework/Features/Navigation/NavigationGroup.php b/packages/framework/src/Framework/Features/Navigation/NavigationGroup.php index 0d619dce874..ca6e696da2b 100644 --- a/packages/framework/src/Framework/Features/Navigation/NavigationGroup.php +++ b/packages/framework/src/Framework/Features/Navigation/NavigationGroup.php @@ -14,7 +14,7 @@ /** * Abstraction for a grouped navigation menu item, like a dropdown or a sidebar group. */ -class NavigationGroup implements NavigationElement +class NavigationGroup { /** @var array<\Hyde\Framework\Features\Navigation\NavigationItem> */ protected array $items = []; diff --git a/packages/framework/src/Framework/Features/Navigation/NavigationItem.php b/packages/framework/src/Framework/Features/Navigation/NavigationItem.php index 8e406303dd3..3847bc79b18 100644 --- a/packages/framework/src/Framework/Features/Navigation/NavigationItem.php +++ b/packages/framework/src/Framework/Features/Navigation/NavigationItem.php @@ -20,7 +20,7 @@ * 2. You can use NavigationItem::fromRoute() to use data from the route * 3. You can use NavigationItem::create() for an external or un-routed link */ -class NavigationItem implements NavigationElement, Stringable +class NavigationItem implements Stringable { protected string|Route $destination; protected string $label; diff --git a/packages/framework/tests/Unit/NavigationGroupTest.php b/packages/framework/tests/Unit/NavigationGroupTest.php index 077659cdb9f..378a1d7fe52 100644 --- a/packages/framework/tests/Unit/NavigationGroupTest.php +++ b/packages/framework/tests/Unit/NavigationGroupTest.php @@ -26,6 +26,7 @@ public static function setUpBeforeClass(): void public function testCanConstruct() { + $this->assertInstanceOf(NavigationGroup::class, new NavigationGroup('Foo')); $this->assertSame('Foo', (new NavigationGroup('Foo'))->getLabel()); } @@ -57,11 +58,6 @@ public function testCanConstructWithChildrenWithoutRoute() $this->assertSame($children, $item->getItems()); } - public function testIsInstanceOfNavigationElement() - { - $this->assertInstanceOf(NavigationGroup::class, new NavigationGroup('Foo')); - } - public function testCreate() { $this->assertEquals( diff --git a/packages/framework/tests/Unit/NavigationItemTest.php b/packages/framework/tests/Unit/NavigationItemTest.php index 02152f8a182..0e1da8957b6 100644 --- a/packages/framework/tests/Unit/NavigationItemTest.php +++ b/packages/framework/tests/Unit/NavigationItemTest.php @@ -14,7 +14,6 @@ use Hyde\Testing\UnitTestCase; use Mockery; use Hyde\Framework\Features\Navigation\NavigationGroup; -use Hyde\Framework\Features\Navigation\NavigationElement; /** * This unit test covers the basics of the NavigationItem class. @@ -46,11 +45,6 @@ public function testConstruct() $this->assertInstanceOf(NavigationItem::class, new NavigationItem(new Route(new MarkdownPage()), 'Test', 500)); } - public function testIsInstanceOfNavigationElement() - { - $this->assertInstanceOf(NavigationElement::class, new NavigationItem(new Route(new MarkdownPage()), 'Test', 500)); - } - public function testPassingRouteInstanceToConstructorUsesRouteInstance() { $route = new Route(new MarkdownPage());