Skip to content

Commit 85ae849

Browse files
yusronarifyusronarif
committed
Merge branch 'master' of github.com:koffinate/laravel-menu
2 parents 0a64973 + 26c00d1 commit 85ae849

File tree

5 files changed

+52
-57
lines changed

5 files changed

+52
-57
lines changed

‎helpers.php‎

Lines changed: 8 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -2,13 +2,12 @@
22

33
use Koffin\Menu\Enum\MenuType;
44

5-
if (!function_exists('menus')) {
5+
if (! function_exists('menus')) {
66
/**
7-
* Menu instance
8-
*
9-
* @param ?string $name
10-
* @param ?string $group
7+
* Menu instance.
118
*
9+
* @param ?string $name
10+
* @param ?string $group
1211
* @return \Koffin\Menu\Contracts\Menu
1312
*/
1413
function menus(?string $name = null, ?string $group = null): \Koffin\Menu\Contracts\Menu
@@ -17,19 +16,19 @@ function menus(?string $name = null, ?string $group = null): \Koffin\Menu\Contra
1716
}
1817
}
1918

20-
if (!function_exists('menuType')) {
19+
if (! function_exists('menuType')) {
2120
/**
22-
* Menu Type Enum
23-
*
24-
* @param string|null $type
21+
* Menu Type Enum.
2522
*
23+
* @param string|null $type
2624
* @return MenuType|string|null
2725
*/
2826
function menuType(?string $type = null): MenuType|string|null
2927
{
3028
if ($type) {
3129
return MenuType::tryFrom($type);
3230
}
31+
3332
return MenuType::class;
3433
}
3534
}

‎src/Factory.php‎

Lines changed: 38 additions & 42 deletions
Original file line numberDiff line numberDiff line change
@@ -18,24 +18,23 @@ class Factory implements \Koffin\Menu\Contracts\Menu
1818
private static string $childName;
1919

2020
/**
21-
* @param string|null $name
22-
* @param string|null $group
23-
* @param array $groupAttribute
21+
* @param string|null $name
22+
* @param string|null $group
23+
* @param array $groupAttribute
2424
*/
2525
public function __construct(?string $name = null, ?string $group = null, array $groupAttribute = [])
2626
{
2727
static::$name = $name ?? 'main';
2828
static::$group = $group ?? 'Default';
2929
static::$groupAttribute = new MenuItemAttribute($groupAttribute);
30-
if (!static::$factory instanceof Fluent) {
30+
if (! static::$factory instanceof Fluent) {
3131
static::$factory = new Fluent();
3232
}
3333
}
3434

3535
/**
36-
* @param bool $grouped
37-
* @param bool $resolvedOnly
38-
*
36+
* @param bool $grouped
37+
* @param bool $resolvedOnly
3938
* @return \Koffin\Menu\MenuCollection
4039
*/
4140
public function get(bool $grouped = true, bool $resolvedOnly = true): MenuCollection
@@ -54,30 +53,29 @@ public function get(bool $grouped = true, bool $resolvedOnly = true): MenuCollec
5453

5554
return $menus;
5655
}
57-
} catch (Exception $e) {}
56+
} catch (Exception $e) {
57+
}
5858

5959
return new MenuCollection();
6060
}
6161

