Ajustes de layout e refatoração de código por phpstorm

Author: guifabrin

.env.example

@@ -37,4 +37,6 @@ MAIL_ENCRYPTION=
 
 PUSHER_APP_ID=
 PUSHER_APP_KEY=
-PUSHER_APP_SECRET=
+PUSHER_APP_SECRET=
+
+GOOGLE_KEY=

.ruby

@@ -0,0 +1 @@
+2.6.2

app/City.php

@@ -7,7 +7,7 @@
 class City extends Model
 {
     protected $table = "cities";
-    protected $fillable = [ 'name', 'state_id' ];
+    protected $fillable = ['name', 'state_id'];
 
     public function state()
     {

app/Console/Kernel.php

@@ -19,7 +19,7 @@ class Kernel extends ConsoleKernel
     /**
      * Define the application's command schedule.
      *
-     * @param  \Illuminate\Console\Scheduling\Schedule  $schedule
+     * @param  \Illuminate\Console\Scheduling\Schedule $schedule
      * @return void
      */
     protected function schedule(Schedule $schedule)

app/Contact.php

@@ -7,7 +7,7 @@
 class Contact extends Model
 {
     protected $table = "contacts";
-    protected $fillable = [ "value", "type_id", "user_id" ];
+    protected $fillable = ["value", "type_id", "user_id"];
 
     public function type()
     {

app/ContactType.php

@@ -7,5 +7,5 @@
 class ContactType extends Model
 {
     protected $table = "contact_types";
-    protected $fillable = [ "name", "mask" ];
+    protected $fillable = ["name", "mask"];
 }

app/Driver.php

@@ -7,13 +7,13 @@
 class Driver extends Model
 {
     protected $table = "drivers";
-    protected $fillable = [ 'name', 'license_id' ];
+    protected $fillable = ['name', 'license_id'];
 
     public static function boot()
     {
         parent::boot();
 
-        self::creating(function($model){
+        self::creating(function ($model) {
             $model->created_by = \Auth::user()->id;
         });
     }

app/Exceptions/Handler.php

@@ -27,7 +27,7 @@ class Handler extends ExceptionHandler
      *
      * This is a great spot to send exceptions to Sentry, Bugsnag, etc.
      *
-     * @param  \Exception  $exception
+     * @param  \Exception $exception
      * @return void
      */
     public function report(Exception $exception)
@@ -38,8 +38,8 @@ public function report(Exception $exception)
     /**
      * Render an exception into an HTTP response.
      *
-     * @param  \Illuminate\Http\Request  $request
-     * @param  \Exception  $exception
+     * @param  \Illuminate\Http\Request $request
+     * @param  \Exception $exception
      * @return \Illuminate\Http\Response
      */
     public function render($request, Exception $exception)
@@ -50,8 +50,8 @@ public function render($request, Exception $exception)
     /**
      * Convert an authentication exception into an unauthenticated response.
      *
-     * @param  \Illuminate\Http\Request  $request
-     * @param  \Illuminate\Auth\AuthenticationException  $exception
+     * @param  \Illuminate\Http\Request $request
+     * @param  \Illuminate\Auth\AuthenticationException $exception
      * @return \Illuminate\Http\Response
      */
     protected function unauthenticated($request, AuthenticationException $exception)

app/Fence.php

@@ -7,13 +7,13 @@
 class Fence extends Model
 {
     protected $table = "fences";
-    protected $fillable = [ "name", "polygon" ];
+    protected $fillable = ["name", "polygon"];
 
     public static function boot()
     {
         parent::boot();
 
-        self::creating(function($model){
+        self::creating(function ($model) {
             $model->created_by = \Auth::user()->id;
         });
     }

app/Http/Controllers/Auth/RegisterController.php

@@ -2,13 +2,12 @@
 
 namespace App\Http\Controllers\Auth;
 
-use App\User;
 use App\Http\Controllers\Controller;
+use App\User;
+use DB;
+use Illuminate\Foundation\Auth\RegistersUsers;
 use Illuminate\Support\Facades\Validator;
 use jeremykenedy\LaravelRoles\Models\Role;
-use jeremykenedy\LaravelRoles\Models\Permission;
-use Illuminate\Foundation\Auth\RegistersUsers;
-use DB;
 
 class RegisterController extends Controller
 {
@@ -45,7 +44,7 @@ public function __construct()
     /**
      * Get a validator for an incoming registration request.
      *
-     * @param  array  $data
+     * @param  array $data
      * @return \Illuminate\Contracts\Validation\Validator
      */
     protected function validator(array $data)
@@ -60,7 +59,7 @@ protected function validator(array $data)
     /**
      * Create a new user instance after a valid registration.
      *
-     * @param  array  $data
+     * @param  array $data
      * @return \App\User
      */
     protected function create(array $data)

app/Http/Controllers/CEPController.php

@@ -4,8 +4,6 @@
 
 use App\City;
 use App\State;
-use App\Setting;
-use Illuminate\Http\Request;
 use Illuminate\Support\Facades\Input;
 
 class CEPController extends Controller
@@ -21,7 +19,8 @@ public function __construct()
         $this->middleware('role:admin|subadmin');
     }
 
-    public function contries(){
+    public function contries()
+    {
         $brazil = [
             "id" => 0,
             "nome" => "Brasil",
@@ -32,10 +31,11 @@ public function contries(){
         ]);
     }
 
-    public function states(){
+    public function states()
+    {
         $states = State::all();
         $statesJson = [];
-        foreach ($states as $state){
+        foreach ($states as $state) {
             $statesJson[] = (object)[
                 "id" => $state->id,
                 "nome" => $state->name,
@@ -46,10 +46,11 @@ public function states(){
         return response()->json($statesJson);
     }
 
-    public function cities(){
-        $cities = City::where(['state_id'=>Input::get('id')])->get();
+    public function cities()
+    {
+        $cities = City::where(['state_id' => Input::get('id')])->get();
         $citiesJson = [];
-        foreach ($cities as $city){
+        foreach ($cities as $city) {
             $citiesJson[] = (object)[
                 "id" => $city->id,
                 "nome" => $city->name,

app/Http/Controllers/CitiesController.php

@@ -3,8 +3,8 @@
 namespace App\Http\Controllers;
 
 use App\City;
-use App\State;
 use App\Setting;
+use App\State;
 use Illuminate\Http\Request;
 use Illuminate\Support\Facades\Input;
 
@@ -20,6 +20,7 @@ public function __construct()
         $this->middleware('auth');
         $this->middleware('role:admin');
     }
+
     /**
      * Display a listing of the resource.
      *
@@ -28,25 +29,14 @@ public function __construct()
     public function index()
     {
         $stateId = Input::get('state_id');
-        if (!isset($stateId)){
+        if (!isset($stateId)) {
             $stateId = State::first()->id;
         }
         $state = State::find($stateId);
         $cities = City::where(['state_id' => $stateId])->paginate(Setting::paginacao());
         return view('cities.index', ['state' => $state, 'cities' => $cities]);
     }
 
-    /**
-     * Show the form for creating a new resource.
-     *
-     * @return \Illuminate\Http\Response
-     */
-    public function create()
-    {
-        $states = State::all();
-        return view('cities.form', ['city' => new City(), 'states'=>$states]);
-    }
-
     /**
      * Store a newly created resource in storage.
      *
@@ -55,33 +45,32 @@ public function create()
      */
     public function store(Request $request)
     {
-        if (City::create($request->input())){
-            return redirect(route('cities.index')."?state_id=".$request->state_id);
+        if (City::create($request->input())) {
+            return redirect(route('cities.index') . "?state_id=" . $request->state_id);
         } else {
             return $this->create();
         }
     }
 
     /**
-     * Display the specified resource.
+     * Show the form for creating a new resource.
      *
-     * @param  \City $city
      * @return \Illuminate\Http\Response
      */
-    public function show(City $city)
+    public function create()
     {
+        $states = State::all();
+        return view('cities.form', ['city' => new City(), 'states' => $states]);
     }
 
     /**
-     * Show the form for editing the specified resource.
+     * Display the specified resource.
      *
      * @param  \City $city
      * @return \Illuminate\Http\Response
      */
-    public function edit(City $city)
+    public function show(City $city)
     {
-        $states = State::all();
-        return view('cities.form',['city' => $city, 'states'=>$states]);
     }
 
     /**
@@ -93,13 +82,25 @@ public function edit(City $city)
      */
     public function update(Request $request, City $city)
     {
-        if ($city->update($request->input())){
-            return redirect(route('cities.index')."?state_id=".$city->state_id);
+        if ($city->update($request->input())) {
+            return redirect(route('cities.index') . "?state_id=" . $city->state_id);
         } else {
             return $this->edit($city);
         }
     }
 
+    /**
+     * Show the form for editing the specified resource.
+     *
+     * @param  \City $city
+     * @return \Illuminate\Http\Response
+     */
+    public function edit(City $city)
+    {
+        $states = State::all();
+        return view('cities.form', ['city' => $city, 'states' => $states]);
+    }
+
     /**
      * Remove the specified resource from storage.
      *
@@ -110,6 +111,6 @@ public function destroy(City $city)
     {
         $stateId = $city->state_id;
         $city->delete();
-        return redirect(route('cities.index')."?state_id=".$stateId);
+        return redirect(route('cities.index') . "?state_id=" . $stateId);
     }
 }