@@ -13,7 +13,7 @@ discard block |
||
13 | 13 | */ |
14 | 14 | public function up() |
15 | 15 | { |
16 | - Schema::create('files', function (Blueprint $table) { |
|
16 | + Schema::create('files', function(Blueprint $table) { |
|
17 | 17 | $table->increments('id')->unsigned(); |
18 | 18 | $table->timestamps(); |
19 | 19 | $table->softDeletes(); |
@@ -22,7 +22,7 @@ discard block |
||
22 | 22 | $table->integer('size')->unsigned(); |
23 | 23 | }); |
24 | 24 | |
25 | - Schema::create('fileables', function (Blueprint $table) { |
|
25 | + Schema::create('fileables', function(Blueprint $table) { |
|
26 | 26 | $table->increments('id'); |
27 | 27 | $table->timestamps(); |
28 | 28 | $table->softDeletes(); |
@@ -13,7 +13,7 @@ discard block |
||
13 | 13 | */ |
14 | 14 | public function up() |
15 | 15 | { |
16 | - Schema::create('tagged', function (Blueprint $table) { |
|
16 | + Schema::create('tagged', function(Blueprint $table) { |
|
17 | 17 | $table->increments('id'); |
18 | 18 | $table->string('taggable_type'); |
19 | 19 | $table->integer('taggable_id')->unsigned(); |
@@ -21,7 +21,7 @@ discard block |
||
21 | 21 | $table->index(['taggable_type', 'taggable_id']); |
22 | 22 | }); |
23 | 23 | |
24 | - Schema::create('tags', function (Blueprint $table) { |
|
24 | + Schema::create('tags', function(Blueprint $table) { |
|
25 | 25 | $table->increments('id'); |
26 | 26 | $table->string('namespace'); |
27 | 27 | $table->string('slug'); |
@@ -14,7 +14,7 @@ |
||
14 | 14 | 'source' => env('GLIDE_SOURCE', storage_path('app/public/' . config('twill.media_library.local_path'))), |
15 | 15 | 'cache' => env('GLIDE_CACHE', storage_path('app')), |
16 | 16 | 'cache_path_prefix' => env('GLIDE_CACHE_PATH_PREFIX', 'glide_cache'), |
17 | - 'base_url' => env('GLIDE_BASE_URL', request()->getScheme() . '://' . str_replace(['http://', 'https://'], '',config('app.url'))), |
|
17 | + 'base_url' => env('GLIDE_BASE_URL', request()->getScheme() . '://' . str_replace(['http://', 'https://'], '', config('app.url'))), |
|
18 | 18 | 'base_path' => env('GLIDE_BASE_PATH', 'img'), |
19 | 19 | 'use_signed_urls' => env('GLIDE_USE_SIGNED_URLS', false), |
20 | 20 | 'sign_key' => env('GLIDE_SIGN_KEY'), |
@@ -195,7 +195,7 @@ |
||
195 | 195 | $handler = new \Whoops\Handler\PrettyPageHandler(); |
196 | 196 | |
197 | 197 | if ($this->app->environment('local', 'development')) { |
198 | - $handler->setEditor(function ($file, $line) { |
|
198 | + $handler->setEditor(function($file, $line) { |
|
199 | 199 | $translations = array('^' . |
200 | 200 | $this->config->get('twill.debug.whoops_path_guest') => $this->config->get('twill.debug.whoops_path_host'), |
201 | 201 | ); |
@@ -50,8 +50,8 @@ discard block |
||
50 | 50 | 'as' => 'admin.', |
51 | 51 | 'middleware' => [config('twill.admin_middleware_group', 'web')], |
52 | 52 | 'prefix' => rtrim(ltrim(config('twill.admin_app_path'), '/'), '/'), |
53 | - ], function ($router) { |
|
54 | - $router->group(['middleware' => ['twill_auth:twill_users', 'impersonate', 'validateBackHistory']], function ($router) { |
|
53 | + ], function($router) { |
|
54 | + $router->group(['middleware' => ['twill_auth:twill_users', 'impersonate', 'validateBackHistory']], function($router) { |
|
55 | 55 | require base_path('routes/admin.php'); |
56 | 56 | }); |
57 | 57 | }); |
@@ -64,16 +64,16 @@ discard block |
||
64 | 64 | 'middleware' => [config('twill.admin_middleware_group', 'web')], |
65 | 65 | 'prefix' => rtrim(ltrim(config('twill.admin_app_path'), '/'), '/'), |
66 | 66 | ], |
67 | - function ($router) { |
|
68 | - $router->group(['middleware' => ['twill_auth:twill_users', 'impersonate', 'validateBackHistory']], function ($router) { |
|
67 | + function($router) { |
|
68 | + $router->group(['middleware' => ['twill_auth:twill_users', 'impersonate', 'validateBackHistory']], function($router) { |
|
69 | 69 | require __DIR__ . '/../routes/admin.php'; |
70 | 70 | }); |
71 | 71 | |
72 | - $router->group(['middleware' => ['noDebugBar']], function ($router) { |
|
72 | + $router->group(['middleware' => ['noDebugBar']], function($router) { |
|
73 | 73 | require __DIR__ . '/../routes/auth.php'; |
74 | 74 | }); |
75 | 75 | |
76 | - $router->group(['middleware' => array_merge(['noDebugBar'], ($this->app->environment('production') ? ['twill_auth:twill_users'] : []))], function ($router) { |
|
76 | + $router->group(['middleware' => array_merge(['noDebugBar'], ($this->app->environment('production') ? ['twill_auth:twill_users'] : []))], function($router) { |
|
77 | 77 | require __DIR__ . '/../routes/templates.php'; |
78 | 78 | }); |
79 | 79 | } |
@@ -85,8 +85,8 @@ discard block |
||
85 | 85 | 'domain' => config('app.url'), |
86 | 86 | 'middleware' => [config('twill.admin_middleware_group', 'web')], |
87 | 87 | ], |
88 | - function ($router) { |
|
89 | - $router->group(['middleware' => array_merge(['noDebugBar'], ($this->app->environment('production') ? ['twill_auth:twill_users'] : []))], function ($router) { |
|
88 | + function($router) { |
|
89 | + $router->group(['middleware' => array_merge(['noDebugBar'], ($this->app->environment('production') ? ['twill_auth:twill_users'] : []))], function($router) { |
|
90 | 90 | require __DIR__ . '/../routes/templates.php'; |
91 | 91 | }); |
92 | 92 | } |
@@ -125,7 +125,7 @@ discard block |
||
125 | 125 | */ |
126 | 126 | protected function registerMacros() |
127 | 127 | { |
128 | - Route::macro('moduleShowWithPreview', function ($moduleName, $routePrefix = null, $controllerName = null) { |
|
128 | + Route::macro('moduleShowWithPreview', function($moduleName, $routePrefix = null, $controllerName = null) { |
|
129 | 129 | if ($routePrefix === null) { |
130 | 130 | $routePrefix = $moduleName; |
131 | 131 | } |
@@ -141,12 +141,12 @@ discard block |
||
141 | 141 | Route::name($moduleName . '.preview')->get('/admin-preview' . $routePrefix . '{slug}', $controllerName . 'Controller@show')->middleware(['web', 'twill_auth:twill_users', 'can:list']); |
142 | 142 | }); |
143 | 143 | |
144 | - Route::macro('module', function ($slug, $options = [], $resource_options = [], $resource = true) { |
|
144 | + Route::macro('module', function($slug, $options = [], $resource_options = [], $resource = true) { |
|
145 | 145 | |
146 | 146 | $slugs = explode('.', $slug); |
147 | 147 | $prefixSlug = str_replace('.', "/", $slug); |
148 | 148 | $_slug = Arr::last($slugs); |
149 | - $className = implode("", array_map(function ($s) { |
|
149 | + $className = implode("", array_map(function($s) { |
|
150 | 150 | return ucfirst(Str::singular($s)); |
151 | 151 | }, $slugs)); |
152 | 152 | |
@@ -193,7 +193,7 @@ discard block |
||
193 | 193 | |
194 | 194 | if ($resource) { |
195 | 195 | $customRoutePrefix = !empty($groupPrefix) ? "{$groupPrefix}." : ""; |
196 | - Route::group(['as' => $customRoutePrefix], function () use ($slug, $className, $resource_options) { |
|
196 | + Route::group(['as' => $customRoutePrefix], function() use ($slug, $className, $resource_options) { |
|
197 | 197 | Route::resource($slug, "{$className}Controller", $resource_options); |
198 | 198 | }); |
199 | 199 | } |
@@ -154,7 +154,7 @@ |
||
154 | 154 | protected function formData($request) |
155 | 155 | { |
156 | 156 | $user = $this->authFactory->guard('twill_users')->user(); |
157 | - $with2faSettings = $this->config->get('twill.enabled.users-2fa') && $user->id == $request->route('user');; |
|
157 | + $with2faSettings = $this->config->get('twill.enabled.users-2fa') && $user->id == $request->route('user'); ; |
|
158 | 158 | |
159 | 159 | if ($with2faSettings) { |
160 | 160 | $google2fa = new Google2FA(); |
@@ -8,7 +8,7 @@ discard block |
||
8 | 8 | } |
9 | 9 | |
10 | 10 | if (config('twill.enabled.media-library')) { |
11 | - Route::group(['prefix' => 'media-library', 'as' => 'media-library.'], function () { |
|
11 | + Route::group(['prefix' => 'media-library', 'as' => 'media-library.'], function() { |
|
12 | 12 | Route::post('sign-s3-upload', ['as' => 'sign-s3-upload', 'uses' => 'MediaLibraryController@signS3Upload']); |
13 | 13 | Route::get('sign-azure-upload', ['as' => 'sign-azure-upload', 'uses' => 'MediaLibraryController@signAzureUpload']); |
14 | 14 | Route::put('medias/single-update', ['as' => 'medias.single-update', 'uses' => 'MediaLibraryController@singleUpdate']); |
@@ -20,7 +20,7 @@ discard block |
||
20 | 20 | } |
21 | 21 | |
22 | 22 | if (config('twill.enabled.file-library')) { |
23 | - Route::group(['prefix' => 'file-library', 'as' => 'file-library.'], function () { |
|
23 | + Route::group(['prefix' => 'file-library', 'as' => 'file-library.'], function() { |
|
24 | 24 | Route::post('sign-s3-upload', ['as' => 'sign-s3-upload', 'uses' => 'FileLibraryController@signS3Upload']); |
25 | 25 | Route::get('sign-azure-upload', ['as' => 'sign-azure-upload', 'uses' => 'FileLibraryController@signAzureUpload']); |
26 | 26 | Route::put('files/single-update', ['as' => 'files.single-update', 'uses' => 'FileLibraryController@singleUpdate']); |
@@ -36,14 +36,14 @@ discard block |
||
36 | 36 | } |
37 | 37 | |
38 | 38 | if (config('twill.enabled.buckets')) { |
39 | - $bucketsRoutes = config('twill.bucketsRoutes') ?? Collection::make(config('twill.buckets'))->mapWithKeys(function ($bucketSection, $bucketSectionKey) { |
|
39 | + $bucketsRoutes = config('twill.bucketsRoutes') ?? Collection::make(config('twill.buckets'))->mapWithKeys(function($bucketSection, $bucketSectionKey) { |
|
40 | 40 | return [$bucketSectionKey => 'featured']; |
41 | 41 | })->toArray(); |
42 | 42 | |
43 | 43 | foreach ($bucketsRoutes as $bucketSectionKey => $routePrefix) { |
44 | - Route::group(['prefix' => str_replace(".","/",$routePrefix), 'as' => $routePrefix . '.'], function () use ($bucketSectionKey) { |
|
44 | + Route::group(['prefix' => str_replace(".", "/", $routePrefix), 'as' => $routePrefix . '.'], function() use ($bucketSectionKey) { |
|
45 | 45 | Route::get($bucketSectionKey, ['as' => $bucketSectionKey, 'uses' => 'FeaturedController@index']); |
46 | - Route::group(['prefix' => $bucketSectionKey, 'as' => $bucketSectionKey . '.'], function () { |
|
46 | + Route::group(['prefix' => $bucketSectionKey, 'as' => $bucketSectionKey . '.'], function() { |
|
47 | 47 | Route::post('save', ['as' => 'save', 'uses' => 'FeaturedController@save']); |
48 | 48 | }); |
49 | 49 |
@@ -33,7 +33,7 @@ discard block |
||
33 | 33 | try { |
34 | 34 | $blobUri = $request->input('bloburi'); |
35 | 35 | $method = $request->input('_method'); |
36 | - $permissions = '' ; |
|
36 | + $permissions = ''; |
|
37 | 37 | if (strtolower($method) === 'put') { |
38 | 38 | $permissions = 'w'; |
39 | 39 | } else if (strtolower($method) === 'delete') { |
@@ -48,7 +48,7 @@ discard block |
||
48 | 48 | $now = new DateTime("now", new DateTimeZone("UTC")); |
49 | 49 | $expire = $now->modify('+15 min'); |
50 | 50 | |
51 | - $path = $this->config->get('filesystems.disks.' . $disk .'.container') . str_replace(azureEndpoint($disk), '', $blobUri); |
|
51 | + $path = $this->config->get('filesystems.disks.' . $disk . '.container') . str_replace(azureEndpoint($disk), '', $blobUri); |
|
52 | 52 | $sasUrl = $blobUri . '?' . $this->blobSharedAccessSignatureHelper->generateBlobServiceSharedAccessSignatureToken('b', $path, $permissions, $expire); |
53 | 53 | return $listener->uploadIsSigned($sasUrl, false); |
54 | 54 | } catch (\Exception $e) { |
@@ -99,7 +99,7 @@ discard block |
||
99 | 99 | $items = $this->getIndexItems($scopes); |
100 | 100 | |
101 | 101 | return [ |
102 | - 'items' => $items->map(function ($item) { |
|
102 | + 'items' => $items->map(function($item) { |
|
103 | 103 | return $item->toCmsArray(); |
104 | 104 | })->toArray(), |
105 | 105 | 'maxPage' => $items->lastPage(), |
@@ -220,11 +220,11 @@ discard block |
||
220 | 220 | { |
221 | 221 | $ids = explode(',', $this->request->input('ids')); |
222 | 222 | |
223 | - $metadatasFromRequest = $this->getExtraMetadatas()->reject(function ($meta) { |
|
223 | + $metadatasFromRequest = $this->getExtraMetadatas()->reject(function($meta) { |
|
224 | 224 | return is_null($meta); |
225 | 225 | })->toArray(); |
226 | 226 | |
227 | - $extraMetadatas = array_diff_key($metadatasFromRequest, array_flip((array)$this->request->get('fieldsRemovedFromBulkEditing', []))); |
|
227 | + $extraMetadatas = array_diff_key($metadatasFromRequest, array_flip((array) $this->request->get('fieldsRemovedFromBulkEditing', []))); |
|
228 | 228 | |
229 | 229 | if (in_array('tags', $this->request->get('fieldsRemovedFromBulkEditing', []))) { |
230 | 230 | $this->repository->addIgnoreFieldsBeforeSave('bulk_tags'); |
@@ -244,7 +244,7 @@ discard block |
||
244 | 244 | $items = $this->getIndexItems($scopes); |
245 | 245 | |
246 | 246 | return $this->responseFactory->json([ |
247 | - 'items' => $items->map(function ($item) { |
|
247 | + 'items' => $items->map(function($item) { |
|
248 | 248 | return $item->toCmsArray(); |
249 | 249 | })->toArray(), |
250 | 250 | 'tags' => $this->repository->getTagsList(), |
@@ -296,7 +296,7 @@ discard block |
||
296 | 296 | */ |
297 | 297 | private function getExtraMetadatas() |
298 | 298 | { |
299 | - return Collection::make($this->customFields)->mapWithKeys(function ($field) { |
|
299 | + return Collection::make($this->customFields)->mapWithKeys(function($field) { |
|
300 | 300 | $fieldInRequest = $this->request->get($field['name']); |
301 | 301 | |
302 | 302 | if (isset($field['type']) && $field['type'] === 'checkbox') { |