@@ -17,8 +17,7 @@ |
||
17 | 17 | 'customProperties' => json_encode($media->custom_properties, JSON_FORCE_OBJECT), |
18 | 18 | 'orderColumn' => $media->order_column, |
19 | 19 | 'thumbUrl' => strtolower($media->extension) === 'svg' ? |
20 | - $media->getUrl() : |
|
21 | - $media->getUrl('admin'), |
|
20 | + $media->getUrl() : $media->getUrl('admin'), |
|
22 | 21 | 'originalUrl' => $media->getUrl(), |
23 | 22 | ]; |
24 | 23 | } |
@@ -2,7 +2,6 @@ |
||
2 | 2 | |
3 | 3 | namespace App\Repositories\Database; |
4 | 4 | |
5 | -use App\Foundation\Repositories\CacheRepository; |
|
6 | 5 | use App\Foundation\Repositories\CachesResults; |
7 | 6 | use App\Foundation\Repositories\DbRepository; |
8 | 7 | use app\Models\Article; |
@@ -6,6 +6,6 @@ |
||
6 | 6 | { |
7 | 7 | protected function rememberForever(string $key, $value) |
8 | 8 | { |
9 | - return cache()->rememberForever('repository.' . static::class . '.' . $key, $value); |
|
9 | + return cache()->rememberForever('repository.'.static::class.'.'.$key, $value); |
|
10 | 10 | } |
11 | 11 | } |
@@ -10,25 +10,25 @@ |
||
10 | 10 | { |
11 | 11 | public function register() |
12 | 12 | { |
13 | - Menu::macro('front', function () { |
|
13 | + Menu::macro('front', function() { |
|
14 | 14 | return Menu::new()->setActiveFromRequest(locale()); |
15 | 15 | }); |
16 | 16 | |
17 | - Menu::macro('main', function () { |
|
17 | + Menu::macro('main', function() { |
|
18 | 18 | return Menu::front() |
19 | 19 | ->addClass('nav navbar-nav') |
20 | 20 | ->url('/', 'Home'); |
21 | 21 | }); |
22 | 22 | |
23 | - Menu::macro('language', function () { |
|
24 | - return locales()->reduce(function (Menu $menu, string $locale) { |
|
23 | + Menu::macro('language', function() { |
|
24 | + return locales()->reduce(function(Menu $menu, string $locale) { |
|
25 | 25 | $menu->url($locale, $locale); |
26 | 26 | }, Menu::front()); |
27 | 27 | }); |
28 | 28 | |
29 | - Menu::macro('articleSiblings', function (Article $article) { |
|
29 | + Menu::macro('articleSiblings', function(Article $article) { |
|
30 | 30 | return app(ArticleRepository::class)->getSiblings($article) |
31 | - ->reduce(function (Menu $menu, Article $article) { |
|
31 | + ->reduce(function(Menu $menu, Article $article) { |
|
32 | 32 | return $menu->url($article->fullUrl, $article->name); |
33 | 33 | }, Menu::front()); |
34 | 34 | }); |
@@ -34,7 +34,7 @@ discard block |
||
34 | 34 | { |
35 | 35 | return Cache::rememberForever( |
36 | 36 | "article.findByTechnicalName.{$technicalName}", |
37 | - function () use ($technicalName): Article { |
|
37 | + function() use ($technicalName): Article { |
|
38 | 38 | $article = static::where('technical_name', $technicalName)->first(); |
39 | 39 | |
40 | 40 | if ($article === null) { |
@@ -50,7 +50,7 @@ discard block |
||
50 | 50 | { |
51 | 51 | return Cache::rememberForever( |
52 | 52 | "article.getWithTechnicalNameLike.{$technicalName}", |
53 | - function () use ($technicalName): Collection { |
|
53 | + function() use ($technicalName): Collection { |
|
54 | 54 | return static::where('technical_name', 'like', "{$technicalName}.%") |
55 | 55 | ->orderBy('order_column') |
56 | 56 | ->get(); |
@@ -89,14 +89,14 @@ discard block |
||
89 | 89 | $localeSegment = ''; |
90 | 90 | |
91 | 91 | if (locales()->count() > 1) { |
92 | - $localeSegment = "/" . locale(); |
|
92 | + $localeSegment = "/".locale(); |
|
93 | 93 | } |
94 | 94 | |
95 | 95 | if ($this->technical_name === SpecialArticle::HOME) { |
96 | 96 | return $localeSegment; |
97 | 97 | } |
98 | 98 | |
99 | - $parentUrl = $this->hasParentArticle() ? $this->parentArticle->url . '/' : ''; |
|
99 | + $parentUrl = $this->hasParentArticle() ? $this->parentArticle->url.'/' : ''; |
|
100 | 100 | |
101 | 101 | return "{$localeSegment}/{$parentUrl}{$this->url}"; |
102 | 102 | } |
@@ -14,32 +14,32 @@ discard block |
||
14 | 14 | */ |
15 | 15 | public function register() |
16 | 16 | { |
17 | - Collection::macro('dd', function () { |
|
17 | + Collection::macro('dd', function() { |
|
18 | 18 | dd($this); |
19 | 19 | }); |
20 | 20 | |
21 | - Collection::macro('ifEmpty', function ($callback) { |
|
21 | + Collection::macro('ifEmpty', function($callback) { |
|
22 | 22 | if ($this->empty()) { |
23 | 23 | $callback(); |
24 | 24 | } |
25 | 25 | return $this; |
26 | 26 | }); |
27 | 27 | |
28 | - Collection::macro('ifAny', function ($callback) { |
|
29 | - if (! $this->empty()) { |
|
28 | + Collection::macro('ifAny', function($callback) { |
|
29 | + if (!$this->empty()) { |
|
30 | 30 | $callback($this); |
31 | 31 | } |
32 | 32 | return $this; |
33 | 33 | }); |
34 | 34 | |
35 | - Collection::macro('range', function ($low, $high, $step = 1): Collection { |
|
35 | + Collection::macro('range', function($low, $high, $step = 1): Collection { |
|
36 | 36 | return new Collection(range($low, $high, $step)); |
37 | 37 | }); |
38 | 38 | |
39 | 39 | /** |
40 | 40 | * Returns true if $callback returns false for every item. |
41 | 41 | */ |
42 | - Collection::macro('none', function (callable $callback = null): bool { |
|
42 | + Collection::macro('none', function(callable $callback = null): bool { |
|
43 | 43 | return !$this->contains($callback); |
44 | 44 | }); |
45 | 45 | |
@@ -48,12 +48,12 @@ discard block |
||
48 | 48 | * |
49 | 49 | * If $callback is a string regard it as a validation rule. |
50 | 50 | */ |
51 | - Collection::macro('validate', function ($callback): bool { |
|
51 | + Collection::macro('validate', function($callback): bool { |
|
52 | 52 | if (is_string($callback) || is_array($callback)) { |
53 | 53 | |
54 | 54 | $validationRule = $callback; |
55 | 55 | |
56 | - $callback = function ($item) use ($validationRule) { |
|
56 | + $callback = function($item) use ($validationRule) { |
|
57 | 57 | return validate($item, $validationRule); |
58 | 58 | }; |
59 | 59 | } |
@@ -67,22 +67,22 @@ discard block |
||
67 | 67 | return true; |
68 | 68 | }); |
69 | 69 | |
70 | - Collection::macro('groupByObject', function ($callback, $keyName = 'key') { |
|
71 | - return Collection::make($this->items)->map(function ($item) use ($callback) { |
|
70 | + Collection::macro('groupByObject', function($callback, $keyName = 'key') { |
|
71 | + return Collection::make($this->items)->map(function($item) use ($callback) { |
|
72 | 72 | return ['key' => $callback($item), 'item' => $item]; |
73 | - })->groupBy(function (array $keyedItem) { |
|
73 | + })->groupBy(function(array $keyedItem) { |
|
74 | 74 | $key = $keyedItem['key']; |
75 | 75 | |
76 | - return get_class($key) . $key->id; |
|
77 | - })->map(function (Collection $group) use ($keyName) { |
|
78 | - return $group->reduce(function (array $result, array $group) use ($keyName) { |
|
76 | + return get_class($key).$key->id; |
|
77 | + })->map(function(Collection $group) use ($keyName) { |
|
78 | + return $group->reduce(function(array $result, array $group) use ($keyName) { |
|
79 | 79 | $result[$keyName] = $group['key']; |
80 | 80 | $result['items'][] = $group['item']; |
81 | 81 | |
82 | 82 | return $result; |
83 | 83 | }, []); |
84 | 84 | |
85 | - })->map(function (array $group) { |
|
85 | + })->map(function(array $group) { |
|
86 | 86 | $group['items'] = Collection::make($group['items']); |
87 | 87 | |
88 | 88 | return $group; |