@@ -3,13 +3,13 @@ |
||
| 3 | 3 | namespace Spatie\Menu; |
| 4 | 4 | |
| 5 | 5 | use Countable; |
| 6 | -use Spatie\Menu\Html\Tag; |
|
| 7 | -use Spatie\Menu\Html\Attributes; |
|
| 8 | 6 | use Spatie\Menu\Helpers\Reflection; |
| 7 | +use Spatie\Menu\Html\Attributes; |
|
| 8 | +use Spatie\Menu\Html\Tag; |
|
| 9 | 9 | use Spatie\Menu\Traits\Conditions as ConditionsTrait; |
| 10 | -use Spatie\Menu\Traits\HasTextAttributes as HasAttributesTrait; |
|
| 11 | 10 | use Spatie\Menu\Traits\HasHtmlAttributes as HasHtmlAttributesTrait; |
| 12 | 11 | use Spatie\Menu\Traits\HasParentAttributes as HasParentAttributesTrait; |
| 12 | +use Spatie\Menu\Traits\HasTextAttributes as HasAttributesTrait; |
|
| 13 | 13 | |
| 14 | 14 | class Menu implements Item, Countable, HasHtmlAttributes, HasParentAttributes |
| 15 | 15 | { |
@@ -60,7 +60,7 @@ |
||
| 60 | 60 | * |
| 61 | 61 | * @param array|\Iterator $items |
| 62 | 62 | * @param callable $callback |
| 63 | - * @param \Spatie\Menu\Menu|null $initial |
|
| 63 | + * @param null|\self $initial |
|
| 64 | 64 | * |
| 65 | 65 | * @return static |
| 66 | 66 | */ |
@@ -2,7 +2,6 @@ |
||
| 2 | 2 | |
| 3 | 3 | namespace Spatie\Menu\Traits; |
| 4 | 4 | |
| 5 | -use Spatie\Url\Url; |
|
| 6 | 5 | use Spatie\Menu\ActiveUrlChecker; |
| 7 | 6 | |
| 8 | 7 | /** |
@@ -3,11 +3,11 @@ |
||
| 3 | 3 | namespace Spatie\Menu; |
| 4 | 4 | |
| 5 | 5 | use Spatie\Menu\Html\Attributes; |
| 6 | -use Spatie\Menu\Traits\Conditions as ConditionsTrait; |
|
| 7 | 6 | use Spatie\Menu\Traits\Activatable as ActivatableTrait; |
| 8 | -use Spatie\Menu\Traits\HasTextAttributes as HasAttributesTrait; |
|
| 7 | +use Spatie\Menu\Traits\Conditions as ConditionsTrait; |
|
| 9 | 8 | use Spatie\Menu\Traits\HasHtmlAttributes as HasHtmlAttributesTrait; |
| 10 | 9 | use Spatie\Menu\Traits\HasParentAttributes as HasParentAttributesTrait; |
| 10 | +use Spatie\Menu\Traits\HasTextAttributes as HasAttributesTrait; |
|
| 11 | 11 | |
| 12 | 12 | class Link implements Item, HasHtmlAttributes, HasParentAttributes, Activatable |
| 13 | 13 | { |