@@ -8,7 +8,7 @@ discard block |
||
| 8 | 8 | public function up() |
| 9 | 9 | { |
| 10 | 10 | if (Schema::hasTable('mediables') && !Schema::hasColumn('mediables', 'locale')) { |
| 11 | - Schema::table('mediables', function (Blueprint $table) { |
|
| 11 | + Schema::table('mediables', function(Blueprint $table) { |
|
| 12 | 12 | $table->string('locale', 7)->default($this->getCurrentLocale())->index(); |
| 13 | 13 | }); |
| 14 | 14 | } |
@@ -17,7 +17,7 @@ discard block |
||
| 17 | 17 | public function down() |
| 18 | 18 | { |
| 19 | 19 | if (Schema::hasTable('mediables') && Schema::hasColumn('mediables', 'locale')) { |
| 20 | - Schema::table('mediables', function (Blueprint $table) { |
|
| 20 | + Schema::table('mediables', function(Blueprint $table) { |
|
| 21 | 21 | $table->dropIndex('mediables_locale_index'); |
| 22 | 22 | $table->dropColumn('locale'); |
| 23 | 23 | }); |
@@ -16,13 +16,13 @@ discard block |
||
| 16 | 16 | $twillUsersTable = config('twill.users_table', 'twill_users'); |
| 17 | 17 | |
| 18 | 18 | if (Schema::hasTable($twillUsersTable) && !Schema::hasColumn($twillUsersTable, 'google_2fa_secret')) { |
| 19 | - Schema::table($twillUsersTable, function (Blueprint $table) { |
|
| 19 | + Schema::table($twillUsersTable, function(Blueprint $table) { |
|
| 20 | 20 | $table->string('google_2fa_secret')->nullable(); |
| 21 | 21 | }); |
| 22 | 22 | } |
| 23 | 23 | |
| 24 | 24 | if (Schema::hasTable($twillUsersTable) && !Schema::hasColumn($twillUsersTable, 'google_2fa_enabled')) { |
| 25 | - Schema::table($twillUsersTable, function (Blueprint $table) { |
|
| 25 | + Schema::table($twillUsersTable, function(Blueprint $table) { |
|
| 26 | 26 | $table->boolean('google_2fa_enabled')->default(false); |
| 27 | 27 | }); |
| 28 | 28 | } |
@@ -38,13 +38,13 @@ discard block |
||
| 38 | 38 | $twillUsersTable = config('twill.users_table', 'twill_users'); |
| 39 | 39 | |
| 40 | 40 | if (Schema::hasTable($twillUsersTable) && Schema::hasColumn($twillUsersTable, 'google_2fa_secret')) { |
| 41 | - Schema::table($twillUsersTable, function (Blueprint $table) { |
|
| 41 | + Schema::table($twillUsersTable, function(Blueprint $table) { |
|
| 42 | 42 | $table->dropColumn('google_2fa_secret'); |
| 43 | 43 | }); |
| 44 | 44 | } |
| 45 | 45 | |
| 46 | 46 | if (Schema::hasTable($twillUsersTable) && Schema::hasColumn($twillUsersTable, 'google_2fa_enabled')) { |
| 47 | - Schema::table($twillUsersTable, function (Blueprint $table) { |
|
| 47 | + Schema::table($twillUsersTable, function(Blueprint $table) { |
|
| 48 | 48 | $table->dropColumn('google_2fa_enabled'); |
| 49 | 49 | }); |
| 50 | 50 | } |
@@ -12,7 +12,7 @@ |
||
| 12 | 12 | public function up() |
| 13 | 13 | { |
| 14 | 14 | if (!Schema::hasTable(config('activitylog.table_name'))) { |
| 15 | - Schema::create(config('activitylog.table_name'), function (Blueprint $table) { |
|
| 15 | + Schema::create(config('activitylog.table_name'), function(Blueprint $table) { |
|
| 16 | 16 | $table->increments('id'); |
| 17 | 17 | $table->string('log_name')->nullable(); |
| 18 | 18 | $table->text('description'); |
@@ -13,7 +13,7 @@ discard block |
||
| 13 | 13 | */ |
| 14 | 14 | public function up() |
| 15 | 15 | { |
| 16 | - Schema::create('medias', function (Blueprint $table) { |
|
| 16 | + Schema::create('medias', function(Blueprint $table) { |
|
| 17 | 17 | $table->increments('id')->unsigned(); |
| 18 | 18 | $table->timestamps(); |
| 19 | 19 | $table->softDeletes(); |
@@ -25,7 +25,7 @@ discard block |
||
| 25 | 25 | $table->string('filename')->nullable(); |
| 26 | 26 | }); |
| 27 | 27 | |
| 28 | - Schema::create('mediables', function (Blueprint $table) { |
|
| 28 | + Schema::create('mediables', function(Blueprint $table) { |
|
| 29 | 29 | $table->increments('id'); |
| 30 | 30 | $table->timestamps(); |
| 31 | 31 | $table->softDeletes(); |
@@ -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'), |
@@ -1,7 +1,7 @@ |
||
| 1 | 1 | <?php |
| 2 | 2 | |
| 3 | 3 | $localRootPrefix = storage_path('app/public/'); |
| 4 | -$localUrlPrefix = request()->getScheme() . '://' . str_replace(['http://', 'https://'], '',env('APP_URL')) . '/storage/'; |
|
| 4 | +$localUrlPrefix = request()->getScheme() . '://' . str_replace(['http://', 'https://'], '', env('APP_URL')) . '/storage/'; |
|
| 5 | 5 | |
| 6 | 6 | $mediaLocalConfig = [ |
| 7 | 7 | 'driver' => 'local', |
@@ -15,23 +15,23 @@ |
||
| 15 | 15 | */ |
| 16 | 16 | public function boot() |
| 17 | 17 | { |
| 18 | - Validator::extend('absolute_or_relative_url', function ($attribute, $value, $parameters, $validator) { |
|
| 18 | + Validator::extend('absolute_or_relative_url', function($attribute, $value, $parameters, $validator) { |
|
| 19 | 19 | return starts_with($value, '/') || Validator::make([$attribute => $value], [$attribute => 'url'])->passes(); |
| 20 | 20 | }, 'The :attribute should be a valid url (absolute or relative)'); |
| 21 | 21 | |
| 22 | - Validator::extend('relative_or_secure_url', function ($attribute, $value, $parameters) { |
|
| 22 | + Validator::extend('relative_or_secure_url', function($attribute, $value, $parameters) { |
|
| 23 | 23 | return starts_with($value, '/') || filter_var($value, FILTER_VALIDATE_URL) !== false && starts_with($value, 'https'); |
| 24 | 24 | }, 'The :attribute should be a valid url (relative or https)'); |
| 25 | 25 | |
| 26 | - Validator::extend('web_color', function ($attribute, $value, $parameters, $validator) { |
|
| 26 | + Validator::extend('web_color', function($attribute, $value, $parameters, $validator) { |
|
| 27 | 27 | return preg_match('/^([A-Fa-f0-9]{6}|[A-Fa-f0-9]{3})$/i', $value); |
| 28 | 28 | }); |
| 29 | 29 | |
| 30 | - Validator::extend('phone_number', function ($attribute, $value, $parameters) { |
|
| 30 | + Validator::extend('phone_number', function($attribute, $value, $parameters) { |
|
| 31 | 31 | return preg_match("/^[+]?[0-9\-\ ]*$/", $value); |
| 32 | 32 | }); |
| 33 | 33 | |
| 34 | - Validator::extend('validBlocks', function ($attribute, $value, $parameters, $validator) { |
|
| 34 | + Validator::extend('validBlocks', function($attribute, $value, $parameters, $validator) { |
|
| 35 | 35 | foreach ($value as $block) { |
| 36 | 36 | $cmsBlock = $this->app->get(BlockRepository::class)->buildFromCmsArray($block, false); |
| 37 | 37 | |