MenuItem: allow data to be structured

Author: PavelJurasek

src/DI/MenuExtension.php

@@ -43,7 +43,7 @@ public function getItemSchema(): Schema
 			'action' => Expect::type('string|array'),
 			'link' => Expect::string(),
 			'include' => Expect::type('string|array'),
-			'data' => Expect::arrayOf('string', 'string'),
+			'data' => Expect::arrayOf('mixed', 'string'),
 			'items' => Expect::array(),
 			'visibility' => Expect::from(new MenuVisibility()),
 		]);

src/IMenuItem.php

@@ -32,20 +32,20 @@ public function getRealLink(): string;
 	public function getRealAbsoluteLink(): string;
 
 	/**
-	 * @return array<string, string>
+	 * @return array<string, mixed>
 	 */
 	public function getData(): array;
 
 	/**
-	 * @param array<string, string> $data
+	 * @param array<string, mixed> $data
 	 */
 	public function setData(array $data): void;
 
 	public function hasDataItem(string $name): bool;
 
-	public function getDataItem(string $name, ?string $default = null): ?string;
+	public function getDataItem(string $name, mixed $default = null): mixed;
 
-	public function addDataItem(string $name, string $value): void;
+	public function addDataItem(string $name, mixed $value): void;
 
 	/**
 	 * @param string[] $include

src/Traits/MenuItemData.php

@@ -29,7 +29,7 @@ public function hasDataItem(string $name): bool
 		return array_key_exists($name, $this->data);
 	}
 
-	public function getDataItem(string $name, ?string $default = null): ?string
+	public function getDataItem(string $name, mixed $default = null): mixed
 	{
 		if (!array_key_exists($name, $this->data)) {
 			return $default;
@@ -38,7 +38,7 @@ public function getDataItem(string $name, ?string $default = null): ?string
 		return $this->data[$name];
 	}
 
-	public function addDataItem(string $name, string $value): void
+	public function addDataItem(string $name, mixed $value): void
 	{
 		$this->data[$name] = $value;
 	}

tests/cases/DI/MenuExtensionTest.php

@@ -32,6 +32,21 @@ public function testDI(): void
 		Assert::type(MenuComponent::class, $dic->getService('menu.component.factory')->create('default'));
 	}
 
+	public function testDataItems(): void
+	{
+		$dic = $this->createContainer();
+
+		$container = $dic->getService('menu.container');
+		/** @var \Contributte\MenuControl\IMenu $menu */
+		$menu = $container->getMenu('default');
+
+		$item = $menu->getItem('Homepage');
+
+		Assert::type('bool', $item->getDataItem('bool'));
+		Assert::type('string', $item->getDataItem('icon'));
+		Assert::type('array', $item->getDataItem('structured'));
+	}
+
 	public function testRender(): void
 	{
 		$dic = $this->createContainer();

tests/cases/DI/config.neon

@@ -22,3 +22,8 @@ menu:
 				items:
 					Category:
 						action: Category:default
+				data:
+					icon: fa fa-home
+					bool: true
+					structured:
+						key: value