misc cleanup

Author: anlutro

.gitignore

@@ -1,3 +1,4 @@
+/.idea
 /vendor
 composer.phar
 composer.lock

src/AbstractItem.php

@@ -77,9 +77,10 @@ public static function addIconResolvers(array $resolvers)
 	 */
 	protected function parseAttributes(array $in)
 	{
-		if (isset($in['icon']) && $in['icon'] instanceof Icon\IconInterface) {
+		if (isset($in['icon']) && $in['icon'] instanceof Icons\IconInterface) {
 			$this->icon = $in['icon'];
 		} else {
+			/** @var Icons\IconInterface $resolver */
 			foreach (static::$iconResolvers as $key => $resolver) {
 				if (array_key_exists($key, $in)) {
 					$this->icon = $resolver::createFromAttribute($in[$key]);

src/Collection.php

@@ -22,7 +22,7 @@ class Collection
 	/**
 	 * The menu items.
 	 *
-	 * @var array
+	 * @var ItemInterface[]
 	 */
 	protected $items = [];
 
@@ -246,10 +246,13 @@ public function render()
 		$items = '';
 		$sorted = $this->items;
 		ksort($sorted);
+
+		/** @var ItemInterface $item */
 		foreach (array_flatten($sorted) as $item) {
 			if ($item === static::DIVIDER) $items .= '<li class="divider"></li>';
 			else $items .= '<li>'.$item->render().'</li>';
 		}
+
 		return '<ul '.$this->renderAttributes().'>'.$items.'</ul>';
 	}
 }

src/Icons/FontAwesomeStack.php

@@ -11,7 +11,14 @@
 
 class FontAwesomeStack implements IconInterface
 {
+	/**
+	 * @var IconInterface[]
+	 */
 	protected $icons;
+
+	/**
+	 * @var string[]
+	 */
 	protected $classes = ['stack'];
 
 	public function __construct(array $icons, array $classes = array())

src/ItemInterface.php

@@ -11,5 +11,17 @@
 
 interface ItemInterface
 {
+	/**
+	 * Render the item.
+	 *
+	 * @return string
+	 */
 	public function render();
+
+	/**
+	 * Get the unique ID string for the item.
+	 *
+	 * @return string
+	 */
+	public function getId();
 }

src/SubmenuItem.php

@@ -9,8 +9,6 @@
 
 namespace anlutro\Menu;
 
-use Illuminate\Support\Str;
-
 /**
  * A menu submenu item.
  */

tests/MenuItemTest.php

@@ -51,14 +51,14 @@ public function testCustomIconResolver()
 	}
 }
 
-class CustomIcon implements \anlutro\Menu\ItemInterface
+class CustomIcon implements \anlutro\Menu\Icons\IconInterface
 {
 	public function render()
 	{
 		return 'custom-icon';
 	}
 
-	public static function createFromAttribute()
+	public static function createFromAttribute($attribute)
 	{
 		return new static;
 	}