From a7e77aaf866f3f08181d333809359a385f670ffe Mon Sep 17 00:00:00 2001 From: Nemanja Maric Date: Wed, 5 Oct 2016 15:28:45 +0000 Subject: [PATCH] Applied fixes from StyleCI --- src/AdminServiceProvider.php | 2 -- src/Console/UpdateCommand.php | 5 ++--- src/Page.php | 2 +- src/Validations/CategoryValidation.php | 2 +- src/config/laravel-admin.php | 2 +- .../2016_10_04_144425_change_uri_key_and_url_id_to_slug.php | 6 +++--- 6 files changed, 8 insertions(+), 11 deletions(-) diff --git a/src/AdminServiceProvider.php b/src/AdminServiceProvider.php index 9327eeb..4ff4304 100644 --- a/src/AdminServiceProvider.php +++ b/src/AdminServiceProvider.php @@ -53,6 +53,4 @@ public function register() $loader->alias('Image', \Intervention\Image\Facades\Image::class); $loader->alias('PDF', \Barryvdh\DomPDF\Facade::class); } - - } diff --git a/src/Console/UpdateCommand.php b/src/Console/UpdateCommand.php index 719278e..8dc7e2f 100644 --- a/src/Console/UpdateCommand.php +++ b/src/Console/UpdateCommand.php @@ -63,10 +63,9 @@ public function handle() $replaceConfig = array_replace_recursive(require __DIR__.'/../config/laravel-admin.php', config('laravel-admin')); foreach ($package_config as $key => $value) { - if (!isset($client_config[$key])) { - File::put(base_path('config/laravel-admin.php'), ("info('Config file ("config/laravel-admin.php") is merged, please see changes for new feature'); + File::put(base_path('config/laravel-admin.php'), ("info('Config file ("config/laravel-admin.php") is merged, please see changes for new feature'); } } diff --git a/src/Page.php b/src/Page.php index 82e32d6..d2cce3d 100644 --- a/src/Page.php +++ b/src/Page.php @@ -59,7 +59,7 @@ private function getTreeBranch() return [ 'id' => $this->id, 'title' => $this->title, - 'slug' => $this->slug, + 'slug' => $this->slug, 'subpages' => $tree, ]; } diff --git a/src/Validations/CategoryValidation.php b/src/Validations/CategoryValidation.php index 60ee6f2..dbda9f7 100644 --- a/src/Validations/CategoryValidation.php +++ b/src/Validations/CategoryValidation.php @@ -12,7 +12,7 @@ class CategoryValidation public static function rules() { return [ - 'title' => 'required', + 'title' => 'required', 'slug' => 'required', ]; } diff --git a/src/config/laravel-admin.php b/src/config/laravel-admin.php index b8e3082..0d77024 100644 --- a/src/config/laravel-admin.php +++ b/src/config/laravel-admin.php @@ -41,7 +41,7 @@ 'places' => true, 'shop' => true, 'settings' => true, - ], + ], /* |-------------------------------------------------------------------------- diff --git a/src/database/migrations/2016_10_04_144425_change_uri_key_and_url_id_to_slug.php b/src/database/migrations/2016_10_04_144425_change_uri_key_and_url_id_to_slug.php index f91201c..10747c8 100644 --- a/src/database/migrations/2016_10_04_144425_change_uri_key_and_url_id_to_slug.php +++ b/src/database/migrations/2016_10_04_144425_change_uri_key_and_url_id_to_slug.php @@ -1,8 +1,8 @@ renameColumn('uri_id', 'slug'); }); - + Schema::table('blog_categories', function (Blueprint $table) { $table->renameColumn('uri', 'slug'); });