@@ -29,12 +29,12 @@ |
||
29 | 29 | |
30 | 30 | public function icon(): string |
31 | 31 | { |
32 | - if(isset($this->mapping[$this->mimetype])) { |
|
32 | + if (isset($this->mapping[$this->mimetype])) { |
|
33 | 33 | return $this->mapping[$this->mimetype]; |
34 | 34 | } |
35 | 35 | |
36 | - foreach($this->mapping as $mimetype => $icon) { |
|
37 | - if(Str::contains($this->mimetype, $mimetype)) { |
|
36 | + foreach ($this->mapping as $mimetype => $icon) { |
|
37 | + if (Str::contains($this->mimetype, $mimetype)) { |
|
38 | 38 | return $icon; |
39 | 39 | } |
40 | 40 | } |
@@ -22,24 +22,24 @@ |
||
22 | 22 | public function handle(Request $request) |
23 | 23 | { |
24 | 24 | // Strict protection enabled: we won't remove assets who are still being used... |
25 | - $assetIds = collect($request->input('asset_ids', []))->reject(function($assetId){ |
|
25 | + $assetIds = collect($request->input('asset_ids', []))->reject(function($assetId) { |
|
26 | 26 | return DB::table('asset_pivots') |
27 | 27 | ->where('asset_id', $assetId) |
28 | 28 | ->where('unused', 0) |
29 | 29 | ->exists(); |
30 | 30 | })->toArray(); |
31 | 31 | |
32 | - if($assetIds) |
|
32 | + if ($assetIds) |
|
33 | 33 | { |
34 | - foreach($assetIds as $k => $assetId) { |
|
35 | - try{ |
|
34 | + foreach ($assetIds as $k => $assetId) { |
|
35 | + try { |
|
36 | 36 | $this->deleteAsset->remove($assetId); |
37 | - } catch(FileNotAccessibleException $e) { |
|
37 | + } catch (FileNotAccessibleException $e) { |
|
38 | 38 | unset($assetIds[$k]); // So our count of removed assets is correct in the log. |
39 | 39 | } |
40 | 40 | } |
41 | 41 | |
42 | - Audit::activity()->log('removed ' . count($assetIds) . ' assets from the mediagallery.'); |
|
42 | + Audit::activity()->log('removed '.count($assetIds).' assets from the mediagallery.'); |
|
43 | 43 | |
44 | 44 | return true; |
45 | 45 | } |
@@ -17,7 +17,7 @@ discard block |
||
17 | 17 | |
18 | 18 | public function handle(string $filename, Request $request) |
19 | 19 | { |
20 | - $assets = Asset::whereIn('id', (array) $request->input('asset_ids', []))->get(); |
|
20 | + $assets = Asset::whereIn('id', (array)$request->input('asset_ids', []))->get(); |
|
21 | 21 | |
22 | 22 | // enable output of HTTP headers TODO: this should be moved to the controller instead... |
23 | 23 | $options = new Archive(); |
@@ -26,7 +26,7 @@ discard block |
||
26 | 26 | $zip = new ZipStream($filename, $options); |
27 | 27 | |
28 | 28 | $assets->each(function(Asset $asset) use($zip){ |
29 | - if(file_exists($asset->getFirstMediaPath())) { |
|
29 | + if (file_exists($asset->getFirstMediaPath())) { |
|
30 | 30 | $zip->addFileFromPath($asset->filename(), $asset->getFirstMediaPath()); |
31 | 31 | } |
32 | 32 | }); |
@@ -21,13 +21,13 @@ discard block |
||
21 | 21 | $assets = Asset::with('media')->orderBy('created_at', 'DESC')->select('assets.*'); |
22 | 22 | |
23 | 23 | if ($search) { |
24 | - $assets->whereHas('media', function (Builder $query) use ($search) { |
|
25 | - $query->where('file_name', 'LIKE', '%' . $search . '%'); |
|
24 | + $assets->whereHas('media', function(Builder $query) use ($search) { |
|
25 | + $query->where('file_name', 'LIKE', '%'.$search.'%'); |
|
26 | 26 | }); |
27 | 27 | } |
28 | 28 | |
29 | 29 | if ($unused) { |
30 | - $assets->whereNotExists(function ($query) { |
|
30 | + $assets->whereNotExists(function($query) { |
|
31 | 31 | $query->select(DB::raw(1)) |
32 | 32 | ->from('asset_pivots') |
33 | 33 | ->whereRaw('asset_pivots.asset_id = assets.id') |
@@ -35,7 +35,7 @@ discard block |
||
35 | 35 | }); |
36 | 36 | } |
37 | 37 | |
38 | - if($owner){ |
|
38 | + if ($owner) { |
|
39 | 39 | $owner = FlatReferenceFactory::fromString($owner)->instance(); |
40 | 40 | $modelAssets = collect(); |
41 | 41 | $modelAssets = $modelAssets->merge($owner->assets()); |
@@ -24,18 +24,18 @@ discard block |
||
24 | 24 | |
25 | 25 | public function bulk(Request $request) |
26 | 26 | { |
27 | - if($request->input('type') == 'download') { |
|
27 | + if ($request->input('type') == 'download') { |
|
28 | 28 | return $this->download($request); |
29 | 29 | } |
30 | 30 | |
31 | - if($request->input('type') == 'remove') { |
|
31 | + if ($request->input('type') == 'remove') { |
|
32 | 32 | return $this->remove($request); |
33 | 33 | } |
34 | 34 | } |
35 | 35 | |
36 | 36 | private function download(Request $request) |
37 | 37 | { |
38 | - $filename = Str::slug(config('app.name')) . '_assets_' . date('YmdHis') . '.zip'; |
|
38 | + $filename = Str::slug(config('app.name')).'_assets_'.date('YmdHis').'.zip'; |
|
39 | 39 | |
40 | 40 | // TODO: do the response here instead of the zip action itself |
41 | 41 | return $this->zipAction->handle($filename, $request); |
@@ -45,7 +45,7 @@ discard block |
||
45 | 45 | { |
46 | 46 | $result = $this->removalAction->handle($request); |
47 | 47 | |
48 | - if($result) { |
|
48 | + if ($result) { |
|
49 | 49 | return redirect()->back()->with('messages.success', 'De mediabestanden zijn verwijderd'); |
50 | 50 | } |
51 | 51 |
@@ -39,7 +39,7 @@ discard block |
||
39 | 39 | $targetModel = Morphables::instance($targetUrlRecord->model_type)->find($targetUrlRecord->model_id); |
40 | 40 | |
41 | 41 | if (!$targetModel) { |
42 | - throw new ArchivedUrlException('Corrupt target model for this url request. Model by reference [' . $targetUrlRecord->model_type . '@' . $targetUrlRecord->model_id . '] has probably been archived or deleted.'); |
|
42 | + throw new ArchivedUrlException('Corrupt target model for this url request. Model by reference ['.$targetUrlRecord->model_type.'@'.$targetUrlRecord->model_id.'] has probably been archived or deleted.'); |
|
43 | 43 | } |
44 | 44 | |
45 | 45 | return static::createRedirect($targetModel->url($locale)); |
@@ -49,14 +49,14 @@ discard block |
||
49 | 49 | } |
50 | 50 | |
51 | 51 | if (!$model) { |
52 | - throw new ArchivedUrlException('Corrupt target model for this url request. Model by reference [' . $urlRecord->model_type . '@' . $urlRecord->model_id . '] has probably been archived or deleted.'); |
|
52 | + throw new ArchivedUrlException('Corrupt target model for this url request. Model by reference ['.$urlRecord->model_type.'@'.$urlRecord->model_id.'] has probably been archived or deleted.'); |
|
53 | 53 | } |
54 | 54 | |
55 | 55 | if (method_exists($model, 'isPublished') && !$model->isPublished()) { |
56 | 56 | |
57 | 57 | /** When admin is logged in and this request is in preview mode, we allow the view */ |
58 | 58 | if (!PreviewMode::fromRequest()->check()) { |
59 | - throw new NotFoundHttpException('Model found for request [' . $slug . '] but it is not published.'); |
|
59 | + throw new NotFoundHttpException('Model found for request ['.$slug.'] but it is not published.'); |
|
60 | 60 | } |
61 | 61 | } |
62 | 62 | |
@@ -67,7 +67,7 @@ discard block |
||
67 | 67 | } |
68 | 68 | } |
69 | 69 | |
70 | - throw new NotFoundHttpException('No url or model found for request [' . $slug . '] for locale [' . $locale . '].'); |
|
70 | + throw new NotFoundHttpException('No url or model found for request ['.$slug.'] for locale ['.$locale.'].'); |
|
71 | 71 | } |
72 | 72 | |
73 | 73 | private static function createRedirect(string $url) |
@@ -8,7 +8,7 @@ discard block |
||
8 | 8 | |
9 | 9 | public function tagged($tag): bool |
10 | 10 | { |
11 | - $tags = (array) $tag; |
|
11 | + $tags = (array)$tag; |
|
12 | 12 | |
13 | 13 | return count(array_intersect($this->tags, $tags)) > 0; |
14 | 14 | } |
@@ -27,8 +27,8 @@ discard block |
||
27 | 27 | |
28 | 28 | public function untag($tag) |
29 | 29 | { |
30 | - foreach((array) $tag as $_tag) { |
|
31 | - if(false !== ($k = array_search($_tag, $this->tags))) { |
|
30 | + foreach ((array)$tag as $_tag) { |
|
31 | + if (false !== ($k = array_search($_tag, $this->tags))) { |
|
32 | 32 | unset($this->tags[$k]); |
33 | 33 | } |
34 | 34 | } |
@@ -51,7 +51,7 @@ discard block |
||
51 | 51 | |
52 | 52 | // If no view has been created for this page collection, we try once again to fetch the content value if any. This will silently fail |
53 | 53 | // if no content value is present. We don't consider the 'content' attribute to be a default as we do for module. |
54 | - return $this->map(function ($item) { |
|
54 | + return $this->map(function($item) { |
|
55 | 55 | return ($this->viewParent && $item instanceof ViewableContract) |
56 | 56 | ? $item->setViewParent($this->viewParent)->renderView() |
57 | 57 | : ($item->content ?? ''); |
@@ -86,7 +86,7 @@ discard block |
||
86 | 86 | $path = request()->path(); |
87 | 87 | |
88 | 88 | // When we have an entire collection as result we will cut down the items here, else if already paginated, we'll keep it as is. |
89 | - $items = $this->comingFromPaginatedCollection() ? $this->all() :array_slice($this->all(), ($currentPage - 1) * $perPage); |
|
89 | + $items = $this->comingFromPaginatedCollection() ? $this->all() : array_slice($this->all(), ($currentPage-1) * $perPage); |
|
90 | 90 | |
91 | 91 | return (new \Illuminate\Pagination\Paginator($items, $perPage ?? $this->paginateSetting('perPage', '12'), $currentPage))->setPath($path); |
92 | 92 | } |
@@ -102,10 +102,10 @@ discard block |
||
102 | 102 | public function paginate($perPage = null, $currentPage = null): Paginator |
103 | 103 | { |
104 | 104 | $currentPage = $currentPage ?? request()->get('page', 1); |
105 | - $path = '/' . request()->path(); |
|
105 | + $path = '/'.request()->path(); |
|
106 | 106 | |
107 | 107 | // When we have an entire collection as result we will cut down the items here, else if already paginated, we'll keep it as is. |
108 | - $items = $this->comingFromPaginatedCollection() ? $this->all() : array_slice($this->all(), ($currentPage - 1) * $perPage, $perPage); |
|
108 | + $items = $this->comingFromPaginatedCollection() ? $this->all() : array_slice($this->all(), ($currentPage-1) * $perPage, $perPage); |
|
109 | 109 | |
110 | 110 | return (new \Illuminate\Pagination\LengthAwarePaginator($items, $this->paginateSetting('total', $this->count()), $perPage ?? $this->paginateSetting('perPage', '12'), $currentPage))->setPath($path); |
111 | 111 | } |
@@ -10,7 +10,7 @@ discard block |
||
10 | 10 | { |
11 | 11 | public function onFailure(HealthCheck $healthCheck) |
12 | 12 | { |
13 | - session()->now($this->generateUniqueSessionKey(), ['type' => 'warning', 'message' => $healthCheck->message() ]); |
|
13 | + session()->now($this->generateUniqueSessionKey(), ['type' => 'warning', 'message' => $healthCheck->message()]); |
|
14 | 14 | } |
15 | 15 | |
16 | 16 | public function onSuccess(HealthCheck $healthCheck) |
@@ -19,10 +19,10 @@ discard block |
||
19 | 19 | |
20 | 20 | private function generateUniqueSessionKey(): string |
21 | 21 | { |
22 | - $toastId = 'toast_messages.' . mt_rand(0, 9999); |
|
22 | + $toastId = 'toast_messages.'.mt_rand(0, 9999); |
|
23 | 23 | |
24 | 24 | while (session()->get($toastId)) { |
25 | - $toastId = 'toast_messages.' . mt_rand(0, 9999); |
|
25 | + $toastId = 'toast_messages.'.mt_rand(0, 9999); |
|
26 | 26 | } |
27 | 27 | |
28 | 28 | return $toastId; |