PHP CS Fix to PSR2 for all code

Bottelet · May 7, 2019 · 2f3597b · 2f3597b
1 parent d0a1619
commit 2f3597b
Show file tree

Hide file tree

Showing 56 changed files with 181 additions and 225 deletions.
diff --git a/ContactsController.php b/ContactsController.php
@@ -15,7 +15,6 @@
 
 class ClientsController extends Controller
 {
-
     protected $users;
     protected $clients;
     protected $settings;
@@ -24,8 +23,7 @@ public function __construct(
         UserRepositoryContract $users,
         ClientRepositoryContract $clients,
         SettingRepositoryContract $settings
-    )
-    {
+    ) {
         $this->users = $users;
         $this->clients = $clients;
         $this->settings = $settings;
@@ -159,5 +157,4 @@ public function updateAssign($id, Request $request)
         Session()->flash('flash_message', 'New user is assigned');
         return redirect()->back();
     }
-
 }
diff --git a/app/Dinero.php b/app/Dinero.php
@@ -107,7 +107,7 @@ public static function sendInvoice($invoiceGuid, $timestamp)
     }
 
     public function getContacts($filter = "")
-    {        
+    {
         $res = self::getClient()->request("GET", "https://api.dinero.dk/v1/"
             . self::$organizationId . "/contacts?field=Name,ContactGuid&queryFilter=Email+contains+" . "'" . $filter . "'", [
             "verify" => false,

diff --git a/app/Http/Controllers/ClientsController.php b/app/Http/Controllers/ClientsController.php
@@ -15,7 +15,6 @@
 
 class ClientsController extends Controller
 {
-
     protected $users;
     protected $clients;
     protected $settings;
@@ -24,8 +23,7 @@ public function __construct(
         UserRepositoryContract $users,
         ClientRepositoryContract $clients,
         SettingRepositoryContract $settings
-    )
-    {
+    ) {
         $this->users = $users;
         $this->clients = $clients;
         $this->settings = $settings;
@@ -159,5 +157,4 @@ public function updateAssign($id, Request $request)
         Session()->flash('flash_message', 'New user is assigned');
         return redirect()->back();
     }
-
 }
diff --git a/app/Http/Controllers/CommentController.php b/app/Http/Controllers/CommentController.php
@@ -18,16 +18,15 @@ class CommentController extends Controller
      * @return mixed
      */
     public function store(Request $request)
-    {   
+    {
         $this->validate($request, [
             'description' => 'required'
         ]);
 
-        $source = $request->type == "task" ? Task::find($request->id) : Lead::find($request->id); 
+        $source = $request->type == "task" ? Task::find($request->id) : Lead::find($request->id);
         $comment = $source->addComment(['description' => $request->description, 'user_id' => auth()->user()->id]);
         event(new \App\Events\NewComment($comment));
         Session::flash('flash_message', 'Comment successfully added!'); //Snippet in Master.blade.php
         return redirect()->back();
     }
-
 }
diff --git a/app/Http/Controllers/DepartmentsController.php b/app/Http/Controllers/DepartmentsController.php
@@ -8,7 +8,6 @@
 
 class DepartmentsController extends Controller
 {
-
     protected $departments;
 
     /**

diff --git a/app/Http/Controllers/DocumentsController.php b/app/Http/Controllers/DocumentsController.php
@@ -1,5 +1,6 @@
 <?php
 namespace App\Http\Controllers;
+
 use Excel;
 use Session;
 use Validator;
@@ -11,8 +12,6 @@
 use App\Models\Document;
 use Illuminate\Http\Request;
 
-
-
 class DocumentsController extends Controller
 {
     /**
@@ -81,16 +80,16 @@ public function import(Request $request)
             }
         }
     }
-   public function destroy($id)
-	{
-    	$document=Document::find($id);
-    	$settings = Setting::findOrFail(1);
-    	$companyname = $settings->company;
-    	$path = $document->path;
-    	$destroy_path = (public_path() . '/files/' . $companyname .'/' . $path);
-    	File::delete(public_path() . '/files/' . $companyname .'/' . $path);
-    	$document->delete();
-    	Session()->flash('flash_message', 'File has been deleted');
-    	return redirect()->back();
-	}
+    public function destroy($id)
+    {
+        $document=Document::find($id);
+        $settings = Setting::findOrFail(1);
+        $companyname = $settings->company;
+        $path = $document->path;
+        $destroy_path = (public_path() . '/files/' . $companyname .'/' . $path);
+        File::delete(public_path() . '/files/' . $companyname .'/' . $path);
+        $document->delete();
+        Session()->flash('flash_message', 'File has been deleted');
+        return redirect()->back();
     }
+}
diff --git a/app/Http/Controllers/InvoicesController.php b/app/Http/Controllers/InvoicesController.php
@@ -10,15 +10,13 @@
 
 class InvoicesController extends Controller
 {
-
     protected $clients;
     protected $invoices;
 
     public function __construct(
         InvoiceRepositoryContract $invoices,
         ClientRepositoryContract $clients
-    )
-    {
+    ) {
         $this->invoices = $invoices;
         $this->clients = $clients;
     }
@@ -61,7 +59,6 @@ public function show($id)
             if (!$invoiceContacts) {
                 $invoiceContacts = $api->getContacts();
             }
-
         } else {
             $apiConnected = false;
             $invoiceContacts = [];

diff --git a/app/Http/Controllers/LeadsController.php b/app/Http/Controllers/LeadsController.php
@@ -28,8 +28,7 @@ public function __construct(
         UserRepositoryContract $users,
         ClientRepositoryContract $clients,
         SettingRepositoryContract $settings
-    )
-    {
+    ) {
         $this->users = $users;
         $this->settings = $settings;
         $this->clients = $clients;

diff --git a/app/Http/Controllers/NotificationsController.php b/app/Http/Controllers/NotificationsController.php
@@ -17,7 +17,7 @@ class NotificationsController extends Controller
     public function markRead(Request $request)
     {
         $user = auth()->user();
-	$user->unreadNotifications()->where('id', $request->id)->first()->markAsRead();
+        $user->unreadNotifications()->where('id', $request->id)->first()->markAsRead();
 
         return redirect($user->notifications->where('id', $request->id)->first()->data['url']);
     }

diff --git a/app/Http/Controllers/PagesController.php b/app/Http/Controllers/PagesController.php
@@ -12,7 +12,6 @@
 
 class PagesController extends Controller
 {
-
     protected $users;
     protected $clients;
     protected $settings;
@@ -49,60 +48,60 @@ public function dashboard()
         $totalClients = $this->clients->getAllClientsCount();
         $totalTimeSpent = $this->tasks->totalTimeSpent();
 
-     /**
-      * Statistics for all-time tasks.
-      *
-      */
+        /**
+         * Statistics for all-time tasks.
+         *
+         */
         $alltasks = $this->tasks->tasks();
         $allCompletedTasks = $this->tasks->allCompletedTasks();
         $totalPercentageTasks = $this->tasks->percantageCompleted();
 
-     /**
-      * Statistics for today tasks.
-      *
-      */
+        /**
+         * Statistics for today tasks.
+         *
+         */
         $completedTasksToday =  $this->tasks->completedTasksToday();
         $createdTasksToday = $this->tasks->createdTasksToday();
 
-     /**
-      * Statistics for tasks this month.
-      *
-      */
-         $taskCompletedThisMonth = $this->tasks->completedTasksThisMonth();
+        /**
+         * Statistics for tasks this month.
+         *
+         */
+        $taskCompletedThisMonth = $this->tasks->completedTasksThisMonth();
 
 
-     /**
-      * Statistics for tasks each month(For Charts).
-      *
-      */
+        /**
+         * Statistics for tasks each month(For Charts).
+         *
+         */
         $createdTasksMonthly = $this->tasks->createdTasksMothly();
         $completedTasksMonthly = $this->tasks->completedTasksMothly();
 
-     /**
-      * Statistics for all-time Leads.
-      *
-      */
+        /**
+         * Statistics for all-time Leads.
+         *
+         */
 
         $allleads = $this->leads->leads();
         $allCompletedLeads = $this->leads->allCompletedLeads();
         $totalPercentageLeads = $this->leads->percantageCompleted();
-     /**
-      * Statistics for today leads.
-      *
-      */
+        /**
+         * Statistics for today leads.
+         *
+         */
         $completedLeadsToday = $this->leads->completedLeadsToday();
         $createdLeadsToday = $this->leads->createdLeadsToday();
 
-     /**
-      * Statistics for leads this month.
-      *
-      */
+        /**
+         * Statistics for leads this month.
+         *
+         */
         $leadCompletedThisMonth = $this->leads->completedLeadsThisMonth();
 
-     /**
-      * Statistics for leads each month(For Charts).
-      *
-      */
+        /**
+         * Statistics for leads each month(For Charts).
+         *
+         */
         $completedLeadsMonthly = $this->leads->createdLeadsMonthly();
         $createdLeadsMonthly = $this->leads->completedLeadsMonthly();
 

diff --git a/app/Http/Controllers/RolesController.php b/app/Http/Controllers/RolesController.php
@@ -7,7 +7,6 @@
 
 class RolesController extends Controller
 {
-
     protected $roles;
 
     /**

diff --git a/app/Http/Controllers/SettingsController.php b/app/Http/Controllers/SettingsController.php
@@ -22,8 +22,7 @@ class SettingsController extends Controller
     public function __construct(
         SettingRepositoryContract $settings,
         RoleRepositoryContract $roles
-    )
-    {
+    ) {
         $this->settings = $settings;
         $this->roles = $roles;
         $this->middleware('user.is.admin', ['only' => ['index']]);

diff --git a/app/Http/Controllers/TasksController.php b/app/Http/Controllers/TasksController.php
@@ -17,7 +17,6 @@
 
 class TasksController extends Controller
 {
-
     protected $request;
     protected $tasks;
     protected $clients;
@@ -31,8 +30,7 @@ public function __construct(
         ClientRepositoryContract $clients,
         InvoiceRepositoryContract $invoices,
         SettingRepositoryContract $settings
-    )
-    {
+    ) {
         $this->tasks = $tasks;
         $this->users = $users;
         $this->clients = $clients;

diff --git a/app/Http/Controllers/UsersController.php b/app/Http/Controllers/UsersController.php
@@ -33,8 +33,7 @@ public function __construct(
         SettingRepositoryContract $settings,
         TaskRepositoryContract $tasks,
         LeadRepositoryContract $leads
-    )
-    {
+    ) {
         $this->users = $users;
         $this->roles = $roles;
         $this->departments = $departments;
@@ -68,7 +67,7 @@ public function anyData()
             ->addColumn('edit', function ($user) {
                 return '<a href="' . route("users.edit", $user->id) . '" class="btn btn-success"> Edit</a>';
             })
-            ->add_column('delete', function ($user) { 
+            ->add_column('delete', function ($user) {
                 return '<button type="button" class="btn btn-danger delete_client" data-client_id="' . $user->id . '" onClick="openModal(' . $user->id. ')" id="myBtn">Delete</button>';
             })->make(true);
     }
@@ -105,7 +104,7 @@ public function taskData($id)
             ->make(true);
     }
 
-        /**
+    /**
      * Json for Data tables
      * @param $id
      * @return mixed
@@ -154,9 +153,6 @@ public function clientData($id)
                     ->format('d/m/Y') : '';
             })
             ->make(true);
-
-
-
     }
 
 

diff --git a/app/Listeners/NotiftyMentionedUsers.php b/app/Listeners/NotiftyMentionedUsers.php
@@ -28,7 +28,7 @@ public function __construct()
      */
     public function handle(NewComment $event)
     {
-       collect($event->comment->mentionedUsers())
+        collect($event->comment->mentionedUsers())
         ->map(function ($name) {
             return User::where('name', $name)->first();
         })

diff --git a/app/Models/Activity.php b/app/Models/Activity.php
@@ -36,7 +36,8 @@ public function user()
         return $this->belongsTo(User::class, 'user_id', 'id');
     }
 
-    public function source() {
+    public function source()
+    {
         return $this->morphTo();
     }
 }
diff --git a/app/Models/Client.php b/app/Models/Client.php
@@ -5,7 +5,6 @@
 
 class Client extends Model
 {
-
     protected $fillable = [
         'company_name',
         'vat',
@@ -25,7 +24,7 @@ public function user()
         return $this->belongsTo(User::class, 'user_id', 'id');
     }
 
-   public function tasks()
+    public function tasks()
     {
         return $this->hasMany(Task::class, 'client_id', 'id')
             ->orderBy('status', 'asc')