Skip to content

Applied fixes from StyleCI #48

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 1 commit into from
Oct 5, 2016
Merged

Applied fixes from StyleCI #48

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 0 additions & 2 deletions src/AdminServiceProvider.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -53,6 +53,4 @@ public function register()
$loader->alias('Image', \Intervention\Image\Facades\Image::class);
$loader->alias('PDF', \Barryvdh\DomPDF\Facade::class);
}


}
5 changes: 2 additions & 3 deletions src/Console/UpdateCommand.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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'), ("<?php \r\n\r\nreturn " . preg_replace(['/$([ ])/','/[ ]([ ])/'], ' ', var_export($replaceConfig, true)) . ";"));
$this->info('Config file ("config/laravel-admin.php") is merged, please see changes for new feature');
File::put(base_path('config/laravel-admin.php'), ("<?php \r\n\r\nreturn ".preg_replace(['/$([ ])/', '/[ ]([ ])/'], ' ', var_export($replaceConfig, true)).';'));
$this->info('Config file ("config/laravel-admin.php") is merged, please see changes for new feature');
}
}

Expand Down
2 changes: 1 addition & 1 deletion src/Page.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -59,7 +59,7 @@ private function getTreeBranch()
return [
'id' => $this->id,
'title' => $this->title,
'slug' => $this->slug,
'slug' => $this->slug,
'subpages' => $tree,
];
}
Expand Down
2 changes: 1 addition & 1 deletion src/Validations/CategoryValidation.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@ class CategoryValidation
public static function rules()
{
return [
'title' => 'required',
'title' => 'required',
'slug' => 'required',
];
}
Expand Down
2 changes: 1 addition & 1 deletion src/config/laravel-admin.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -41,7 +41,7 @@
'places' => true,
'shop' => true,
'settings' => true,
],
],

/*
|--------------------------------------------------------------------------
Expand Down
6 changes: 3 additions & 3 deletions src/database/migrations/2016_10_04_144425_change_uri_key_and_url_id_to_slug.php
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,8 +1,8 @@
<?php

use Illuminate\Support\Facades\Schema;
use Illuminate\Database\Schema\Blueprint;
use Illuminate\Database\Migrations\Migration;
use Illuminate\Database\Schema\Blueprint;
use Illuminate\Support\Facades\Schema;

class ChangeUriKeyAndUrlIdToSlug extends Migration
{
Expand All @@ -16,7 +16,7 @@ public function up()
Schema::table('blog_posts', function (Blueprint $table) {
$table->renameColumn('uri_id', 'slug');
});

Schema::table('blog_categories', function (Blueprint $table) {
$table->renameColumn('uri', 'slug');
});
Expand Down