@@ -53,13 +53,13 @@ |
||
53 | 53 | |
54 | 54 | if ($child instanceof Module && $child->isPageSpecific()) { |
55 | 55 | $duplicatedChild = $child::create([ |
56 | - 'slug' => $targetModel->title ? $targetModel->title . '-' . $child->slug : $child->slug . '-copy', |
|
56 | + 'slug' => $targetModel->title ? $targetModel->title.'-'.$child->slug : $child->slug.'-copy', |
|
57 | 57 | 'owner_id' => $targetModel->id, |
58 | 58 | 'owner_type' => $targetModel->getMorphClass() |
59 | 59 | ]); |
60 | 60 | |
61 | 61 | $this->moduleTemplateApplicator->handle($child, $duplicatedChild); |
62 | - } else { |
|
62 | + }else { |
|
63 | 63 | $duplicatedChild = $child; |
64 | 64 | } |
65 | 65 |
@@ -89,7 +89,7 @@ discard block |
||
89 | 89 | |
90 | 90 | public static function modelsByType(array $types, Model $ignoredModel = null, bool $online = true) |
91 | 91 | { |
92 | - $models = chiefMemoize('all-online-models-' . implode('_', $types), function () use ($types, $online) { |
|
92 | + $models = chiefMemoize('all-online-models-'.implode('_', $types), function() use ($types, $online) { |
|
93 | 93 | $builder = UrlRecord::whereNull('redirect_id') |
94 | 94 | ->select('model_type', 'model_id') |
95 | 95 | ->groupBy('model_type', 'model_id'); |
@@ -98,11 +98,11 @@ discard block |
||
98 | 98 | $builder->whereIn('model_type', $types); |
99 | 99 | } |
100 | 100 | |
101 | - return $builder->get()->mapToGroups(function ($record) { |
|
101 | + return $builder->get()->mapToGroups(function($record) { |
|
102 | 102 | return [$record->model_type => $record->model_id]; |
103 | - })->map(function ($record, $key) { |
|
103 | + })->map(function($record, $key) { |
|
104 | 104 | return Morphables::instance($key)->find($record->toArray()); |
105 | - })->map->reject(function ($model) use ($online) { |
|
105 | + })->map->reject(function($model) use ($online) { |
|
106 | 106 | if ($online) { |
107 | 107 | return is_null($model) || !$model->isPublished(); |
108 | 108 | } // Invalid references to archived or removed models where url record still exists. |
@@ -112,7 +112,7 @@ discard block |
||
112 | 112 | }); |
113 | 113 | |
114 | 114 | if ($ignoredModel) { |
115 | - $models = $models->reject(function ($model) use ($ignoredModel) { |
|
115 | + $models = $models->reject(function($model) use ($ignoredModel) { |
|
116 | 116 | return (get_class($model) === get_class($ignoredModel) && $model->id === $ignoredModel->id); |
117 | 117 | }); |
118 | 118 | } |
@@ -20,7 +20,7 @@ discard block |
||
20 | 20 | $manifestPath = '/chief-assets/back'; |
21 | 21 | |
22 | 22 | // Manifest expects each entry to start with a leading slash - we make sure to deduplicate the manifest path. |
23 | - $entry = str_replace($manifestPath, '', '/' . ltrim($filepath, '/')); |
|
23 | + $entry = str_replace($manifestPath, '', '/'.ltrim($filepath, '/')); |
|
24 | 24 | |
25 | 25 | try { |
26 | 26 | // Paths should be given relative to the manifestpath so make sure to remove the basepath |
@@ -28,7 +28,7 @@ discard block |
||
28 | 28 | } catch (\Exception $e) { |
29 | 29 | \Illuminate\Support\Facades\Log::error($e); |
30 | 30 | |
31 | - return $manifestPath . $entry; |
|
31 | + return $manifestPath.$entry; |
|
32 | 32 | } |
33 | 33 | } |
34 | 34 | } |
@@ -116,7 +116,7 @@ discard block |
||
116 | 116 | |
117 | 117 | $teaser = mb_substr($text, 0, $max, 'utf-8'); |
118 | 118 | |
119 | - return strlen($text) <= $max ? $teaser : $teaser . $ending; |
|
119 | + return strlen($text) <= $max ? $teaser : $teaser.$ending; |
|
120 | 120 | } |
121 | 121 | } |
122 | 122 | |
@@ -247,16 +247,16 @@ discard block |
||
247 | 247 | 'fragment', |
248 | 248 | ], null), $parsed_url, $overrides); |
249 | 249 | |
250 | - $scheme = $parsed_url['scheme'] ? $parsed_url['scheme'] . '://' : null; |
|
251 | - $port = $parsed_url['port'] ? ':' . $parsed_url['port'] : null; |
|
252 | - $fragment = $parsed_url['fragment'] ? '#' . $parsed_url['fragment'] : null; |
|
250 | + $scheme = $parsed_url['scheme'] ? $parsed_url['scheme'].'://' : null; |
|
251 | + $port = $parsed_url['port'] ? ':'.$parsed_url['port'] : null; |
|
252 | + $fragment = $parsed_url['fragment'] ? '#'.$parsed_url['fragment'] : null; |
|
253 | 253 | |
254 | - $baseurl = $scheme . $parsed_url['host'] . $port . $parsed_url['path']; |
|
254 | + $baseurl = $scheme.$parsed_url['host'].$port.$parsed_url['path']; |
|
255 | 255 | $current_query = []; |
256 | 256 | |
257 | 257 | $_query = explode('&', $parsed_url['query']); |
258 | 258 | |
259 | - array_map(function ($v) use (&$current_query) { |
|
259 | + array_map(function($v) use (&$current_query) { |
|
260 | 260 | if (!$v) { |
261 | 261 | return; |
262 | 262 | } |
@@ -274,7 +274,7 @@ discard block |
||
274 | 274 | |
275 | 275 | $query = urldecode(http_build_query(array_merge($current_query, $query_params))); |
276 | 276 | |
277 | - return $baseurl . '?' . $query . $fragment; |
|
277 | + return $baseurl.'?'.$query.$fragment; |
|
278 | 278 | } |
279 | 279 | } |
280 | 280 |
@@ -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) |