Merge pull request #80 from viralsolani/analysis-Xk6Yly

Apply fixes from StyleCI

Author: viralsolani

app/Http/Controllers/Backend/Menu/MenuController.php

@@ -2,16 +2,15 @@
 
 namespace App\Http\Controllers\Backend\Menu;
 
-use App\Models\Menu\Menu;
-use Illuminate\Http\Request;
 use App\Http\Controllers\Controller;
-use App\Repositories\Backend\Menu\MenuRepository;
-use App\Http\Requests\Backend\Menu\StoreMenuRequest;
-use App\Http\Requests\Backend\Menu\ManageMenuRequest;
 use App\Http\Requests\Backend\Menu\CreateMenuRequest;
-use App\Http\Requests\Backend\Menu\EditMenuRequest;
 use App\Http\Requests\Backend\Menu\DeleteMenuRequest;
+use App\Http\Requests\Backend\Menu\EditMenuRequest;
+use App\Http\Requests\Backend\Menu\ManageMenuRequest;
+use App\Http\Requests\Backend\Menu\StoreMenuRequest;
 use App\Http\Requests\Backend\Menu\UpdateMenuRequest;
+use App\Models\Menu\Menu;
+use App\Repositories\Backend\Menu\MenuRepository;
 use Illuminate\Support\Facades\DB;
 
 class MenuController extends Controller
@@ -28,6 +27,7 @@ public function __construct(MenuRepository $menu)
 
     /**
      * Display a listing of the resource.
+     *
      * @param \App\Http\Requests\Backend\Menu\ManageMenuRequest $request
      *
      * @return \Illuminate\Http\Response
@@ -39,24 +39,27 @@ public function index(ManageMenuRequest $request)
 
     /**
      * Show the form for creating a new resource.
+     *
      * @param \App\Http\Requests\Backend\Menu\CreateMenuRequest $request
      *
      * @return \Illuminate\Http\Response
      */
     public function create(CreateMenuRequest $request)
     {
         $types = [
-            "backend" => "Backend", 
-            "frontend" => "Frontend"
+            'backend'  => 'Backend',
+            'frontend' => 'Frontend',
         ];
         $modules = DB::table('modules')->get();
+
         return view('backend.menus.create')->withTypes($types)->withModules($modules);
     }
 
     /**
      * Store a newly created resource in storage.
+     *
      * @param \App\Http\Requests\Backend\Menu\StoreMenuRequest $request
-     * 
+     *
      * @return \Illuminate\Http\Response
      */
     public function store(StoreMenuRequest $request)