6262
/**
63-
* @param string $name
64-
* @param string $title
65-
* @param array $attribute
66-
* @param array $param
67-
* @param string|null $activeRoute
68-
* @param array|null $activeRouteParam
69-
* @param \Closure|bool $resolver
70-
* @param bool $hasChild
71-
*
63+
* @param string $name
64+
* @param string $title
65+
* @param array $attribute
66+
* @param array $param
67+
* @param string|null $activeRoute
68+
* @param array|null $activeRouteParam
69+
* @param \Closure|bool $resolver
70+
* @param bool $hasChild
7271
* @return static
7372
*/
7473
public static function route(
7574
string $name, string $title,
7675
array $attribute = [], array $param = [],
7776
?string $activeRoute = null, ?array $activeRouteParam = null,
7877
Closure|bool $resolver = true, bool $hasChild = false
79-
): static
80-
{
78+
): static {
8179
return static::add(
8280
type: MenuType::ROUTE,
8381
name: $name,
@@ -91,24 +89,22 @@ public static function route(
9189
}
9290

9391
/**
94-
* @param string $name
95-
* @param string $title
96-
* @param array $attribute
97-
* @param array $param
98-
* @param string|null $activeRoute
99-
* @param array|null $activeRouteParam
100-
* @param \Closure|bool $resolver
101-
* @param bool $hasChild
102-
*
92+
* @param string $name
93+
* @param string $title
94+
* @param array $attribute
95+
* @param array $param
96+
* @param string|null $activeRoute
97+
* @param array|null $activeRouteParam
98+
* @param \Closure|bool $resolver
99+
* @param bool $hasChild
103100
* @return static
104101
*/
105102
public static function url(
106103
string $name, string $title,
107104
array $attribute = [], array $param = [],
108105
?string $activeRoute = null, ?array $activeRouteParam = null,
109106
Closure|bool $resolver = true, bool $hasChild = false
110-
): static
111-
{
107+
): static {
112108
return static::add(
113109
type: MenuType::URL,
114110
name: $name,
@@ -122,24 +118,22 @@ public static function url(
122118
}
123119

124120
/**
125-
* @param \Koffin\Menu\Enum\MenuType $type
126-
* @param string $name
127-
* @param string $title
128-
* @param array $attribute
129-
* @param array $param
130-
* @param string|null $activeRoute
131-
* @param array|null $activeRouteParam
132-
* @param \Closure|bool $resolver
133-
*
121+
* @param \Koffin\Menu\Enum\MenuType $type
122+
* @param string $name
123+
* @param string $title
124+
* @param array $attribute
125+
* @param array $param
126+
* @param string|null $activeRoute
127+
* @param array|null $activeRouteParam
128+
* @param \Closure|bool $resolver
134129
* @return static
135130
*/
136131
public static function add(
137132
MenuType $type, string $name, string $title,
138133
array $attribute = [], array $param = [],
139134
?string $activeRoute = null, ?array $activeRouteParam = null,
140135
Closure|bool $resolver = true
141-
): static
142-
{
136+
): static {
143137
$factory = static::getFactory();
144138
$factory->add(
145139
new MenuItem(
@@ -155,6 +149,7 @@ public static function add(
155149
resolver: $resolver,
156150
)
157151
);
152+
158153
return new static(name: static::$name, group: static::$group);
159154
}
160155

@@ -163,9 +158,10 @@ public static function add(
163158
*/
164159
private static function getFactory(): MenuCollection
165160
{
166-
if (!static::$factory[static::$name] instanceof MenuCollection) {
161+
if (! static::$factory[static::$name] instanceof MenuCollection) {
167162
static::$factory[static::$name] = new MenuCollection();
168163
}
164+
169165
return static::$factory[static::$name];
170166
}
171167
}

‎src/MenuCollection.php‎

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,5 +6,4 @@
66

77
class MenuCollection extends Collection
88
{
9-
109
}

‎src/MenuItem.php‎

Lines changed: 5 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -21,8 +21,7 @@ public function __construct(
2121
public MenuItemAttribute|array $groupAttribute = [],
2222
public \Closure|bool $resolver = true,
2323
public bool $hasChild = false,
24-
)
25-
{
24+
) {
2625
if (is_array($this->attribute)) {
2726
$this->attribute = new MenuItemAttribute($this->attribute);
2827
}
@@ -33,9 +32,10 @@ public function __construct(
3332

3433
public function resolve(): bool
3534
{
36-
if($this->resolver instanceof \Closure) {
35+
if ($this->resolver instanceof \Closure) {
3736
return (bool) $this->resolver->call($this);
3837
}
38+
3939
return $this->resolver;
4040
}
4141

@@ -96,7 +96,8 @@ private function isActiveRoute(string $route = '', array $params = []): bool
9696

9797
return true;
9898
}
99-
} catch (Exception $e) {}
99+
} catch (Exception $e) {
100+
}
100101

101102
return false;
102103
}

‎src/MenuServiceProvider.php‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,7 @@ public function register(): void
2323
*/
2424
public function boot(): void
2525
{
26-
$this->app->singleton('menus', fn($app, $p) => new Factory(name: $p['name'] ?? null, group: $p['group'] ?? null));
26+
$this->app->singleton('menus', fn ($app, $p) => new Factory(name: $p['name'] ?? null, group: $p['group'] ?? null));
2727
$this->app->alias('menus', Factory::class);
2828
}
2929
}

0 commit comments

Comments
 (0)