We could not synchronize checks via GitHub's checks API since Scrutinizer's GitHub App is not installed for this repository.
| @@ -4,7 +4,6 @@ | ||
| 4 | 4 | |
| 5 | 5 | use Backpack\CRUD\app\Http\Controllers\CrudController; | 
| 6 | 6 | // VALIDATION | 
| 7 | -use Backpack\Settings\app\Http\Requests\SettingRequest as StoreRequest; | |
| 8 | 7 | use Backpack\Settings\app\Http\Requests\SettingRequest as UpdateRequest; | 
| 9 | 8 | |
| 10 | 9 | class SettingCrudController extends CrudController | 
| @@ -9,56 +9,56 @@ | ||
| 9 | 9 | |
| 10 | 10 | class SettingCrudController extends CrudController | 
| 11 | 11 |  { | 
| 12 | - public function __construct() | |
| 13 | -    { | |
| 14 | - parent::__construct(); | |
| 12 | + public function __construct() | |
| 13 | +	{ | |
| 14 | + parent::__construct(); | |
| 15 | 15 | |
| 16 | -        $this->crud->setModel("Backpack\Settings\app\Models\Setting"); | |
| 17 | -        $this->crud->setEntityNameStrings('setting', 'settings'); | |
| 18 | -        $this->crud->setRoute('admin/setting'); | |
| 19 | - $this->crud->denyAccess(['create', 'delete']); | |
| 20 | - $this->crud->setColumns(['name', 'value', 'description']); | |
| 21 | - $this->crud->addField([ | |
| 22 | - 'name' => 'name', | |
| 23 | - 'label' => 'Name', | |
| 24 | - 'type' => 'text', | |
| 25 | - 'disabled' => 'disabled', | |
| 26 | - ]); | |
| 27 | - $this->crud->addField([ | |
| 28 | - 'name' => 'value', | |
| 29 | - 'label' => 'Value', | |
| 30 | - 'type' => 'text', | |
| 31 | - ]); | |
| 32 | - } | |
| 16 | +		$this->crud->setModel("Backpack\Settings\app\Models\Setting"); | |
| 17 | +		$this->crud->setEntityNameStrings('setting', 'settings'); | |
| 18 | +		$this->crud->setRoute('admin/setting'); | |
| 19 | + $this->crud->denyAccess(['create', 'delete']); | |
| 20 | + $this->crud->setColumns(['name', 'value', 'description']); | |
| 21 | + $this->crud->addField([ | |
| 22 | + 'name' => 'name', | |
| 23 | + 'label' => 'Name', | |
| 24 | + 'type' => 'text', | |
| 25 | + 'disabled' => 'disabled', | |
| 26 | + ]); | |
| 27 | + $this->crud->addField([ | |
| 28 | + 'name' => 'value', | |
| 29 | + 'label' => 'Value', | |
| 30 | + 'type' => 'text', | |
| 31 | + ]); | |
| 32 | + } | |
| 33 | 33 | |
| 34 | - /** | |
| 35 | - * Display all rows in the database for this entity. | |
| 36 | - * This overwrites the default CrudController behaviour: | |
| 37 | - * - instead of showing all entries, only show the "active" ones. | |
| 38 | - * | |
| 39 | - * @return Response | |
| 40 | - */ | |
| 41 | - public function index() | |
| 42 | -    { | |
| 43 | - // if view_table_permission is false, abort | |
| 44 | -        $this->crud->hasAccessOrFail('list'); | |
| 45 | -        $this->crud->addClause('where', 'active', 1); // <---- this is where it's different from CrudController::index() | |
| 34 | + /** | |
| 35 | + * Display all rows in the database for this entity. | |
| 36 | + * This overwrites the default CrudController behaviour: | |
| 37 | + * - instead of showing all entries, only show the "active" ones. | |
| 38 | + * | |
| 39 | + * @return Response | |
| 40 | + */ | |
| 41 | + public function index() | |
| 42 | +	{ | |
| 43 | + // if view_table_permission is false, abort | |
| 44 | +		$this->crud->hasAccessOrFail('list'); | |
| 45 | +		$this->crud->addClause('where', 'active', 1); // <---- this is where it's different from CrudController::index() | |
| 46 | 46 | |
| 47 | - $this->data['entries'] = $this->crud->getEntries(); | |
| 48 | - $this->data['crud'] = $this->crud; | |
| 49 | - $this->data['title'] = ucfirst($this->crud->entity_name_plural); | |
| 47 | + $this->data['entries'] = $this->crud->getEntries(); | |
| 48 | + $this->data['crud'] = $this->crud; | |
| 49 | + $this->data['title'] = ucfirst($this->crud->entity_name_plural); | |
| 50 | 50 | |
| 51 | - // load the view from /resources/views/vendor/backpack/crud/ if it exists, otherwise load the one in the package | |
| 52 | -        return view('crud::list', $this->data); | |
| 53 | - } | |
| 51 | + // load the view from /resources/views/vendor/backpack/crud/ if it exists, otherwise load the one in the package | |
| 52 | +		return view('crud::list', $this->data); | |
| 53 | + } | |
| 54 | 54 | |
| 55 | - public function store(StoreRequest $request) | |
| 56 | -    { | |
| 57 | - return parent::storeCrud(); | |
| 58 | - } | |
| 55 | + public function store(StoreRequest $request) | |
| 56 | +	{ | |
| 57 | + return parent::storeCrud(); | |
| 58 | + } | |
| 59 | 59 | |
| 60 | - public function update(UpdateRequest $request) | |
| 61 | -    { | |
| 62 | - return parent::updateCrud(); | |
| 63 | - } | |
| 60 | + public function update(UpdateRequest $request) | |
| 61 | +	{ | |
| 62 | + return parent::updateCrud(); | |
| 63 | + } | |
| 64 | 64 | } | 
| @@ -5,32 +5,32 @@ | ||
| 5 | 5 | |
| 6 | 6 | class CreateSettingsTable extends Migration | 
| 7 | 7 |  { | 
| 8 | - /** | |
| 9 | - * Run the migrations. | |
| 10 | - * | |
| 11 | - * @return void | |
| 12 | - */ | |
| 13 | - public function up() | |
| 14 | -    { | |
| 15 | -        Schema::create('settings', function (Blueprint $table) { | |
| 16 | -            $table->increments('id'); | |
| 17 | -            $table->string('key'); | |
| 18 | -            $table->string('name'); | |
| 19 | -            $table->string('description')->nullable(); | |
| 20 | -            $table->string('value')->nullable(); | |
| 21 | -            $table->text('field'); | |
| 22 | -            $table->tinyInteger('active'); | |
| 23 | - $table->timestamps(); | |
| 24 | - }); | |
| 25 | - } | |
| 8 | + /** | |
| 9 | + * Run the migrations. | |
| 10 | + * | |
| 11 | + * @return void | |
| 12 | + */ | |
| 13 | + public function up() | |
| 14 | +	{ | |
| 15 | +		Schema::create('settings', function (Blueprint $table) { | |
| 16 | +			$table->increments('id'); | |
| 17 | +			$table->string('key'); | |
| 18 | +			$table->string('name'); | |
| 19 | +			$table->string('description')->nullable(); | |
| 20 | +			$table->string('value')->nullable(); | |
| 21 | +			$table->text('field'); | |
| 22 | +			$table->tinyInteger('active'); | |
| 23 | + $table->timestamps(); | |
| 24 | + }); | |
| 25 | + } | |
| 26 | 26 | |
| 27 | - /** | |
| 28 | - * Reverse the migrations. | |
| 29 | - * | |
| 30 | - * @return void | |
| 31 | - */ | |
| 32 | - public function down() | |
| 33 | -    { | |
| 34 | -        Schema::drop('settings'); | |
| 35 | - } | |
| 27 | + /** | |
| 28 | + * Reverse the migrations. | |
| 29 | + * | |
| 30 | + * @return void | |
| 31 | + */ | |
| 32 | + public function down() | |
| 33 | +	{ | |
| 34 | +		Schema::drop('settings'); | |
| 35 | + } | |
| 36 | 36 | } | 
| @@ -7,50 +7,50 @@ | ||
| 7 | 7 | |
| 8 | 8 | class SettingsTableSeeder extends Seeder | 
| 9 | 9 |  { | 
| 10 | - /** | |
| 11 | - * Run the database seeds. | |
| 12 | - * | |
| 13 | - * @return void | |
| 14 | - */ | |
| 15 | - public function run() | |
| 16 | -    { | |
| 17 | -        DB::table('settings')->insert([ | |
| 18 | - 'key' => 'contact_email', | |
| 19 | - 'name' => 'Contact form email address', | |
| 20 | - 'description' => 'The email address that all emails from the contact form will go to.', | |
| 21 | - 'value' => '[email protected]', | |
| 22 | - 'field' => '', | |
| 23 | - 'active' => 1, | |
| 24 | - ]); | |
| 25 | - | |
| 26 | -        DB::table('settings')->insert([ | |
| 27 | - 'key' => 'contact_cc', | |
| 28 | - 'name' => 'Contact form CC field', | |
| 29 | - 'description' => 'Email adresses separated by comma, to be included as CC in the email sent by the contact form.', | |
| 30 | - 'value' => '', | |
| 31 | - 'field' => '', | |
| 32 | - 'active' => 1, | |
| 33 | - | |
| 34 | - ]); | |
| 35 | - | |
| 36 | -        DB::table('settings')->insert([ | |
| 37 | - 'key' => 'contact_bcc', | |
| 38 | - 'name' => 'Contact form BCC field', | |
| 39 | - 'description' => 'Email adresses separated by comma, to be included as BCC in the email sent by the contact form.', | |
| 40 | - 'value' => '', | |
| 41 | -            'field'         => '{\"name\":\"value\",\"label\":\"Value\",\"type\":\"email\"}', | |
| 42 | - 'active' => 1, | |
| 43 | - | |
| 44 | - ]); | |
| 45 | - | |
| 46 | -        DB::table('settings')->insert([ | |
| 47 | - 'key' => 'motto', | |
| 48 | - 'name' => 'Motto', | |
| 49 | - 'description' => 'Website motto', | |
| 50 | - 'value' => 'this is the value', | |
| 51 | -            'field'         => '{\"name\":\"value\",\"label\":\"Value\", \"title\":\"Motto value\" ,\"type\":\"textarea\"}', | |
| 52 | - 'active' => 1, | |
| 53 | - | |
| 54 | - ]); | |
| 55 | - } | |
| 10 | + /** | |
| 11 | + * Run the database seeds. | |
| 12 | + * | |
| 13 | + * @return void | |
| 14 | + */ | |
| 15 | + public function run() | |
| 16 | +	{ | |
| 17 | +		DB::table('settings')->insert([ | |
| 18 | + 'key' => 'contact_email', | |
| 19 | + 'name' => 'Contact form email address', | |
| 20 | + 'description' => 'The email address that all emails from the contact form will go to.', | |
| 21 | + 'value' => '[email protected]', | |
| 22 | + 'field' => '', | |
| 23 | + 'active' => 1, | |
| 24 | + ]); | |
| 25 | + | |
| 26 | +		DB::table('settings')->insert([ | |
| 27 | + 'key' => 'contact_cc', | |
| 28 | + 'name' => 'Contact form CC field', | |
| 29 | + 'description' => 'Email adresses separated by comma, to be included as CC in the email sent by the contact form.', | |
| 30 | + 'value' => '', | |
| 31 | + 'field' => '', | |
| 32 | + 'active' => 1, | |
| 33 | + | |
| 34 | + ]); | |
| 35 | + | |
| 36 | +		DB::table('settings')->insert([ | |
| 37 | + 'key' => 'contact_bcc', | |
| 38 | + 'name' => 'Contact form BCC field', | |
| 39 | + 'description' => 'Email adresses separated by comma, to be included as BCC in the email sent by the contact form.', | |
| 40 | + 'value' => '', | |
| 41 | +			'field'         => '{\"name\":\"value\",\"label\":\"Value\",\"type\":\"email\"}', | |
| 42 | + 'active' => 1, | |
| 43 | + | |
| 44 | + ]); | |
| 45 | + | |
| 46 | +		DB::table('settings')->insert([ | |
| 47 | + 'key' => 'motto', | |
| 48 | + 'name' => 'Motto', | |
| 49 | + 'description' => 'Website motto', | |
| 50 | + 'value' => 'this is the value', | |
| 51 | +			'field'         => '{\"name\":\"value\",\"label\":\"Value\", \"title\":\"Motto value\" ,\"type\":\"textarea\"}', | |
| 52 | + 'active' => 1, | |
| 53 | + | |
| 54 | + ]); | |
| 55 | + } | |
| 56 | 56 | } | 
| @@ -6,28 +6,28 @@ | ||
| 6 | 6 | |
| 7 | 7 | class SettingRequest extends Request | 
| 8 | 8 |  { | 
| 9 | - /** | |
| 10 | - * Determine if the user is authorized to make this request. | |
| 11 | - * | |
| 12 | - * @return bool | |
| 13 | - */ | |
| 14 | - public function authorize() | |
| 15 | -    { | |
| 16 | - // only allow updates if the user is logged in | |
| 17 | - return \Auth::check(); | |
| 18 | - } | |
| 9 | + /** | |
| 10 | + * Determine if the user is authorized to make this request. | |
| 11 | + * | |
| 12 | + * @return bool | |
| 13 | + */ | |
| 14 | + public function authorize() | |
| 15 | +	{ | |
| 16 | + // only allow updates if the user is logged in | |
| 17 | + return \Auth::check(); | |
| 18 | + } | |
| 19 | 19 | |
| 20 | - /** | |
| 21 | - * Get the validation rules that apply to the request. | |
| 22 | - * | |
| 23 | - * @return array | |
| 24 | - */ | |
| 25 | - public function rules() | |
| 26 | -    { | |
| 27 | - return [ | |
| 28 | - // 'key' => 'required|min:3|max:255', | |
| 29 | - // 'name' => 'required|min:3|max:255', | |
| 30 | - // 'field' => 'required' | |
| 31 | - ]; | |
| 32 | - } | |
| 20 | + /** | |
| 21 | + * Get the validation rules that apply to the request. | |
| 22 | + * | |
| 23 | + * @return array | |
| 24 | + */ | |
| 25 | + public function rules() | |
| 26 | +	{ | |
| 27 | + return [ | |
| 28 | + // 'key' => 'required|min:3|max:255', | |
| 29 | + // 'name' => 'required|min:3|max:255', | |
| 30 | + // 'field' => 'required' | |
| 31 | + ]; | |
| 32 | + } | |
| 33 | 33 | } | 
| @@ -7,8 +7,8 @@ | ||
| 7 | 7 | |
| 8 | 8 | class Setting extends Model | 
| 9 | 9 |  { | 
| 10 | - use CrudTrait; | |
| 10 | + use CrudTrait; | |
| 11 | 11 | |
| 12 | - protected $table = 'settings'; | |
| 13 | - protected $fillable = ['value']; | |
| 12 | + protected $table = 'settings'; | |
| 13 | + protected $fillable = ['value']; | |
| 14 | 14 | } | 
| @@ -11,75 +11,75 @@ | ||
| 11 | 11 | |
| 12 | 12 | class SettingsServiceProvider extends ServiceProvider | 
| 13 | 13 |  { | 
| 14 | - /** | |
| 15 | - * Indicates if loading of the provider is deferred. | |
| 16 | - * | |
| 17 | - * @var bool | |
| 18 | - */ | |
| 19 | - protected $defer = false; | |
| 14 | + /** | |
| 15 | + * Indicates if loading of the provider is deferred. | |
| 16 | + * | |
| 17 | + * @var bool | |
| 18 | + */ | |
| 19 | + protected $defer = false; | |
| 20 | 20 | |
| 21 | - /** | |
| 22 | - * Perform post-registration booting of services. | |
| 23 | - * | |
| 24 | - * @return void | |
| 25 | - */ | |
| 26 | - public function boot() | |
| 27 | -    { | |
| 28 | - // only use the Settings package if the Settings table is present in the database | |
| 29 | -        if (count(DB::select("SHOW TABLES LIKE 'settings'"))) { | |
| 30 | - // get all settings from the database | |
| 31 | - $settings = Setting::all(); | |
| 21 | + /** | |
| 22 | + * Perform post-registration booting of services. | |
| 23 | + * | |
| 24 | + * @return void | |
| 25 | + */ | |
| 26 | + public function boot() | |
| 27 | +	{ | |
| 28 | + // only use the Settings package if the Settings table is present in the database | |
| 29 | +		if (count(DB::select("SHOW TABLES LIKE 'settings'"))) { | |
| 30 | + // get all settings from the database | |
| 31 | + $settings = Setting::all(); | |
| 32 | 32 | |
| 33 | - // bind all settings to the Laravel config, so you can call them like | |
| 34 | -            // Config::get('settings.contact_email') | |
| 35 | -            foreach ($settings as $key => $setting) { | |
| 36 | -                Config::set('settings.'.$setting->key, $setting->value); | |
| 37 | - } | |
| 38 | - } | |
| 33 | + // bind all settings to the Laravel config, so you can call them like | |
| 34 | +			// Config::get('settings.contact_email') | |
| 35 | +			foreach ($settings as $key => $setting) { | |
| 36 | +				Config::set('settings.'.$setting->key, $setting->value); | |
| 37 | + } | |
| 38 | + } | |
| 39 | 39 | |
| 40 | - // publish the migrations and seeds | |
| 41 | -        $this->publishes([__DIR__.'/database/migrations/' => database_path('migrations')], 'migrations'); | |
| 42 | -        $this->publishes([__DIR__.'/database/seeds/' => database_path('seeds')], 'seeds'); | |
| 43 | - } | |
| 40 | + // publish the migrations and seeds | |
| 41 | +		$this->publishes([__DIR__.'/database/migrations/' => database_path('migrations')], 'migrations'); | |
| 42 | +		$this->publishes([__DIR__.'/database/seeds/' => database_path('seeds')], 'seeds'); | |
| 43 | + } | |
| 44 | 44 | |
| 45 | - /** | |
| 46 | - * Define the routes for the application. | |
| 47 | - * | |
| 48 | - * @param \Illuminate\Routing\Router $router | |
| 49 | - * | |
| 50 | - * @return void | |
| 51 | - */ | |
| 52 | - public function setupRoutes(Router $router) | |
| 53 | -    { | |
| 54 | -        $router->group(['namespace' => 'Backpack\Settings\app\Http\Controllers'], function ($router) { | |
| 55 | - // Admin Interface Routes | |
| 56 | -            Route::group(['prefix' => 'admin', 'middleware' => ['web', 'admin']], function () { | |
| 57 | - // Settings | |
| 58 | -                Route::resource('setting', 'SettingCrudController'); | |
| 59 | - }); | |
| 60 | - }); | |
| 61 | - } | |
| 45 | + /** | |
| 46 | + * Define the routes for the application. | |
| 47 | + * | |
| 48 | + * @param \Illuminate\Routing\Router $router | |
| 49 | + * | |
| 50 | + * @return void | |
| 51 | + */ | |
| 52 | + public function setupRoutes(Router $router) | |
| 53 | +	{ | |
| 54 | +		$router->group(['namespace' => 'Backpack\Settings\app\Http\Controllers'], function ($router) { | |
| 55 | + // Admin Interface Routes | |
| 56 | +			Route::group(['prefix' => 'admin', 'middleware' => ['web', 'admin']], function () { | |
| 57 | + // Settings | |
| 58 | +				Route::resource('setting', 'SettingCrudController'); | |
| 59 | + }); | |
| 60 | + }); | |
| 61 | + } | |
| 62 | 62 | |
| 63 | - /** | |
| 64 | - * Register any package services. | |
| 65 | - * | |
| 66 | - * @return void | |
| 67 | - */ | |
| 68 | - public function register() | |
| 69 | -    { | |
| 70 | - $this->registerSettings(); | |
| 71 | - $this->setupRoutes($this->app->router); | |
| 63 | + /** | |
| 64 | + * Register any package services. | |
| 65 | + * | |
| 66 | + * @return void | |
| 67 | + */ | |
| 68 | + public function register() | |
| 69 | +	{ | |
| 70 | + $this->registerSettings(); | |
| 71 | + $this->setupRoutes($this->app->router); | |
| 72 | 72 | |
| 73 | - // use this if your package has a config file | |
| 74 | - // config([ | |
| 75 | - // 'config/Settings.php', | |
| 76 | - // ]); | |
| 77 | - } | |
| 73 | + // use this if your package has a config file | |
| 74 | + // config([ | |
| 75 | + // 'config/Settings.php', | |
| 76 | + // ]); | |
| 77 | + } | |
| 78 | 78 | |
| 79 | - private function registerSettings() | |
| 80 | -    { | |
| 81 | -        $this->app->bind('settings', function ($app) { | |
| 82 | - return new Settings($app); | |
| 83 | - }); | |
| 84 | - } | |
| 79 | + private function registerSettings() | |
| 80 | +	{ | |
| 81 | +		$this->app->bind('settings', function ($app) { | |
| 82 | + return new Settings($app); | |
| 83 | + }); | |
| 84 | + } | |
| 85 | 85 | } |