@@ -68,19 +71,21 @@ public function store(StoreMenuRequest $request)
 
     /**
      * Show the form for editing the specified resource.
-     * @param \App\Models\Menu\Menu  $menu
+     *
+     * @param \App\Models\Menu\Menu                           $menu
      * @param \App\Http\Requests\Backend\Menu\EditMenuRequest $request
+     *
      * @return \Illuminate\Http\Response
      */
     public function edit(Menu $menu, EditMenuRequest $request)
     {
         $types = [
-            "backend" => "Backend", 
-            "frontend" => "Frontend"
+            'backend'  => 'Backend',
+            'frontend' => 'Frontend',
         ];
-        
+
         $modules = DB::table('modules')->get();
-        
+
         return view('backend.menus.edit')
                 ->with('types', $types)
                 ->with('menu', $menu)
@@ -90,9 +95,9 @@ public function edit(Menu $menu, EditMenuRequest $request)
     /**
      * Update the specified resource in storage.
      *
-     * @param  \App\Models\Menu\Menu  $menu
-     * @param  \App\Http\Requests\Backend\Menu\UpdateMenuRequest  $request
-     * 
+     * @param \App\Models\Menu\Menu                             $menu
+     * @param \App\Http\Requests\Backend\Menu\UpdateMenuRequest $request
+     *
      * @return \Illuminate\Http\Response
      */
     public function update(Menu $menu, UpdateMenuRequest $request)
@@ -106,8 +111,10 @@ public function update(Menu $menu, UpdateMenuRequest $request)
 
     /**
      * Remove the specified resource from storage.
-     * @param \App\Models\Menu\Menu  $menu
+     *
+     * @param \App\Models\Menu\Menu                             $menu
      * @param \App\Http\Requests\Backend\Menu\DeleteMenuRequest $request
+     *
      * @return \Illuminate\Http\Response
      */
     public function destroy(Menu $menu, DeleteMenuRequest $request)

app/Http/Controllers/Backend/Menu/MenuFormController.php

@@ -9,17 +9,18 @@ class MenuFormController extends Controller
 {
     /**
      * Get the form for modal popup.
+     *
      * @param string $formName
      * @param \App\Http\Requests\Backend\Menu\CreateMenuRequest
      *
      * @return \Illuminate\Http\Response
      */
     public function create($formName, CreateMenuRequest $request)
     {
-        if(in_array($formName, ['_add_custom_url_form']))
-        {
+        if (in_array($formName, ['_add_custom_url_form'])) {
             return view('backend.menus.'.$formName);
         }
+
         return abort(404);
     }
-}
+}

app/Http/Controllers/Backend/Menu/MenuTableController.php

@@ -2,12 +2,11 @@
 
 namespace App\Http\Controllers\Backend\Menu;
 
-use Illuminate\Http\Request;
 use App\Http\Controllers\Controller;
-use Yajra\DataTables\Facades\DataTables;
-use App\Repositories\Backend\Menu\MenuRepository;
 use App\Http\Requests\Backend\Menu\ManageMenuRequest;
+use App\Repositories\Backend\Menu\MenuRepository;
 use Carbon\Carbon;
+use Yajra\DataTables\Facades\DataTables;
 
 /**
  * Class MenuTableController.

app/Http/Requests/Backend/Menu/CreateMenuRequest.php

@@ -5,7 +5,7 @@
 use App\Http\Requests\Request;
 
 /**
- * Class CreateMenuRequest
+ * Class CreateMenuRequest.
  */
 class CreateMenuRequest extends Request
 {

app/Http/Requests/Backend/Menu/DeleteMenuRequest.php

@@ -5,7 +5,7 @@
 use App\Http\Requests\Request;
 
 /**
- * Class DeleteMenuRequest
+ * Class DeleteMenuRequest.
  */
 class DeleteMenuRequest extends Request
 {

app/Http/Requests/Backend/Menu/EditMenuRequest.php

@@ -5,7 +5,7 @@
 use App\Http\Requests\Request;
 
 /**
- * Class EditMenuRequest
+ * Class EditMenuRequest.
  */
 class EditMenuRequest extends Request
 {

app/Models/Menu/Menu.php

@@ -2,9 +2,9 @@
 
 namespace App\Models\Menu;
 
-use Illuminate\Database\Eloquent\Model;
-use App\Models\ModelTrait;
 use App\Models\Menu\Traits\Attribute\MenuAttribute;
+use App\Models\ModelTrait;
+use Illuminate\Database\Eloquent\Model;
 use Illuminate\Database\Eloquent\SoftDeletes;
 
 class Menu extends Model
@@ -25,12 +25,12 @@ class Menu extends Model
     protected $fillable = [
         'name',
         'type',
-        'items'
+        'items',
     ];
 
     public function __construct(array $attributes = [])
     {
         parent::__construct($attributes);
-    	$this->table = config("access.menus_table");
+        $this->table = config('access.menus_table');
     }
 }

app/Models/Menu/Traits/Attribute/MenuAttribute.php

@@ -13,8 +13,8 @@ trait MenuAttribute
     public function getActionButtonsAttribute()
     {
         return '<div class="btn-group action-btn">
-                    ' .$this->getEditButtonAttribute('edit-menu', 'admin.menus.edit'). '
-                    ' .$this->getDeleteButtonAttribute('delete-menu', 'admin.menus.destroy'). '
+                    '.$this->getEditButtonAttribute('edit-menu', 'admin.menus.edit').'
+                    '.$this->getDeleteButtonAttribute('delete-menu', 'admin.menus.destroy').'
                 </div>';
     }
 }

app/Repositories/Backend/Menu/MenuRepository.php

@@ -2,18 +2,17 @@
 
 namespace App\Repositories\Backend\Menu;
 
-use App\Repositories\BaseRepository;
 use App\Exceptions\GeneralException;
 use App\Models\Menu\Menu;
+use App\Repositories\BaseRepository;
 use Illuminate\Database\Eloquent\Model;
-use DB;
 
 /**
  * Class MenuRepository.
  */
 class MenuRepository extends BaseRepository
 {
-	/**
+    /**
      * Associated Repository Model.
      */
     const MODEL = Menu::class;
@@ -63,21 +62,19 @@ public function create(array $input)
      *
      * return bool
      */
-     
     public function update(Menu $menu, array $input)
     {
-        if ($this->query()->where('name', $input['name'])->where("id", '!=', $menu->id)->first()) {
+        if ($this->query()->where('name', $input['name'])->where('id', '!=', $menu->id)->first()) {
             throw new GeneralException(trans('exceptions.backend.menus.already_exists'));
         }
-        
+
         $input['updated_by'] = access()->user()->id;
 
         if ($menu->update($input)) {
             return true;
         }
 
         throw new GeneralException(trans('exceptions.backend.menus.update_error'));
-
     }
 
     /**
@@ -95,4 +92,4 @@ public function delete(Menu $menu)
 
         throw new GeneralException(trans('exceptions.backend.menus.delete_error'));
     }
-}
+}

database/migrations/2017_12_10_122555_create_menus_table.php

@@ -1,8 +1,8 @@
 <?php
 
-use Illuminate\Support\Facades\Schema;
-use Illuminate\Database\Schema\Blueprint;
 use Illuminate\Database\Migrations\Migration;
+use Illuminate\Database\Schema\Blueprint;
+use Illuminate\Support\Facades\Schema;
 
 class CreateMenusTable extends Migration
 {