Laravel-Backpack / CRUD

src/app/Http/Controllers/CrudController.php

Doc Comments +1 added lines, -1 removed lines

@@ -161,7 +161,7 @@
 	 * Remove the specified resource from storage.
 	 *
 	 * @param  int  $id
-	 * @return string
+	 * @return \Illuminate\Http\Response
 	 */
 	public function destroy($id)
 	{

Unused Use Statements -4 removed lines

@@ -3,16 +3,12 @@
 use Illuminate\Foundation\Bus\DispatchesJobs;
 use Illuminate\Routing\Controller as BaseController;
 use Illuminate\Foundation\Validation\ValidatesRequests;
-use Illuminate\Foundation\Auth\Access\AuthorizesRequests;
-use Illuminate\Support\Facades\Form as Form;
 use Illuminate\Http\Request;
 use Backpack\CRUD\Crud;
-use Crypt;
 use Alert;
 
 
 // VALIDATION: change the requests to match your own file names if you need form validation
-use Backpack\CRUD\app\Http\Requests\CrudRequest as StoreRequest;
 use Backpack\CRUD\app\Http\Requests\CrudRequest as UpdateRequest;
 
 class CrudController extends BaseController {

Indentation +224 added lines, -224 removed lines

@@ -17,232 +17,232 @@
 
 class CrudController extends BaseController {
 
-	use DispatchesJobs, ValidatesRequests;
-
-	public $data = [];
-	public $crud;
-
-	public function __construct()
-	{
-		$this->crud = new Crud();
-	}
-
-	/**
-	 * Display all rows in the database for this entity.
-	 *
-	 * @return Response
-	 */
-	public function index()
-	{
-		$this->crud->hasAccessOrFail('list');
-
-		$this->data['entries'] = $this->crud->getEntries();
-		$this->data['crud'] = $this->crud;
-		$this->data['title'] = ucfirst($this->crud->entity_name_plural);
-
-		// load the view from /resources/views/vendor/backpack/crud/ if it exists, otherwise load the one in the package
-		return view('crud::list', $this->data);
-	}
-
-
-	/**
-	 * Show the form for creating inserting a new row.
-	 *
-	 * @return Response
-	 */
-	public function create()
-	{
-		$this->crud->hasAccessOrFail('create');
-
-		// prepare the fields you need to show
-		$this->data['crud'] = $this->crud;
-		$this->data['fields'] = $this->crud->getCreateFields();
-		$this->data['title'] = trans('backpack::crud.add').' '.$this->crud->entity_name;
-
-		// load the view from /resources/views/vendor/backpack/crud/ if it exists, otherwise load the one in the package
-		return view('crud::create', $this->data);
-	}
-
-
-	/**
-	 * Store a newly created resource in the database.
-	 *
-	 * @param  StoreRequest  $request - type injection used for validation using Requests
-	 * @return \Illuminate\Http\RedirectResponse
-	 */
-	public function storeCrud(StoreRequest $request = null)
-	{
-		$this->crud->hasAccessOrFail('create');
+    use DispatchesJobs, ValidatesRequests;
+
+    public $data = [];
+    public $crud;
+
+    public function __construct()
+    {
+        $this->crud = new Crud();
+    }
+
+    /**
+     * Display all rows in the database for this entity.
+     *
+     * @return Response
+     */
+    public function index()
+    {
+        $this->crud->hasAccessOrFail('list');
+
+        $this->data['entries'] = $this->crud->getEntries();
+        $this->data['crud'] = $this->crud;
+        $this->data['title'] = ucfirst($this->crud->entity_name_plural);
+
+        // load the view from /resources/views/vendor/backpack/crud/ if it exists, otherwise load the one in the package
+        return view('crud::list', $this->data);
+    }
+
+
+    /**
+     * Show the form for creating inserting a new row.
+     *
+     * @return Response
+     */
+    public function create()
+    {
+        $this->crud->hasAccessOrFail('create');
+
+        // prepare the fields you need to show
+        $this->data['crud'] = $this->crud;
+        $this->data['fields'] = $this->crud->getCreateFields();
+        $this->data['title'] = trans('backpack::crud.add').' '.$this->crud->entity_name;
+
+        // load the view from /resources/views/vendor/backpack/crud/ if it exists, otherwise load the one in the package
+        return view('crud::create', $this->data);
+    }
+
+
+    /**
+     * Store a newly created resource in the database.
+     *
+     * @param  StoreRequest  $request - type injection used for validation using Requests
+     * @return \Illuminate\Http\RedirectResponse
+     */
+    public function storeCrud(StoreRequest $request = null)
+    {
+        $this->crud->hasAccessOrFail('create');
 
 		
-		// insert item in the db
-		$item = $this->crud->create(\Request::except(['redirect_after_save', 'password']));
-
-
-		// show a success message
-		\Alert::success(trans('backpack::crud.insert_success'))->flash();
-
-		// redirect the user where he chose to be redirected
-		switch (\Request::input('redirect_after_save')) {
-			case 'current_item_edit':
-				return \Redirect::to($this->crud->route.'/'.$item->id.'/edit');
-
-			default:
-				return \Redirect::to(\Request::input('redirect_after_save'));
-		}
-	}
-
-
-	/**
-	 * Show the form for editing the specified resource.
-	 *
-	 * @param  int  $id
-	 * @return Response
-	 */
-	public function edit($id)
-	{
-		$this->crud->hasAccessOrFail('update');
-
-		// get the info for that entry
-		$this->data['entry'] = $this->crud->getEntry($id);
-		$this->data['crud'] = $this->crud;
-		$this->data['fields'] = $this->crud->getUpdateFields($id);
-		$this->data['title'] = trans('backpack::crud.edit').' '.$this->crud->entity_name;
-
-		$this->data['id'] = $id;
-
-		// load the view from /resources/views/vendor/backpack/crud/ if it exists, otherwise load the one in the package
-		return view('crud::edit', $this->data);
-	}
-
-
-	/**
-	 * Update the specified resource in the database.
-	 *
-	 * @param  UpdateRequest  $request - type injection used for validation using Requests
-	 * @return \Illuminate\Http\RedirectResponse
-	 */
-	public function updateCrud(UpdateRequest $request = null)
-	{
-		$this->crud->hasAccessOrFail('update');
-
-		// update the row in the db
-
-		$this->crud->update(\Request::get('id'), \Request::except('redirect_after_save'));
-
-		// show a success message
-		\Alert::success(trans('backpack::crud.update_success'))->flash();
-
-		return \Redirect::to($this->crud->route);
-	}
-
-
-	/**
-	 * Display the specified resource.
-	 *
-	 * @param  int  $id
-	 * @return Response
-	 */
-	public function show($id)
-	{
-		$this->crud->hasAccessOrFail('show');
-
-		// get the info for that entry
-		$this->data['entry'] = $this->crud->getEntry($id);
-		$this->data['crud'] = $this->crud;
-		$this->data['title'] = trans('backpack::crud.preview').' '.$this->crud->entity_name;
-
-		// load the view from /resources/views/vendor/backpack/crud/ if it exists, otherwise load the one in the package
-		return view('crud::show', $this->data);
-	}
-
-
-	/**
-	 * Remove the specified resource from storage.
-	 *
-	 * @param  int  $id
-	 * @return string
-	 */
-	public function destroy($id)
-	{
-		$this->crud->hasAccessOrFail('delete');
-		return $this->crud->delete($id);
-	}
-
-
-	/**
-	 *  Reorder the items in the database using the Nested Set pattern.
-	 *
-	 *	Database columns needed: id, parent_id, lft, rgt, depth, name/title
-	 *
-	 *  @return Response
-	 */
-	public function reorder($lang = false)
-	{
-		$this->crud->hasAccessOrFail('reorder');
-
-		if (!$this->crud->isReorderEnabled()) {
-			abort(403, 'Reorder is disabled.');
-		}
-
-		if ($lang == false)
-		{
-			$lang = \Lang::locale();
-		}
-
-		// get all results for that entity
-		$this->data['entries'] = $this->crud->getEntries();
-		$this->data['crud'] = $this->crud;
-		$this->data['title'] = trans('backpack::crud.reorder').' '.$this->crud->entity_name;
-
-		// load the view from /resources/views/vendor/backpack/crud/ if it exists, otherwise load the one in the package
-		return view('crud::reorder', $this->data);
-	}
-
-
-	/**
-	 * Save the new order, using the Nested Set pattern.
-	 *
-	 * Database columns needed: id, parent_id, lft, rgt, depth, name/title
-	 *
-	 * @return
-	 */
-	public function saveReorder()
-	{
-		$this->crud->hasAccessOrFail('reorder');
-
-		$all_entries = \Request::input('tree');
-
-		if (count($all_entries)) {
-			$count = $this->crud->updateTreeOrder($all_entries);
-		} else
-		{
-			return false;
-		}
-
-		return 'success for '.$count." items";
-	}
-
-
-	/**
-	 * Used with AJAX in the list view (datatables) to show extra information about that row that didn't fit in the table.
-	 * It defaults to showing some dummy text.
-	 *
-	 * It's enabled by:
-	 * - setting: $crud->details_row = true;
-	 * - adding the details route for the entity; ex: Route::get('page/{id}/details', 'PageCrudController@showDetailsRow');
-	 * - adding a view with the following name to change what the row actually contains: app/resources/views/vendor/backpack/crud/details_row.blade.php
-	 */
-	public function showDetailsRow($id)
-	{
-		$this->crud->hasAccessOrFail('details_row');
-
-		$this->data['entry'] = $this->crud->getEntry($id);
-		$this->data['crud'] = $this->crud;
-
-		// load the view from /resources/views/vendor/backpack/crud/ if it exists, otherwise load the one in the package
-		return view('crud::details_row', $this->data);
-	}
+        // insert item in the db
+        $item = $this->crud->create(\Request::except(['redirect_after_save', 'password']));
+
+
+        // show a success message
+        \Alert::success(trans('backpack::crud.insert_success'))->flash();
+
+        // redirect the user where he chose to be redirected
+        switch (\Request::input('redirect_after_save')) {
+            case 'current_item_edit':
+                return \Redirect::to($this->crud->route.'/'.$item->id.'/edit');
+
+            default:
+                return \Redirect::to(\Request::input('redirect_after_save'));
+        }
+    }
+
+
+    /**
+     * Show the form for editing the specified resource.
+     *
+     * @param  int  $id
+     * @return Response
+     */
+    public function edit($id)
+    {
+        $this->crud->hasAccessOrFail('update');
+
+        // get the info for that entry
+        $this->data['entry'] = $this->crud->getEntry($id);
+        $this->data['crud'] = $this->crud;
+        $this->data['fields'] = $this->crud->getUpdateFields($id);
+        $this->data['title'] = trans('backpack::crud.edit').' '.$this->crud->entity_name;
+
+        $this->data['id'] = $id;
+
+        // load the view from /resources/views/vendor/backpack/crud/ if it exists, otherwise load the one in the package
+        return view('crud::edit', $this->data);
+    }
+
+
+    /**
+     * Update the specified resource in the database.
+     *
+     * @param  UpdateRequest  $request - type injection used for validation using Requests
+     * @return \Illuminate\Http\RedirectResponse
+     */
+    public function updateCrud(UpdateRequest $request = null)
+    {
+        $this->crud->hasAccessOrFail('update');
+
+        // update the row in the db
+
+        $this->crud->update(\Request::get('id'), \Request::except('redirect_after_save'));
+
+        // show a success message
+        \Alert::success(trans('backpack::crud.update_success'))->flash();
+
+        return \Redirect::to($this->crud->route);
+    }
+
+
+    /**
+     * Display the specified resource.
+     *
+     * @param  int  $id
+     * @return Response
+     */
+    public function show($id)
+    {
+        $this->crud->hasAccessOrFail('show');
+
+        // get the info for that entry
+        $this->data['entry'] = $this->crud->getEntry($id);
+        $this->data['crud'] = $this->crud;
+        $this->data['title'] = trans('backpack::crud.preview').' '.$this->crud->entity_name;
+
+        // load the view from /resources/views/vendor/backpack/crud/ if it exists, otherwise load the one in the package
+        return view('crud::show', $this->data);
+    }
+
+
+    /**
+     * Remove the specified resource from storage.
+     *
+     * @param  int  $id
+     * @return string
+     */
+    public function destroy($id)
+    {
+        $this->crud->hasAccessOrFail('delete');
+        return $this->crud->delete($id);
+    }
+
+
+    /**
+     *  Reorder the items in the database using the Nested Set pattern.
+     *
+     *	Database columns needed: id, parent_id, lft, rgt, depth, name/title
+     *
+     *  @return Response
+     */
+    public function reorder($lang = false)
+    {
+        $this->crud->hasAccessOrFail('reorder');
+
+        if (!$this->crud->isReorderEnabled()) {
+            abort(403, 'Reorder is disabled.');
+        }
+
+        if ($lang == false)
+        {
+            $lang = \Lang::locale();
+        }
+
+        // get all results for that entity
+        $this->data['entries'] = $this->crud->getEntries();
+        $this->data['crud'] = $this->crud;
+        $this->data['title'] = trans('backpack::crud.reorder').' '.$this->crud->entity_name;
+
+        // load the view from /resources/views/vendor/backpack/crud/ if it exists, otherwise load the one in the package
+        return view('crud::reorder', $this->data);
+    }
+
+
+    /**
+     * Save the new order, using the Nested Set pattern.
+     *
+     * Database columns needed: id, parent_id, lft, rgt, depth, name/title
+     *
+     * @return
+     */
+    public function saveReorder()
+    {
+        $this->crud->hasAccessOrFail('reorder');
+
+        $all_entries = \Request::input('tree');
+
+        if (count($all_entries)) {
+            $count = $this->crud->updateTreeOrder($all_entries);
+        } else
+        {
+            return false;
+        }
+
+        return 'success for '.$count." items";
+    }
+
+
+    /**
+     * Used with AJAX in the list view (datatables) to show extra information about that row that didn't fit in the table.
+     * It defaults to showing some dummy text.
+     *
+     * It's enabled by:
+     * - setting: $crud->details_row = true;
+     * - adding the details route for the entity; ex: Route::get('page/{id}/details', 'PageCrudController@showDetailsRow');
+     * - adding a view with the following name to change what the row actually contains: app/resources/views/vendor/backpack/crud/details_row.blade.php
+     */
+    public function showDetailsRow($id)
+    {
+        $this->crud->hasAccessOrFail('details_row');
+
+        $this->data['entry'] = $this->crud->getEntry($id);
+        $this->data['crud'] = $this->crud;
+
+        // load the view from /resources/views/vendor/backpack/crud/ if it exists, otherwise load the one in the package
+        return view('crud::details_row', $this->data);
+    }
 
 
 

src/app/Http/Controllers/ExampleCrudController.php

Unused Use Statements -4 removed lines

@@ -1,12 +1,8 @@
 <?php namespace App\Http\Controllers\Admin;
 
-use App\Http\Requests;
-use App\Http\Controllers\Controller;
 use Backpack\CRUD\app\Http\Controllers\CrudController;
-use Illuminate\Http\Request;
 
 // VALIDATION: change the requests to match your own file names if you need form validation
-use Backpack\CRUD\app\Http\Requests\CrudRequest as StoreRequest;
 use Backpack\CRUD\app\Http\Requests\CrudRequest as UpdateRequest;
 
 class ExampleCrudController extends CrudController {

Indentation +94 added lines, -94 removed lines

@@ -11,17 +11,17 @@ 
 
 class ExampleCrudController extends CrudController {
 
-	public function __construct() {
+    public function __construct() {
         parent::__construct();
 
-		/*
+        /*
 	    |--------------------------------------------------------------------------
 	    |                                   API
 	    |--------------------------------------------------------------------------
 	    */
 
 
-		// USAGE LEVEL 1 - ALWAYS	================================================== LEVEL 1
+        // USAGE LEVEL 1 - ALWAYS	================================================== LEVEL 1
         $this->crud->setModel("App\Models\Example");
         $this->crud->setRoute("admin/example");
         // $this->crud->setRouteName("admin.example");
@@ -33,45 +33,45 @@ 
 
 
 
-		// USAGE LEVEL 2 - OFTEN	================================================== LEVEL 2
+        // USAGE LEVEL 2 - OFTEN	================================================== LEVEL 2
 
 
         // ------ FIELDS (the last parameter is always the form - create/update/both)
-	    // TODO: $this->crud->addField('name', $options, 'update/create/both');
-	    // TODO: $this->crud->addFields($array_of_arrays, 'update/create/both');
-	    // TODO: $this->crud->removeField('name', 'update/create/both');
-	    // TODO: $this->crud->removeFields($array_of_names, 'update/create/both');
-	    // TODO: $this->crud->replaceField('name', 'update/create/both');
+        // TODO: $this->crud->addField('name', $options, 'update/create/both');
+        // TODO: $this->crud->addFields($array_of_arrays, 'update/create/both');
+        // TODO: $this->crud->removeField('name', 'update/create/both');
+        // TODO: $this->crud->removeFields($array_of_names, 'update/create/both');
+        // TODO: $this->crud->replaceField('name', 'update/create/both');
 
-	    // TODO: $this->crud->setRequiredFields(['field_1', 'field_2'], 'update/create/both');
-	    // TODO: $this->crud->setRequiredField('field_1', 'update/create/both');
-	    // TODO: $this->crud->getRequiredFields();
+        // TODO: $this->crud->setRequiredFields(['field_1', 'field_2'], 'update/create/both');
+        // TODO: $this->crud->setRequiredField('field_1', 'update/create/both');
+        // TODO: $this->crud->getRequiredFields();
 
-	    // TODO: $this->crud->setFieldOrder(['field_1', 'field_2', 'field_3'], 'update/create/both');
+        // TODO: $this->crud->setFieldOrder(['field_1', 'field_2', 'field_3'], 'update/create/both');
 
 
         // ------ COLUMNS
-	    // $this->crud->addColumn(); // add a single column, at the end of the stack
-	    // $this->crud->addColumns(); // add multiple columns, at the end of the stack
-	    // $this->crud->removeColumn('column_name'); // remove a column from the stack
-	    // $this->crud->removeColumns(['column_name_1', 'column_name_2']); // remove an array of columns from the stack
-	    // $this->crud->setColumnDetails('column_name', ['attribute' => 'value']);
-	    // $this->crud->setColumnsDetails(['column_1', 'column_2'], ['attribute' => 'value']);
-	    // TODO: $this->crud->setColumnOrder(['column_1', 'column_2', 'column_3']);
+        // $this->crud->addColumn(); // add a single column, at the end of the stack
+        // $this->crud->addColumns(); // add multiple columns, at the end of the stack
+        // $this->crud->removeColumn('column_name'); // remove a column from the stack
+        // $this->crud->removeColumns(['column_name_1', 'column_name_2']); // remove an array of columns from the stack
+        // $this->crud->setColumnDetails('column_name', ['attribute' => 'value']);
+        // $this->crud->setColumnsDetails(['column_1', 'column_2'], ['attribute' => 'value']);
+        // TODO: $this->crud->setColumnOrder(['column_1', 'column_2', 'column_3']);
 
 
-	    // ------ FIELDS AND COLUMNS
-	    // TODO: $this->crud->setLabel('column_name/field_name', 'New Label'); // changes label for columns, create&update fields
+        // ------ FIELDS AND COLUMNS
+        // TODO: $this->crud->setLabel('column_name/field_name', 'New Label'); // changes label for columns, create&update fields
 
 
         // ------ ACCESS
-	    // $this->crud->allowAccess('list');
-	    // $this->crud->allowAccess(['list', 'create', 'delete']);
-	    // $this->crud->denyAccess('list');
-	    // $this->crud->denyAccess(['list', 'create', 'delete']);
+        // $this->crud->allowAccess('list');
+        // $this->crud->allowAccess(['list', 'create', 'delete']);
+        // $this->crud->denyAccess('list');
+        // $this->crud->denyAccess(['list', 'create', 'delete']);
 
-	    // $this->crud->hasAccess('add'); // returns true/false
-	    // $this->crud->hasAccessOrFail('add'); // throws 403 error
+        // $this->crud->hasAccess('add'); // returns true/false
+        // $this->crud->hasAccessOrFail('add'); // throws 403 error
 
 
         // ------ REORDER
@@ -83,7 +83,7 @@ 
 
 
         // ------ DETAILS ROW
-  		// $this->crud->enableDetailsRow();
+            // $this->crud->enableDetailsRow();
         // NOTE: you also need to do allow access to the right users: $this->crud->allowAccess('details_row');
         // NOTE: you also need to do overwrite the showDetailsRow($id) method in your EntityCrudController to show whatever you'd like in the details row OR overwrite the views/backpack/crud/details_row.blade.php
 
@@ -92,101 +92,101 @@ 
 
         // ------ ADVANCED QUERIES
         // $this->crud->addClause('active');
-	    // $this->crud->addClause('type', 'car');
-	    // $this->crud->addClause('where', 'name', '==', 'car');
-	    // $this->crud->addClause('whereName', 'car');
-	    // $this->crud->addClause('whereHas', 'posts', function($query) {
-	    //     $query->activePosts();
-	    // });
+        // $this->crud->addClause('type', 'car');
+        // $this->crud->addClause('where', 'name', '==', 'car');
+        // $this->crud->addClause('whereName', 'car');
+        // $this->crud->addClause('whereHas', 'posts', function($query) {
+        //     $query->activePosts();
+        // });
         // $this->crud->orderBy();
         // $this->crud->groupBy();
         // $this->crud->limit();
 
 
 
-		// USAGE LEVEL 3 - SOMETIMES	==============================================  LEVEL 3
+        // USAGE LEVEL 3 - SOMETIMES	==============================================  LEVEL 3
 
         // TODO: $this->crud->setButtons(); // default includes edit and delete, with their name, icon, permission, link and class (btn-default)
-	    // TODO: $this->crud->addButton();
-	    // TODO: $this->crud->removeButton();
-	    // TODO: $this->crud->replaceButton();
+        // TODO: $this->crud->addButton();
+        // TODO: $this->crud->removeButton();
+        // TODO: $this->crud->replaceButton();
 
 
 
-		// USAGE LEVEL 4 - RARELY	==================================================  LEVEL 4
+        // USAGE LEVEL 4 - RARELY	==================================================  LEVEL 4
 
-		// $this->crud->getEntry($entry_id);
-		// $this->crud->getEntries();
+        // $this->crud->getEntry($entry_id);
+        // $this->crud->getEntries();
 
-		// $this->crud->getFields('create/update/both');
+        // $this->crud->getFields('create/update/both');
 
-		// $this->crud->create($entry_request);
-		// $this->crud->update($entry_id, $entry_request);
-		// $this->crud->delete($entry_id);
+        // $this->crud->create($entry_request);
+        // $this->crud->update($entry_id, $entry_request);
+        // $this->crud->delete($entry_id);
 
 
-		// USAGE LEVEL 5 - ALMOST NEVER	==============================================  LEVEL 5
+        // USAGE LEVEL 5 - ALMOST NEVER	==============================================  LEVEL 5
 
-		// $this->crud->updateTreeOrder($all_entries);
+        // $this->crud->updateTreeOrder($all_entries);
 
 
 
 
         // ------------------------
-		// MEANWHILE THIS WILL WORK
-		// ------------------------
+        // MEANWHILE THIS WILL WORK
+        // ------------------------
 
 
         $this->crud->reorder = true;
-		$this->crud->reorder_label = "name";
-		$this->crud->reorder_max_level = 3;
-		$this->crud->details_row = true;
-		// $this->crud->permissions = ['add', 'list', 'edit', 'delete', 'show'];
+        $this->crud->reorder_label = "name";
+        $this->crud->reorder_max_level = 3;
+        $this->crud->details_row = true;
+        // $this->crud->permissions = ['add', 'list', 'edit', 'delete', 'show'];
 
         $this->crud->columns = [
-									[
-										'name' => 'name',
-										'label' => "Example item text"
-									],
-									[
-										'label' => "Parent",
-										'type' => 'select',
-										'name' => 'parent_id',
-										'entity' => 'parent',
-										'attribute' => 'name',
-										'model' => "App\Models\Example"
-									],
-								];
-		$this->crud->fields =  [
-								[
-									'name' => 'name',
-									'label' => "Example item text"
-								],
-								[
-									'label' => "Parent",
-									'type' => 'select',
-									'name' => 'parent_id',
-									'entity' => 'parent',
-									'attribute' => 'name',
-									'model' => "App\Models\Example"
-								],
-								[
-								    'name' => 'type',
-								    'label' => "Type",
-								    'type' => 'page_or_link'
-								],
-							];
+                                    [
+                                        'name' => 'name',
+                                        'label' => "Example item text"
+                                    ],
+                                    [
+                                        'label' => "Parent",
+                                        'type' => 'select',
+                                        'name' => 'parent_id',
+                                        'entity' => 'parent',
+                                        'attribute' => 'name',
+                                        'model' => "App\Models\Example"
+                                    ],
+                                ];
+        $this->crud->fields =  [
+                                [
+                                    'name' => 'name',
+                                    'label' => "Example item text"
+                                ],
+                                [
+                                    'label' => "Parent",
+                                    'type' => 'select',
+                                    'name' => 'parent_id',
+                                    'entity' => 'parent',
+                                    'attribute' => 'name',
+                                    'model' => "App\Models\Example"
+                                ],
+                                [
+                                    'name' => 'type',
+                                    'label' => "Type",
+                                    'type' => 'page_or_link'
+                                ],
+                            ];
 
     }
 
-	public function store(StoreRequest $request)
-	{
-		return parent::storeCrud();
-	}
+    public function store(StoreRequest $request)
+    {
+        return parent::storeCrud();
+    }
 
-	public function update(UpdateRequest $request)
-	{
-		return parent::updateCrud();
-	}
+    public function update(UpdateRequest $request)
+    {
+        return parent::updateCrud();
+    }
 
 }

Spacing +1 added lines, -1 removed lines

@@ -157,7 +157,7 @@
 										'model' => "App\Models\Example"
 									],
 								];
-		$this->crud->fields =  [
+		$this->crud->fields = [
 								[
 									'name' => 'name',
 									'label' => "Example item text"

src/app/Http/Controllers/ToneCrudNestedController.php

Doc Comments +2 added lines, -2 removed lines

@@ -54,7 +54,7 @@ 
      * Store a newly created resource in storage.
      *
      * @param  \Illuminate\Http\Request  $request
-     * @return \Illuminate\Http\Response
+     * @return \Illuminate\Http\RedirectResponse
      */
     public function crudStore(Request $request = null)
     {
@@ -101,7 +101,7 @@ 
      *
      * @param  \Illuminate\Http\Request  $request
      * @param  int  $id
-     * @return \Illuminate\Http\Response
+     * @return \Illuminate\Http\RedirectResponse
      */
     public function crudUpdate($parentId, $id, Request $request = null)
     {

Unused Use Statements -3 removed lines

@@ -4,10 +4,7 @@
  */
 namespace Backpack\Crud\Http\Controllers;
 
-use Illuminate\Foundation\Bus\DispatchesJobs;
 use Illuminate\Routing\Controller as BaseController;
-use Illuminate\Foundation\Validation\ValidatesRequests;
-use Illuminate\Foundation\Auth\Access\AuthorizesRequests;
 use Backpack\Crud\Crud;
 
 /**

src/Crud.php

Doc Comments +24 added lines, -2 removed lines

@@ -286,6 +286,7 @@ 
      * Delete a row from the database.
      *
      * @param  [int] The id of the item to be deleted.
+     * @param integer $id
      * @return [bool] Deletion confirmation.
      *
      * TODO: should this delete items with relations to it too?
@@ -404,7 +405,8 @@ 
      * Check if a permission is enabled for a Crud Panel. Fail if not.
      *
      * @param  [string] Permission.
-     * @return boolean
+     * @param string $permission
+     * @return boolean|null
      */
     public function hasAccessOrFail($permission)
     {
@@ -433,6 +435,7 @@ 
      * All Create-Read-Update-Delete operations are done using that Eloquent Collection.
      *
      * @param [string] Full model namespace. Ex: App\Models\Article
+     * @param string $model_namespace
      */
     public function setModel($model_namespace)
     {
@@ -460,6 +463,7 @@ 
      *
      * @param [string] Route name.
      * @param [array] Parameters.
+     * @param string $route
      */
     public function setRoute($route)
     {
@@ -492,7 +496,7 @@ 
      * - $this->crud->setRouteName('admin.article')
      * - $this->crud->route = "admin/article"
      *
-     * @return [string]
+     * @return string
      */
     public function getRoute()
     {
@@ -505,6 +509,8 @@ 
      *
      * @param [string] Entity name, in singular. Ex: article
      * @param [string] Entity name, in plural. Ex: articles
+     * @param string $singular
+     * @param string $plural
      */
     public function setEntityNameStrings($singular, $plural) {
         $this->entity_name = $singular;
@@ -1237,6 +1243,9 @@ 
         return array_filter($this->{$entity}[] = $this->syncField($field));
     }
 
+    /**
+     * @param string $entity
+     */
     public function addMultiple($entity, $field)
     {
         $this->{$entity} = array_filter(array_map([$this, 'syncField'], $fields));
@@ -1256,16 +1265,25 @@ 
 
 
 
+    /**
+     * @param string $entity
+     */
     public function remove($entity, $fields)
     {
         return array_values(array_filter($this->{$entity}, function($field) use ($fields) { return !in_array($field['name'], (array)$fields);}));
     }
 
+    /**
+     * @param string $items
+     */
     public function setSort($items, $order)
     {
         $this->sort[$items] = $order;
     }
 
+    /**
+     * @param string $items
+     */
     public function sort($items)
     {
         if (array_key_exists($items, $this->sort))
@@ -1301,6 +1319,10 @@ 
     }
 
     // face un fel de merge intre ce ii dai si ce e in CRUD
+
+    /**
+     * @param string $entity
+     */
     public function syncRelations($entity)
     {
         foreach ($this->relations as $field => $relation) {

Indentation +11 added lines, -11 removed lines

@@ -122,7 +122,7 @@ 
                         if(isset($data[$relation])){
                             $model->{$relation}()->sync($data[$relation]);
                         }else{
-                             $model->{$relation}()->sync([]);
+                                $model->{$relation}()->sync([]);
                         }
                     }
                 }else{
@@ -131,9 +131,9 @@ 
 
                 if( isset($relation['pivotFields']) ){
                     foreach($relation['pivotFields'] as $pivotField){
-                       foreach($data[$pivotField] as $pivot_id =>  $field){
-                         $model->{$relation['name']}()->updateExistingPivot($pivot_id, [$pivotField => $field]);
-                       }
+                        foreach($data[$pivotField] as $pivot_id =>  $field){
+                            $model->{$relation['name']}()->updateExistingPivot($pivot_id, [$pivotField => $field]);
+                        }
                     }
                 }
             }
@@ -175,7 +175,7 @@ 
     }
 
 
-   /*
+    /*
     |--------------------------------------------------------------------------
     |                                   READ
     |--------------------------------------------------------------------------
@@ -257,7 +257,7 @@ 
 
 
 
-   /*
+    /*
     |--------------------------------------------------------------------------
     |                                   UPDATE
     |--------------------------------------------------------------------------
@@ -322,7 +322,7 @@ 
 
 
 
-   /*
+    /*
     |--------------------------------------------------------------------------
     |                                   DELETE
     |--------------------------------------------------------------------------
@@ -413,7 +413,7 @@ 
 
 
 
-   /*
+    /*
     |--------------------------------------------------------------------------
     |                                   CRUD ACCESS
     |--------------------------------------------------------------------------
@@ -842,7 +842,7 @@ 
 
             if (!in_array($field, $this->model->getHidden()))
             {
-                 $this->columns[] = [
+                    $this->columns[] = [
                                     'name' => $field,
                                     'label' => ucfirst($field),
                                     'type' => $this->getFieldTypeFromDbColumnType($field)
@@ -1210,10 +1210,10 @@ 
 
     public function addCreateField($field)
     {
-       return $this->add('create_fields', $field);
+        return $this->add('create_fields', $field);
     }
 
-     public function setUpdateFields($fields)
+        public function setUpdateFields($fields)
     {
         $this->addMultiple('update_fields', $fields);
     }

Spacing +32 added lines, -32 removed lines

@@ -80,7 +80,7 @@ 
      */
     public function getCreateFields()
     {
-        return $this->prepareFields(empty($this->create_fields)?$this->fields:$this->create_fields);
+        return $this->prepareFields(empty($this->create_fields) ? $this->fields : $this->create_fields);
     }
 
     /**
@@ -91,16 +91,16 @@ 
      */
     public function getRelationFields($form = 'create')
     {
-        if( $form == 'create' ){
-            $fields = empty($this->create_fields)?$this->fields:$this->create_fields;
-        }else{
-            $fields = empty($this->update_fields)?$this->fields:$this->update_fields;
+        if ($form == 'create') {
+            $fields = empty($this->create_fields) ? $this->fields : $this->create_fields;
+        } else {
+            $fields = empty($this->update_fields) ? $this->fields : $this->update_fields;
         }
 
         $relationFields = [];
 
-        foreach($fields as $field){
-            if(isset($field['model']) || isset($field['dependencies'])){
+        foreach ($fields as $field) {
+            if (isset($field['model']) || isset($field['dependencies'])) {
                 array_push($relationFields, $field);
             }
         }
@@ -116,22 +116,22 @@ 
         
         foreach ($relations as $key => $relation)
         {
-            if ( (isset($relation['pivot']) && $relation['pivot'] ) || isset($relation['dependencies']) ){
-                if(is_array($relation['name'])){
-                    foreach($relation['name'] as $relation){
-                        if(isset($data[$relation])){
+            if ((isset($relation['pivot']) && $relation['pivot']) || isset($relation['dependencies'])) {
+                if (is_array($relation['name'])) {
+                    foreach ($relation['name'] as $relation) {
+                        if (isset($data[$relation])) {
                             $model->{$relation}()->sync($data[$relation]);
-                        }else{
+                        } else {
                              $model->{$relation}()->sync([]);
                         }
                     }
-                }else{
+                } else {
                     $model->{$relation['name']}()->sync($data[$relation['name']]);
                 }
 
-                if( isset($relation['pivotFields']) ){
-                    foreach($relation['pivotFields'] as $pivotField){
-                       foreach($data[$pivotField] as $pivot_id =>  $field){
+                if (isset($relation['pivotFields'])) {
+                    foreach ($relation['pivotFields'] as $pivotField) {
+                       foreach ($data[$pivotField] as $pivot_id =>  $field) {
                          $model->{$relation['name']}()->updateExistingPivot($pivot_id, [$pivotField => $field]);
                        }
                     }
@@ -289,21 +289,21 @@ 
      */
     public function getUpdateFields($id)
     {
-        $fields = $this->prepareFields(empty($this->update_fields)?$this->fields:$this->update_fields);
+        $fields = $this->prepareFields(empty($this->update_fields) ? $this->fields : $this->update_fields);
         $entry = $this->getEntry($id);
 
         foreach ($fields as $k => $field) {
             // set the value
             if (!isset($fields[$k]['value']))
             {
-                if(is_array($field['name'])){
+                if (is_array($field['name'])) {
                     
                     $fields[$k]['value'] = [];
-                    foreach($field['name'] as  $key => $relation){
+                    foreach ($field['name'] as  $key => $relation) {
                         $fields[$k]['value'][] = $entry->{$relation};
                     }
                 
-                }else{
+                } else {
                     $fields[$k]['value'] = $entry->{$field['name']};
                 }
             }
@@ -422,13 +422,13 @@ 
     public function allowAccess($access)
     {
         // $this->addButtons((array)$access);
-        return $this->access = array_merge(array_diff((array)$access, $this->access), $this->access);
+        return $this->access = array_merge(array_diff((array) $access, $this->access), $this->access);
     }
 
     public function denyAccess($access)
     {
         // $this->removeButtons((array)$access);
-        return $this->access = array_diff($this->access, (array)$access);
+        return $this->access = array_diff($this->access, (array) $access);
     }
 
     /**
@@ -641,7 +641,7 @@ 
      */
     public function addDefaultTypeToColumn($column)
     {
-        if (array_key_exists('name', (array)$column))
+        if (array_key_exists('name', (array) $column))
         {
             $default_type = $this->getFieldTypeFromDbColumnType($column['name']);
             return array_merge(['type' => $default_type], $column);
@@ -657,7 +657,7 @@ 
      * @param [field or column]
      */
     public function addDefaultLabel($array) {
-        if (!array_key_exists('label', (array)$array) && array_key_exists('name', (array)$array)) {
+        if (!array_key_exists('label', (array) $array) && array_key_exists('name', (array) $array)) {
             $array = array_merge(['label' => ucfirst($this->makeLabel($array['name']))], $array);
             return $array;
         }
@@ -831,7 +831,7 @@ 
         array_map(function($field) {
             // $this->labels[$field] = $this->makeLabel($field);
 
-            $this->fields[] =  [
+            $this->fields[] = [
                                 'name' => $field,
                                 'label' => ucfirst($field),
                                 'value' => '', 'default' => $this->field_types[$field]['default'],
@@ -1173,7 +1173,7 @@ 
 
     public function orderColumns($order)
     {
-        $this->setSort('columns', (array)$order);
+        $this->setSort('columns', (array) $order);
     }
 
 
@@ -1248,13 +1248,13 @@ 
 
     public function orderFields($order)
     {
-        $this->setSort('fields', (array)$order);
+        $this->setSort('fields', (array) $order);
     }
 
 
     public function syncField($field)
     {
-        if (array_key_exists('name', (array)$field)) return array_merge(['type' => $this->getFieldTypeFromDbColumnType($field['name']), 'value' => '', 'default' => null, 'values' => [], 'attributes' => []], $field);
+        if (array_key_exists('name', (array) $field)) return array_merge(['type' => $this->getFieldTypeFromDbColumnType($field['name']), 'value' => '', 'default' => null, 'values' => [], 'attributes' => []], $field);
 
         return false;
     }
@@ -1293,7 +1293,7 @@ 
         if (!empty($this->{$type}))
         {
             $this->{$type} = array_map(function($field) use ($fields, $attributes) {
-                if (in_array($field['name'], (array)$fields)) $field = array_merge($field, $attributes);
+                if (in_array($field['name'], (array) $fields)) $field = array_merge($field, $attributes);
 
                 return $field;
             }, $this->{$type});
@@ -1304,7 +1304,7 @@ 
 
     public function remove($entity, $fields)
     {
-        return array_values(array_filter($this->{$entity}, function($field) use ($fields) { return !in_array($field['name'], (array)$fields);}));
+        return array_values(array_filter($this->{$entity}, function($field) use ($fields) { return !in_array($field['name'], (array) $fields); }));
     }
 
     public function setSort($items, $order)
@@ -1323,7 +1323,7 @@ 
                 if (is_numeric($key = array_search($item, array_column($this->{$items}, 'name')))) $elements[] = $this->{$items}[$key];
             }
 
-            return $this->{$items} = array_merge($elements, array_filter($this->{$items}, function($item) use($items) {return !in_array($item['name'], $this->sort[$items]);}));
+            return $this->{$items} = array_merge($elements, array_filter($this->{$items}, function($item) use($items) {return !in_array($item['name'], $this->sort[$items]); }));
         }
 
         return $this->{$items};
@@ -1336,7 +1336,7 @@ 
     // cred ca ia valorile din tabela de legatura ca sa ti le afiseze in select
     public function getRelationValues($model, $field, $where = [], $order = [])
     {
-        $order = (array)$order;
+        $order = (array) $order;
         $values = $model->select('*');
 
         if (!empty($where)) call_user_func_array([$values, $where[0]], array_slice($where, 1));

Braces +48 added lines, -21 removed lines

@@ -93,7 +93,7 @@ 
     {
         if( $form == 'create' ){
             $fields = empty($this->create_fields)?$this->fields:$this->create_fields;
-        }else{
+        } else{
             $fields = empty($this->update_fields)?$this->fields:$this->update_fields;
         }
 
@@ -121,11 +121,11 @@ 
                     foreach($relation['name'] as $relation){
                         if(isset($data[$relation])){
                             $model->{$relation}()->sync($data[$relation]);
-                        }else{
+                        } else{
                              $model->{$relation}()->sync([]);
                         }
                     }
-                }else{
+                } else{
                     $model->{$relation['name']}()->sync($data[$relation['name']]);
                 }
 
@@ -303,7 +303,7 @@ 
                         $fields[$k]['value'][] = $entry->{$relation};
                     }
                 
-                }else{
+                } else{
                     $fields[$k]['value'] = $entry->{$field['name']};
                 }
             }
@@ -482,7 +482,9 @@ 
      */
     public function setModel($model_namespace)
     {
-        if (!class_exists($model_namespace)) throw new \Exception('This model does not exist.', 404);
+        if (!class_exists($model_namespace)) {
+            throw new \Exception('This model does not exist.', 404);
+        }
 
         $this->model = new $model_namespace();
         $this->query = $this->model->select('*');
@@ -524,7 +526,9 @@ 
     {
         $complete_route = $route.'.index';
 
-        if (!\Route::has($complete_route)) throw new \Exception('There are no routes for this route name.', 404);
+        if (!\Route::has($complete_route)) {
+            throw new \Exception('There are no routes for this route name.', 404);
+        }
 
         $this->route = route($complete_route, $parameters);
         $this->initButtons();
@@ -580,8 +584,7 @@ 
                 // if label and other details have been defined in the array
                 if (is_array($columns[0])) {
                     $this->addColumn($column);
-                }
-                else
+                } else
                 {
                     $this->addColumn([
                                     'name' => $column,
@@ -877,11 +880,17 @@ 
      */
     public function getFieldTypeFromDbColumnType($field)
     {
-        if (!array_key_exists($field, $this->field_types)) return 'text';
+        if (!array_key_exists($field, $this->field_types)) {
+            return 'text';
+        }
 
-        if ($field == 'password') return 'password';
+        if ($field == 'password') {
+            return 'password';
+        }
 
-        if ($field == 'email') return 'email';
+        if ($field == 'email') {
+            return 'email';
+        }
 
         switch ($this->field_types[$field]['type'])
         {
@@ -954,7 +963,9 @@ 
         $columns = \Schema::getColumnListing($this->model->getTable());
         $fillable = $this->model->getFillable();
 
-        if (!empty($fillable)) $columns = array_intersect($columns, $fillable);
+        if (!empty($fillable)) {
+            $columns = array_intersect($columns, $fillable);
+        }
 
         // but not updated_at, deleted_at
         return array_values(array_diff($columns, [$this->model->getKeyName(), 'updated_at', 'deleted_at']));
@@ -1254,7 +1265,9 @@ 
 
     public function syncField($field)
     {
-        if (array_key_exists('name', (array)$field)) return array_merge(['type' => $this->getFieldTypeFromDbColumnType($field['name']), 'value' => '', 'default' => null, 'values' => [], 'attributes' => []], $field);
+        if (array_key_exists('name', (array)$field)) {
+            return array_merge(['type' => $this->getFieldTypeFromDbColumnType($field['name']), 'value' => '', 'default' => null, 'values' => [], 'attributes' => []], $field);
+        }
 
         return false;
     }
@@ -1272,8 +1285,11 @@ 
 
             foreach ($this->{$fields} as $key => $field)
             {
-                if (array_key_exists($field['name'], $this->relations) && $this->relations[$field['name']]['pivot']) $this->{$fields}[$key]['value'] = $this->entry->{$this->relations[$field['name']]['name']}()->lists($this->relations[$field['name']]['model']->getKeyName())->toArray();
-                    else $this->{$fields}[$key]['value'] = $this->entry->{$field['name']};
+                if (array_key_exists($field['name'], $this->relations) && $this->relations[$field['name']]['pivot']) {
+                    $this->{$fields}[$key]['value'] = $this->entry->{$this->relations[$field['name']]['name']}()->lists($this->relations[$field['name']]['model']->getKeyName())->toArray();
+                } else {
+                        $this->{$fields}[$key]['value'] = $this->entry->{$field['name']};
+                    }
             }
         }
     }
@@ -1293,7 +1309,9 @@ 
         if (!empty($this->{$type}))
         {
             $this->{$type} = array_map(function($field) use ($fields, $attributes) {
-                if (in_array($field['name'], (array)$fields)) $field = array_merge($field, $attributes);
+                if (in_array($field['name'], (array)$fields)) {
+                    $field = array_merge($field, $attributes);
+                }
 
                 return $field;
             }, $this->{$type});
@@ -1320,7 +1338,9 @@ 
 
             foreach ($this->sort[$items] as $item)
             {
-                if (is_numeric($key = array_search($item, array_column($this->{$items}, 'name')))) $elements[] = $this->{$items}[$key];
+                if (is_numeric($key = array_search($item, array_column($this->{$items}, 'name')))) {
+                    $elements[] = $this->{$items}[$key];
+                }
             }
 
             return $this->{$items} = array_merge($elements, array_filter($this->{$items}, function($item) use($items) {return !in_array($item['name'], $this->sort[$items]);}));
@@ -1339,9 +1359,13 @@ 
         $order = (array)$order;
         $values = $model->select('*');
 
-        if (!empty($where)) call_user_func_array([$values, $where[0]], array_slice($where, 1));
+        if (!empty($where)) {
+            call_user_func_array([$values, $where[0]], array_slice($where, 1));
+        }
 
-        if (!empty($order)) call_user_func_array([$values, 'orderBy'], $order);
+        if (!empty($order)) {
+            call_user_func_array([$values, 'orderBy'], $order);
+        }
 
         return $values->get()->lists($field, $model->getKeyName())->toArray();
     }
@@ -1350,8 +1374,11 @@ 
     public function syncRelations($entity)
     {
         foreach ($this->relations as $field => $relation) {
-            if ($relation['pivot']) $this->add($entity, ['name' => $field, 'type' => 'multiselect', 'value' => [], 'values' => $this->relations[$field]['values']]);
-                else $this->sync($entity, $field, ['type' => 'select', 'values' => $this->relations[$field]['values']]);
+            if ($relation['pivot']) {
+                $this->add($entity, ['name' => $field, 'type' => 'multiselect', 'value' => [], 'values' => $this->relations[$field]['values']]);
+            } else {
+                    $this->sync($entity, $field, ['type' => 'select', 'values' => $this->relations[$field]['values']]);
+                }
         }
     }
 

src/ToneCrud.php

Doc Comments +25 added lines

@@ -38,6 +38,9 @@ 
         $this->initState();
     }
 
+    /**
+     * @param string $model
+     */
     public function setModel($model)
     {
         if (!class_exists($model)) throw new \Exception('This model does not exist.', 404);
@@ -54,6 +57,10 @@ 
     }
 
     // TODO: make this work without having to specify "index"
+
+    /**
+     * @param string $route
+     */
     public function setRoute($route, $parameters = [])
     {
         if (!\Route::has($route)) throw new \Exception('This route does not exist.', 404);
@@ -259,6 +266,9 @@ 
         return $model;
     }
 
+    /**
+     * @param integer $id
+     */
     public function delete($id) // DONE
     {
         return $this->model->destroy($id);
@@ -489,6 +499,9 @@ 
         return array_filter($this->{$entity}[] = $this->syncField($field));
     }
 
+    /**
+     * @param string $entity
+     */
     private function addMultiple($entity, $field)
     {
         $this->{$entity} = array_filter(array_map([$this, 'syncField'], $fields));
@@ -506,16 +519,25 @@ 
         }
     }
 
+    /**
+     * @param string $entity
+     */
     private function remove($entity, $fields)
     {
         return array_values(array_filter($this->{$entity}, function($field) use ($fields) { return !in_array($field['name'], (array)$fields);}));
     }
 
+    /**
+     * @param string $items
+     */
     private function setSort($items, $order)
     {
         $this->sort[$items] = $order;
     }
 
+    /**
+     * @param string $items
+     */
     private function sort($items)
     {
         if (array_key_exists($items, $this->sort))
@@ -561,6 +583,9 @@ 
         return $values->get()->lists($field, $model->getKeyName())->toArray();
     }
 
+    /**
+     * @param string $entity
+     */
     private function syncRelations($entity)
     {
         foreach ($this->relations as $field => $relation) {

Indentation +5 added lines, -5 removed lines

@@ -190,10 +190,10 @@ 
 
     public function addCreateField($field)
     {
-       return $this->add('createFields', $field);
+        return $this->add('createFields', $field);
     }
 
-     public function setUpdateFields($fields)
+        public function setUpdateFields($fields)
     {
         $this->addMultiple('updateFields', $fields);
     }
@@ -541,9 +541,9 @@ 
                 $model->{$relation['name']}()->sync($data[$key]);
 
                 foreach($relation['pivotFields'] as $pivotField){
-                   foreach($data[$pivotField] as $pivot_id =>  $field){
-                     $model->{$relation['name']}()->updateExistingPivot($pivot_id, [$pivotField => $field]);
-                   }
+                    foreach($data[$pivotField] as $pivot_id =>  $field){
+                        $model->{$relation['name']}()->updateExistingPivot($pivot_id, [$pivotField => $field]);
+                    }
                 }
             }
         }

Spacing +15 added lines, -15 removed lines

@@ -125,9 +125,9 @@ 
 
     public function removePermissions($permissions) // DONE
     {
-        $this->removeButtons((array)$permissions);
+        $this->removeButtons((array) $permissions);
 
-        return $this->permissions = array_diff($this->permissions, (array)$permissions);
+        return $this->permissions = array_diff($this->permissions, (array) $permissions);
     }
 
     public function setColumns($columns)
@@ -158,7 +158,7 @@ 
 
     public function orderColumns($order)
     {
-        $this->setSort('columns', (array)$order);
+        $this->setSort('columns', (array) $order);
     }
 
     public function setFields($fields)
@@ -228,7 +228,7 @@ 
 
     public function orderFields($order)
     {
-        $this->setSort('fields', (array)$order);
+        $this->setSort('fields', (array) $order);
     }
 
     public function items()
@@ -287,7 +287,7 @@ 
 
     public function unsetListActions($actions)
     {
-        return $this->listActions = array_diff($this->listActions, (array)$actions);
+        return $this->listActions = array_diff($this->listActions, (array) $actions);
     }
 
     public function checkListAction($action)
@@ -312,7 +312,7 @@ 
 
     public function setRequired($fields)
     {
-        $this->required = array_merge($this->required, (array)$fields);
+        $this->required = array_merge($this->required, (array) $fields);
     }
 
     public function required()
@@ -380,14 +380,14 @@ 
 
     private function syncColumn($column)
     {
-        if (array_key_exists('name', (array)$column)) return array_merge(['type' => $this->getType($column['name'])], $column);
+        if (array_key_exists('name', (array) $column)) return array_merge(['type' => $this->getType($column['name'])], $column);
 
         return false;
     }
 
     private function syncField($field)
     {
-        if (array_key_exists('name', (array)$field)) return array_merge(['type' => $this->getType($field['name']), 'value' => '', 'default' => null, 'values' => [], 'attributes' => []], $field);
+        if (array_key_exists('name', (array) $field)) return array_merge(['type' => $this->getType($field['name']), 'value' => '', 'default' => null, 'values' => [], 'attributes' => []], $field);
 
         return false;
     }
@@ -499,7 +499,7 @@ 
         if (!empty($this->{$type}))
         {
             $this->{$type} = array_map(function($field) use ($fields, $attributes) {
-                if (in_array($field['name'], (array)$fields)) $field = array_merge($field, $attributes);
+                if (in_array($field['name'], (array) $fields)) $field = array_merge($field, $attributes);
 
                 return $field;
             }, $this->{$type});
@@ -508,7 +508,7 @@ 
 
     private function remove($entity, $fields)
     {
-        return array_values(array_filter($this->{$entity}, function($field) use ($fields) { return !in_array($field['name'], (array)$fields);}));
+        return array_values(array_filter($this->{$entity}, function($field) use ($fields) { return !in_array($field['name'], (array) $fields); }));
     }
 
     private function setSort($items, $order)
@@ -527,7 +527,7 @@ 
                 if (is_numeric($key = array_search($item, array_column($this->{$items}, 'name')))) $elements[] = $this->{$items}[$key];
             }
 
-            return $this->{$items} = array_merge($elements, array_filter($this->{$items}, function($item) use($items) {return !in_array($item['name'], $this->sort[$items]);}));
+            return $this->{$items} = array_merge($elements, array_filter($this->{$items}, function($item) use($items) {return !in_array($item['name'], $this->sort[$items]); }));
         }
 
         return $this->{$items};
@@ -537,11 +537,11 @@ 
     {
         foreach ($this->relations as $key => $relation)
         {
-            if ($relation['pivot']){
+            if ($relation['pivot']) {
                 $model->{$relation['name']}()->sync($data[$key]);
 
-                foreach($relation['pivotFields'] as $pivotField){
-                   foreach($data[$pivotField] as $pivot_id =>  $field){
+                foreach ($relation['pivotFields'] as $pivotField) {
+                   foreach ($data[$pivotField] as $pivot_id =>  $field) {
                      $model->{$relation['name']}()->updateExistingPivot($pivot_id, [$pivotField => $field]);
                    }
                 }
@@ -551,7 +551,7 @@ 
 
     private function getRelationValues($model, $field, $where = [], $order = [])
     {
-        $order = (array)$order;
+        $order = (array) $order;
         $values = $model->select('*');
 
         if (!empty($where)) call_user_func_array([$values, $where[0]], array_slice($where, 1));

Braces +64 added lines, -22 removed lines

@@ -40,7 +40,9 @@ 
 
     public function setModel($model)
     {
-        if (!class_exists($model)) throw new \Exception('This model does not exist.', 404);
+        if (!class_exists($model)) {
+            throw new \Exception('This model does not exist.', 404);
+        }
 
         $this->model = new $model();
         $this->query = $this->model->select('*');
@@ -56,7 +58,9 @@ 
     // TODO: make this work without having to specify "index"
     public function setRoute($route, $parameters = [])
     {
-        if (!\Route::has($route)) throw new \Exception('This route does not exist.', 404);
+        if (!\Route::has($route)) {
+            throw new \Exception('This route does not exist.', 404);
+        }
 
         $this->route = route($route, $parameters);
         $this->initButtons();
@@ -254,7 +258,9 @@ 
     {
         $model = $this->model->findOrFail($id);
         $updated = $model->update($data);
-        if ($updated) $this->syncPivot($model, $data);
+        if ($updated) {
+            $this->syncPivot($model, $data);
+        }
 
         return $model;
     }
@@ -282,7 +288,9 @@ 
 
     public function checkPermission($permission) // DONE
     {
-        if (!in_array($permission, $this->permissions)) abort(403);
+        if (!in_array($permission, $this->permissions)) {
+            abort(403);
+        }
     }
 
     public function unsetListActions($actions)
@@ -351,11 +359,17 @@ 
 
         $this->state = 'list';
 
-        if (in_array('create', $segments)) $this->state = 'add';
+        if (in_array('create', $segments)) {
+            $this->state = 'add';
+        }
 
-        if (in_array('edit', $segments)) $this->state = 'edit';
+        if (in_array('edit', $segments)) {
+            $this->state = 'edit';
+        }
 
-        if (is_numeric(end($segments))) $this->state = 'view';
+        if (is_numeric(end($segments))) {
+            $this->state = 'view';
+        }
     }
 
     private function removeButtons($buttons)
@@ -373,21 +387,27 @@ 
         $columns = \Schema::getColumnListing($this->model->getTable());
         $fillable = $this->model->getFillable();
 
-        if (!empty($fillable)) $columns = array_intersect($columns, $fillable);
+        if (!empty($fillable)) {
+            $columns = array_intersect($columns, $fillable);
+        }
 
         return array_values(array_diff($columns, [$this->model->getKeyName(), 'updated_at', 'deleted_at']));
     }
 
     private function syncColumn($column)
     {
-        if (array_key_exists('name', (array)$column)) return array_merge(['type' => $this->getType($column['name'])], $column);
+        if (array_key_exists('name', (array)$column)) {
+            return array_merge(['type' => $this->getType($column['name'])], $column);
+        }
 
         return false;
     }
 
     private function syncField($field)
     {
-        if (array_key_exists('name', (array)$field)) return array_merge(['type' => $this->getType($field['name']), 'value' => '', 'default' => null, 'values' => [], 'attributes' => []], $field);
+        if (array_key_exists('name', (array)$field)) {
+            return array_merge(['type' => $this->getType($field['name']), 'value' => '', 'default' => null, 'values' => [], 'attributes' => []], $field);
+        }
 
         return false;
     }
@@ -404,11 +424,17 @@ 
 
     private function getType($field) // DONE
     {
-        if (!array_key_exists($field, $this->fieldTypes)) return 'text';
+        if (!array_key_exists($field, $this->fieldTypes)) {
+            return 'text';
+        }
 
-        if ($field == 'password') return 'password';
+        if ($field == 'password') {
+            return 'password';
+        }
 
-        if ($field == 'email') return 'email';
+        if ($field == 'email') {
+            return 'email';
+        }
 
         switch ($this->fieldTypes[$field]['type'])
         {
@@ -466,7 +492,9 @@ 
 
             $this->fields[] = ['name' => $field, 'value' => '', 'default' => $this->fieldTypes[$field]['default'], 'type' => $this->getType($field), 'values' => [], 'attributes' => []];
 
-            if (!in_array($field, $this->model->getHidden())) $this->columns[] = ['name' => $field, 'type' => $this->getType($field)];
+            if (!in_array($field, $this->model->getHidden())) {
+                $this->columns[] = ['name' => $field, 'type' => $this->getType($field)];
+            }
         }, $this->getColumns());
     }
 
@@ -478,8 +506,11 @@ 
 
             foreach ($this->{$fields} as $key => $field)
             {
-                if (array_key_exists($field['name'], $this->relations) && $this->relations[$field['name']]['pivot']) $this->{$fields}[$key]['value'] = $this->item->{$this->relations[$field['name']]['name']}()->lists($this->relations[$field['name']]['model']->getKeyName())->toArray();
-                    else $this->{$fields}[$key]['value'] = $this->item->{$field['name']};
+                if (array_key_exists($field['name'], $this->relations) && $this->relations[$field['name']]['pivot']) {
+                    $this->{$fields}[$key]['value'] = $this->item->{$this->relations[$field['name']]['name']}()->lists($this->relations[$field['name']]['model']->getKeyName())->toArray();
+                } else {
+                        $this->{$fields}[$key]['value'] = $this->item->{$field['name']};
+                    }
             }
         }
     }
@@ -499,7 +530,9 @@ 
         if (!empty($this->{$type}))
         {
             $this->{$type} = array_map(function($field) use ($fields, $attributes) {
-                if (in_array($field['name'], (array)$fields)) $field = array_merge($field, $attributes);
+                if (in_array($field['name'], (array)$fields)) {
+                    $field = array_merge($field, $attributes);
+                }
 
                 return $field;
             }, $this->{$type});
@@ -524,7 +557,9 @@ 
 
             foreach ($this->sort[$items] as $item)
             {
-                if (is_numeric($key = array_search($item, array_column($this->{$items}, 'name')))) $elements[] = $this->{$items}[$key];
+                if (is_numeric($key = array_search($item, array_column($this->{$items}, 'name')))) {
+                    $elements[] = $this->{$items}[$key];
+                }
             }
 
             return $this->{$items} = array_merge($elements, array_filter($this->{$items}, function($item) use($items) {return !in_array($item['name'], $this->sort[$items]);}));
@@ -554,9 +589,13 @@ 
         $order = (array)$order;
         $values = $model->select('*');
 
-        if (!empty($where)) call_user_func_array([$values, $where[0]], array_slice($where, 1));
+        if (!empty($where)) {
+            call_user_func_array([$values, $where[0]], array_slice($where, 1));
+        }
 
-        if (!empty($order)) call_user_func_array([$values, 'orderBy'], $order);
+        if (!empty($order)) {
+            call_user_func_array([$values, 'orderBy'], $order);
+        }
 
         return $values->get()->lists($field, $model->getKeyName())->toArray();
     }
@@ -564,8 +603,11 @@ 
     private function syncRelations($entity)
     {
         foreach ($this->relations as $field => $relation) {
-            if ($relation['pivot']) $this->add($entity, ['name' => $field, 'type' => 'multiselect', 'value' => [], 'values' => $this->relations[$field]['values']]);
-                else $this->sync($entity, $field, ['type' => 'select', 'values' => $this->relations[$field]['values']]);
+            if ($relation['pivot']) {
+                $this->add($entity, ['name' => $field, 'type' => 'multiselect', 'value' => [], 'values' => $this->relations[$field]['values']]);
+            } else {
+                    $this->sync($entity, $field, ['type' => 'select', 'values' => $this->relations[$field]['values']]);
+                }
         }
     }
 

src/resources/views/reorder.blade.php

Indentation +26 added lines, -26 removed lines

@@ -20,42 +20,42 @@ 
 
 @section('content')
 <?php
-  function tree_element($entry, $key, $all_entries, $crud)
-  {
+    function tree_element($entry, $key, $all_entries, $crud)
+    {
     if (!isset($entry->tree_element_shown)) {
-      // mark the element as shown
-      $all_entries[$key]->tree_element_shown = true;
-      $entry->tree_element_shown = true;
+        // mark the element as shown
+        $all_entries[$key]->tree_element_shown = true;
+        $entry->tree_element_shown = true;
 
-      // show the tree element
-      echo '<li id="list_'.$entry->id.'">';
-      echo '<div><span class="disclose"><span></span></span>'.$entry->{$crud->reorder_label}.'</div>';
+        // show the tree element
+        echo '<li id="list_'.$entry->id.'">';
+        echo '<div><span class="disclose"><span></span></span>'.$entry->{$crud->reorder_label}.'</div>';
 
-      // see if this element has any children
-      $children = [];
-      foreach ($all_entries as $key => $subentry) {
+        // see if this element has any children
+        $children = [];
+        foreach ($all_entries as $key => $subentry) {
         if ($subentry->parent_id == $entry->id) {
-          $children[] = $subentry;
+            $children[] = $subentry;
+        }
         }
-      }
 
-      $children = collect($children)->sortBy('lft');
+        $children = collect($children)->sortBy('lft');
 
-      // if it does have children, show them
-      if (count($children)) {
+        // if it does have children, show them
+        if (count($children)) {
         echo '<ol>';
         foreach ($children as $key => $child) {
-          $children[$key] = tree_element($child, $child->id, $all_entries, $crud);
+            $children[$key] = tree_element($child, $child->id, $all_entries, $crud);
         }
         echo '</ol>';
-      }
-      echo '</li>';
+        }
+        echo '</li>';
     }
 
     return $entry;
-  }
+    }
 
- ?>
+    ?>
 <div class="row">
   <div class="col-md-8 col-md-offset-2">
     @if ($crud->hasAccess('list'))
@@ -87,15 +87,15 @@ 
 
           <ol class="sortable">
             <?php
-              $all_entries = collect($entries->all())->sortBy('lft')->keyBy('id');
-              $root_entries = $all_entries->filter(function($item) {
+                $all_entries = collect($entries->all())->sortBy('lft')->keyBy('id');
+                $root_entries = $all_entries->filter(function($item) {
                 return $item->parent_id == 0;
-              });
-             ?>
+                });
+                ?>
             @foreach ($root_entries as $key => $entry)
               <?php
                 $root_entries[$key] = tree_element($entry, $key, $all_entries, $crud);
-              ?>
+                ?>
             @endforeach
           </ol>
 

src/resources/views/fields/checklist_dependency.blade.php

Indentation +23 added lines, -23 removed lines

@@ -2,34 +2,34 @@ 
   <div class="form-group checklist_dependency"  data-entity ="{{ $field['field_unique_name'] }}">
     <label>{{ $field['label'] }}</label>
     <?php 
-      $entity_model = $crud->getModel();
+        $entity_model = $crud->getModel();
 
-      //short name for dependency fields
-      $primary_dependency = $field['dependencies']['primary'];
-      $secondary_dependency = $field['dependencies']['secondary'];
+        //short name for dependency fields
+        $primary_dependency = $field['dependencies']['primary'];
+        $secondary_dependency = $field['dependencies']['secondary'];
 
 
-      //all items with relation
-      $dependencies = $primary_dependency['model']::with($primary_dependency['entity_secondary'])->get();
+        //all items with relation
+        $dependencies = $primary_dependency['model']::with($primary_dependency['entity_secondary'])->get();
 
-      $dependencyArray = [];
+        $dependencyArray = [];
 
-      //convert dependency array to simple matrix ( prymary id as key and array with secondaries id )
-      foreach($dependencies as $primary){
-          $dependencyArray[$primary->id] = [];
+        //convert dependency array to simple matrix ( prymary id as key and array with secondaries id )
+        foreach($dependencies as $primary){
+            $dependencyArray[$primary->id] = [];
         foreach($primary->{$primary_dependency['entity_secondary']} as $secondary){
             $dependencyArray[$primary->id][] = $secondary->id;
         }
-      }
+        }
 
-      //for update form, get initial state of the entity
-      if( isset($id) && $id ){
+        //for update form, get initial state of the entity
+        if( isset($id) && $id ){
         
         //get entity with relations for primary dependency
         $entity_dependencies = $entity_model->with($primary_dependency['entity'])
-          ->with($primary_dependency['entity'].'.'.$primary_dependency['entity_secondary'])
-          ->where('id', $id)
-          ->first();
+            ->with($primary_dependency['entity'].'.'.$primary_dependency['entity_secondary'])
+            ->where('id', $id)
+            ->first();
 
         $secondaries_from_primary = [];
         
@@ -40,23 +40,23 @@ 
         
         //create secondary dependency from primary relation, used to check what chekbox must be check from second checklist
         if( old($primary_dependency['name']) ) {
-          foreach( old($primary_dependency['name']) as $primary_item ){
+            foreach( old($primary_dependency['name']) as $primary_item ){
             foreach($dependencyArray[$primary_item] as $second_item ){
                 $secondary_ids[$second_item] = $second_item;
             }
-          }
+            }
         }else{ //create dependecies from relation if not from validate error
-          foreach( $primary_array as $primary_item ){
+            foreach( $primary_array as $primary_item ){
             foreach($primary_item[$secondary_dependency['entity']] as $second_item ){
                 $secondary_ids[$second_item['id']] = $second_item['id'];
             }
-          }
+            }
         }
 
-      }
+        }
 
-      //json encode of dependency matrix
-      $dependencyJson = json_encode($dependencyArray);
+        //json encode of dependency matrix
+        $dependencyJson = json_encode($dependencyArray);
     ?>
     <script>
      var  {{ $field['field_unique_name'] }} = {!! $dependencyJson !!};

Spacing +9 added lines, -9 removed lines

@@ -15,15 +15,15 @@ 
       $dependencyArray = [];
 
       //convert dependency array to simple matrix ( prymary id as key and array with secondaries id )
-      foreach($dependencies as $primary){
+      foreach ($dependencies as $primary) {
           $dependencyArray[$primary->id] = [];
-        foreach($primary->{$primary_dependency['entity_secondary']} as $secondary){
+        foreach ($primary->{$primary_dependency['entity_secondary']} as $secondary) {
             $dependencyArray[$primary->id][] = $secondary->id;
         }
       }
 
       //for update form, get initial state of the entity
-      if( isset($id) && $id ){
+      if (isset($id) && $id) {
         
         //get entity with relations for primary dependency
         $entity_dependencies = $entity_model->with($primary_dependency['entity'])
@@ -39,15 +39,15 @@ 
         $secondary_ids = [];
         
         //create secondary dependency from primary relation, used to check what chekbox must be check from second checklist
-        if( old($primary_dependency['name']) ) {
-          foreach( old($primary_dependency['name']) as $primary_item ){
-            foreach($dependencyArray[$primary_item] as $second_item ){
+        if (old($primary_dependency['name'])) {
+          foreach (old($primary_dependency['name']) as $primary_item) {
+            foreach ($dependencyArray[$primary_item] as $second_item) {
                 $secondary_ids[$second_item] = $second_item;
             }
           }
-        }else{ //create dependecies from relation if not from validate error
-          foreach( $primary_array as $primary_item ){
-            foreach($primary_item[$secondary_dependency['entity']] as $second_item ){
+        } else { //create dependecies from relation if not from validate error
+          foreach ($primary_array as $primary_item) {
+            foreach ($primary_item[$secondary_dependency['entity']] as $second_item) {
                 $secondary_ids[$second_item['id']] = $second_item['id'];
             }
           }

Braces +1 added lines, -1 removed lines

@@ -45,7 +45,7 @@
                 $secondary_ids[$second_item] = $second_item;
             }
           }
-        }else{ //create dependecies from relation if not from validate error
+        } else{ //create dependecies from relation if not from validate error
           foreach( $primary_array as $primary_item ){
             foreach($primary_item[$secondary_dependency['entity']] as $second_item ){
                 $secondary_ids[$second_item['id']] = $second_item['id'];

src/resources/views/fields/checklist.blade.php

Spacing +1 added lines, -1 removed lines

@@ -1,7 +1,7 @@
 <!-- select2 -->
   <div class="form-group">
     <label>{{ $field['label'] }}</label>
-    <?php $entity_model = $crud->getModel();?>
+    <?php $entity_model = $crud->getModel(); ?>
    
     <div class="row">
         @foreach ($field['model']::all() as $connected_entity_entry)

src/app/Http/Controllers/ToneCrudController.php

Unused Use Statements -3 removed lines

@@ -4,10 +4,7 @@
  */
 namespace Backpack\Crud\Http\Controllers;
 
-use Illuminate\Foundation\Bus\DispatchesJobs;
 use Illuminate\Routing\Controller as BaseController;
-use Illuminate\Foundation\Validation\ValidatesRequests;
-use Illuminate\Foundation\Auth\Access\AuthorizesRequests;
 use Backpack\Crud\Crud;
 
 /**